Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub fd4c3782 90db9681

+166 -867
+16 -4
pkgs/applications/audio/csound/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext 2 + , Accelerate 3 + , AudioUnit 4 + , CoreAudio 5 + , CoreMIDI 2 6 , alsa-lib ? null 3 7 , libpulseaudio ? null 4 8 , libjack2 ? null ··· 26 30 }; 27 31 28 32 cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp 33 + ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" 29 34 ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; 30 35 31 36 nativeBuildInputs = [ cmake flex bison gettext ]; 32 37 buildInputs = [ libsndfile libsamplerate boost ] 33 - ++ builtins.filter (optional: optional != null) [ 38 + ++ lib.optionals stdenv.isDarwin [ 39 + Accelerate AudioUnit CoreAudio CoreMIDI 40 + ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ 34 41 alsa-lib libpulseaudio libjack2 35 42 liblo ladspa-sdk fluidsynth eigen 36 - curl tcltk fltk ]; 43 + curl tcltk fltk 44 + ]); 45 + 46 + postInstall = lib.optional stdenv.isDarwin '' 47 + mkdir -p $out/Library/Frameworks 48 + ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks 49 + ''; 37 50 38 51 meta = with lib; { 39 52 description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; 40 53 homepage = "https://csound.com/"; 41 54 license = licenses.lgpl21Plus; 42 55 maintainers = [maintainers.marcweber]; 43 - platforms = platforms.linux; 56 + platforms = platforms.unix; 44 57 }; 45 58 } 46 -
+4 -4
pkgs/applications/misc/whalebird/default.nix
··· 1 1 { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron 2 - , nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: 2 + , nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "whalebird"; 6 - version = "4.5.2"; 6 + version = "4.5.4"; 7 7 8 8 src = fetchurl { 9 9 url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; 10 - sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; 10 + sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr"; 11 11 }; 12 12 13 13 nativeBuildInputs = [ ··· 17 17 nodePackages.asar 18 18 ]; 19 19 20 - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; 20 + buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; 21 21 22 22 dontConfigure = true; 23 23
+13 -4
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 212 212 "owner": "cloudamqp", 213 213 "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", 214 214 "repo": "terraform-provider-cloudamqp", 215 - "rev": "v1.15.3", 216 - "sha256": "sha256-aQVv/4shdh3AQFTbw1iayNBSGuwDAQ7WUixMeUvAJ0U=", 217 - "vendorSha256": "sha256-Anrcj23MvAk5m3LrGTANBhY6zB46U0st6vMZy2g7Gag=", 218 - "version": "1.15.3" 215 + "rev": "v1.16.0", 216 + "sha256": "sha256-swE4Nr1cQzNQOq8q6o0nZhhYRtgAwTfx6Epm76Jjjqg=", 217 + "vendorSha256": "sha256-oPeldPn30uS5Yl6IfXVPy2R7/wsAdZsEbbhVnVHQVwk=", 218 + "version": "1.16.0" 219 219 }, 220 220 "cloudflare": { 221 221 "owner": "cloudflare", ··· 453 453 "sha256": "sha256-Dr3G7KskfL+4WNOPL3SZCKf+Lo6wP3XS1JrlC6Mv3O8=", 454 454 "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", 455 455 "version": "4.20.0" 456 + }, 457 + "googleworkspace": { 458 + "owner": "hashicorp", 459 + "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", 460 + "repo": "terraform-provider-googleworkspace", 461 + "rev": "v0.6.0", 462 + "sha256": "06cbwkrqrsshnv8ccsnl424l2sq0shi18kxwvrnwg88xvm8qpcfi", 463 + "vendorSha256": "1zid2f8c9yfl6zwqiacngaf2rvvgs4w9phqjamgzibz41ijk6655", 464 + "version": "0.6.0" 456 465 }, 457 466 "grafana": { 458 467 "owner": "grafana",
+38
pkgs/applications/networking/newsreaders/raven-reader/default.nix
··· 1 + { lib, fetchurl, appimageTools }: 2 + 3 + let 4 + pname = "raven-reader"; 5 + version = "1.0.72"; 6 + src = fetchurl { 7 + url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; 8 + sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU="; 9 + }; 10 + appimageContents = appimageTools.extractType2 { inherit pname version src; }; 11 + 12 + in 13 + appimageTools.wrapType2 { 14 + inherit pname version src; 15 + 16 + extraInstallCommands = '' 17 + mv $out/bin/${pname}-${version} $out/bin/${pname} 18 + 19 + mkdir -p $out/share/${pname} 20 + cp -a ${appimageContents}/locales $out/share/${pname} 21 + cp -a ${appimageContents}/resources $out/share/${pname} 22 + 23 + install -m 444 -D ${appimageContents}/raven-reader.desktop -t $out/share/applications 24 + 25 + cp -a ${appimageContents}/usr/share/icons $out/share/ 26 + 27 + substituteInPlace $out/share/applications/raven-reader.desktop \ 28 + --replace 'Exec=AppRun' 'Exec=raven-reader' 29 + ''; 30 + 31 + meta = with lib; { 32 + description = "Open source desktop news reader with flexible settings to optimize your experience"; 33 + homepage = "https://ravenreader.app/"; 34 + license = licenses.mit; 35 + maintainers = with maintainers; [ wolfangaukang ]; 36 + platforms = [ "x86_64-linux" ]; 37 + }; 38 + }
+4 -10
pkgs/desktops/gnome/misc/pomodoro/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , substituteAll 5 - , fetchpatch 6 5 , meson 7 6 , ninja 8 7 , pkg-config ··· 17 16 , libxml2 18 17 , glib 19 18 , gobject-introspection 19 + , json-glib 20 20 , libpeas 21 21 , gsettings-desktop-schemas 22 22 , gettext ··· 24 24 25 25 stdenv.mkDerivation rec { 26 26 pname = "gnome-shell-pomodoro"; 27 - version = "0.20.0"; 27 + version = "0.21.1"; 28 28 29 29 src = fetchFromGitHub { 30 30 owner = "gnome-pomodoro"; 31 31 repo = "gnome-pomodoro"; 32 32 rev = version; 33 - sha256 = "sha256-USzLHoBM0QbBPtbTzJJY02cOSDtmlxPGYhMj7M1FJic="; 33 + sha256 = "sha256-47gZsL1Hg30wtq6NeZdi8gbLHUZJ34KLzxvIg5DqyUk="; 34 34 }; 35 35 36 36 patches = [ ··· 40 40 src = ./fix-schema-path.patch; 41 41 inherit pname version; 42 42 }) 43 - 44 - # Fix error reporting code. 45 - # https://github.com/gnome-pomodoro/gnome-pomodoro/pull/591 46 - (fetchpatch { 47 - url = "https://github.com/gnome-pomodoro/gnome-pomodoro/commit/133bd62f15653856d9705b66188b42c20d81719e.patch"; 48 - sha256 = "A20K+57A6/lYH2Buri2+wrCQgz6EGBdYg2xQbHPSkYc="; 49 - }) 50 43 ]; 51 44 52 45 nativeBuildInputs = [ ··· 69 62 gst_all_1.gst-plugins-good 70 63 gst_all_1.gstreamer 71 64 gtk3 65 + json-glib 72 66 libcanberra 73 67 libpeas 74 68 sqlite
-287
pkgs/development/interpreters/clojurescript/lumo/default.nix
··· 1 - { stdenv 2 - , lib 3 - , fetchurl 4 - , clojure 5 - , gnutar 6 - , nodejs 7 - , jre 8 - , unzip 9 - , nodePackages 10 - , xcbuild 11 - , python2 12 - , openssl 13 - , pkgs 14 - , fetchgit 15 - , darwin 16 - }: 17 - let 18 - version = "1.10.1"; 19 - nodeVersion = "11.13.0"; 20 - nodeSources = fetchurl { 21 - url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; 22 - sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac"; 23 - }; 24 - lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; 25 - 26 - # as found in cljs/snapshot/lumo/repl.cljs 27 - requireDeps = '' \ 28 - cljs.analyzer \ 29 - cljs.compiler \ 30 - cljs.env \ 31 - cljs.js \ 32 - cljs.reader \ 33 - cljs.repl \ 34 - cljs.source-map \ 35 - cljs.source-map.base64 \ 36 - cljs.source-map.base64-vlq \ 37 - cljs.spec.alpha \ 38 - cljs.spec.gen.alpha \ 39 - cljs.tagged-literals \ 40 - cljs.tools.reader \ 41 - cljs.tools.reader.reader-types \ 42 - cljs.tools.reader.impl.commons \ 43 - cljs.tools.reader.impl.utils \ 44 - clojure.core.rrb-vector \ 45 - clojure.core.rrb-vector.interop \ 46 - clojure.core.rrb-vector.nodes \ 47 - clojure.core.rrb-vector.protocols \ 48 - clojure.core.rrb-vector.rrbt \ 49 - clojure.core.rrb-vector.transients \ 50 - clojure.core.rrb-vector.trees \ 51 - clojure.string \ 52 - clojure.set \ 53 - clojure.walk \ 54 - cognitect.transit \ 55 - fipp.visit \ 56 - fipp.engine \ 57 - fipp.deque \ 58 - lazy-map.core \ 59 - lumo.pprint.data \ 60 - lumo.repl \ 61 - lumo.repl-resources \ 62 - lumo.js-deps \ 63 - lumo.common ''; 64 - 65 - compileClojurescript = (simple: '' 66 - (require '[cljs.build.api :as cljs]) 67 - (cljs/build \"src/cljs/snapshot\" 68 - {:optimizations ${if simple then ":simple" else ":none"} 69 - :main 'lumo.core 70 - :cache-analysis true 71 - :source-map false 72 - :dump-core false 73 - :static-fns true 74 - :optimize-constants false 75 - :npm-deps false 76 - :verbose true 77 - :closure-defines {'cljs.core/*target* \"nodejs\" 78 - 'lumo.core/*lumo-version* \"${version}\"} 79 - :compiler-stats true 80 - :process-shim false 81 - :fn-invoke-direct true 82 - :parallel-build false 83 - :browser-repl false 84 - :target :nodejs 85 - :hashbang false 86 - ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] 87 - :output-dir ${if simple 88 - then ''\"cljstmp\"'' 89 - else ''\"target\"''} 90 - :output-to ${if simple 91 - then ''\"cljstmp/main.js\"'' 92 - else ''\"target/deleteme.js\"'' }}) 93 - '' 94 - ); 95 - 96 - 97 - cacheToJsons = '' 98 - (import [java.io ByteArrayOutputStream FileInputStream]) 99 - (require '[cognitect.transit :as transit] 100 - '[clojure.edn :as edn] 101 - '[clojure.string :as str]) 102 - 103 - (defn write-transit-json [cache] 104 - (let [out (ByteArrayOutputStream. 1000000) 105 - writer (transit/writer out :json)] 106 - (transit/write writer cache) 107 - (.toString out))) 108 - 109 - (defn process-caches [] 110 - (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" 111 - cache-aot-edn (edn/read-string (slurp cache-aot-path)) 112 - cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" 113 - cache-macros-stream (FileInputStream. cache-macros-path) 114 - cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) 115 - caches [[cache-aot-path cache-aot-edn] 116 - [cache-macros-path cache-macros-edn]]] 117 - (doseq [[path cache-edn] caches] 118 - (doseq [key (keys cache-edn)] 119 - (let [out-path (str/replace path #\"(\.json|\.edn)\$\" 120 - (str \".\" (munge key) \".json\")) 121 - tr-json (write-transit-json (key cache-edn))] 122 - (spit out-path tr-json)))))) 123 - 124 - (process-caches) 125 - ''; 126 - 127 - trimMainJsEnd = '' 128 - (let [string (slurp \"target/main.js\")] 129 - (spit \"target/main.js\" 130 - (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) 131 - ''; 132 - 133 - 134 - cljdeps = import ./deps.nix { inherit pkgs; }; 135 - classp = cljdeps.makeClasspaths { 136 - extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ]; 137 - }; 138 - 139 - 140 - getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; 141 - in 142 - stdenv.mkDerivation { 143 - inherit version; 144 - pname = "lumo"; 145 - 146 - src = fetchgit { 147 - url = "https://github.com/anmonteiro/lumo.git"; 148 - rev = version; 149 - sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; 150 - }; 151 - 152 - nativeBuildInputs = [ unzip ]; 153 - buildInputs = [ 154 - nodejs 155 - clojure 156 - jre 157 - python2 158 - openssl 159 - gnutar 160 - nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" 161 - ] 162 - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ 163 - ApplicationServices 164 - xcbuild 165 - ] 166 - ); 167 - 168 - patches = [ ./no_mangle.patch ./mkdir_promise.patch ]; 169 - 170 - postPatch = '' 171 - substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \ 172 - --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")' 173 - ''; 174 - 175 - buildPhase = '' 176 - # Copy over lumo-build-deps environment 177 - rm yarn.lock 178 - cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ 179 - 180 - # configure clojure-cli 181 - mkdir ./.cpcache 182 - export CLJ_CONFIG=`pwd` 183 - export CLJ_CACHE=`pwd`/.cpcache 184 - 185 - # require more namespaces for cljs-bundle 186 - sed -i "s!ns lumo.core! \ 187 - ns lumo.core \ 188 - (:require ${requireDeps}) \ 189 - (:require-macros [clojure.template :as temp] \ 190 - [cljs.test :as test])!g" \ 191 - ./src/cljs/snapshot/lumo/core.cljs 192 - 193 - # Step 1: compile clojurescript with :none and :simple 194 - ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" 195 - ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}" 196 - cp -f cljstmp/main.js target/main.js 197 - ${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}" 198 - 199 - # Step 2: sift files 200 - unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target 201 - unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure 202 - unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target 203 - unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target 204 - unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target 205 - unzip -o ${getJarPath "org.clojure/test.check"} -d ./target 206 - cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/ 207 - cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/ 208 - # cleanup 209 - mv ./target/main.js ./target/main 210 - rm ./target/*\.js 211 - mv ./target/main ./target/main.js 212 - rm ./target/AUTHORS 213 - rm ./target/LICENSE 214 - rm ./target/*.edn 215 - rm ./target/*.md 216 - rm -rf ./target/css 217 - rm -rf ./target/META-INF 218 - rm -rf ./target/com 219 - rm -rf ./target/cljs/build 220 - rm -rf ./target/cljs/repl 221 - rm ./target/cljs/core\.cljs\.cache.aot\.json 222 - rm ./target/cljs/source_map\.clj 223 - rm ./target/cljs/repl\.cljc 224 - rm ./target/cljs/externs\.clj 225 - rm ./target/cljs/closure\.clj 226 - rm ./target/cljs/util\.cljc 227 - rm ./target/cljs/js_deps\.cljc 228 - rm ./target/cljs/analyzer/utils\.clj 229 - rm ./target/cljs/core/macros\.clj 230 - rm ./target/cljs/compiler/api.clj 231 - rm ./target/goog/test_module* 232 - rm ./target/goog/transpile\.js 233 - rm ./target/goog/base_* 234 - find ./target -type f -name '*.class' -delete 235 - find ./target -type d -empty -delete 236 - 237 - # Step 3: generate munged cache jsons 238 - ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" 239 - rm ./target/cljs/core\$macros\.cljc\.cache\.json 240 - 241 - 242 - # Step 4: Bunde javascript 243 - NODE_ENV=production node scripts/bundle.js 244 - node scripts/bundleForeign.js 245 - 246 - # Step 5: Backup resources 247 - cp -R target resources_bak 248 - 249 - # Step 6: Package executeable 1st time 250 - # fetch node sources and copy to palce that nexe will find 251 - mkdir -p tmp/node/${nodeVersion} 252 - cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz 253 - tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword 254 - mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/ 255 - rm -rf ${lumo-internal-classpath} 256 - cp -rf target ${lumo-internal-classpath} 257 - node scripts/package.js ${nodeVersion} 258 - rm -rf target 259 - mv ${lumo-internal-classpath} target 260 - 261 - # Step 7: AOT Macros 262 - sh scripts/aot-bundle-macros.sh 263 - 264 - # Step 8: Package executeable 2nd time 265 - node scripts/package.js ${nodeVersion} 266 - ''; 267 - 268 - dontStrip = true; 269 - 270 - installPhase = '' 271 - mkdir -p $out/bin 272 - cp build/lumo $out/bin 273 - ''; 274 - 275 - meta = { 276 - description = "Fast, cross-platform, standalone ClojureScript environment"; 277 - longDescription = '' 278 - Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8. 279 - Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, 280 - making it the fastest Clojure REPL in existence. 281 - ''; 282 - homepage = "https://github.com/anmonteiro/lumo"; 283 - license = lib.licenses.epl10; 284 - maintainers = [ lib.maintainers.hlolli ]; 285 - platforms = lib.platforms.linux ++ lib.platforms.darwin; 286 - }; 287 - }
-12
pkgs/development/interpreters/clojurescript/lumo/deps.edn
··· 1 - {:deps 2 - {org.clojure/clojure {:mvn/version "1.10.1"} 3 - org.clojure/clojurescript {:mvn/version "1.10.520"} 4 - org.clojure/test.check {:mvn/version "0.10.0-alpha4"} 5 - org.clojure/tools.reader {:mvn/version "1.3.2" 6 - :exclusions [org.clojure/clojure org.clojure/clojurescript]} 7 - com.cognitect/transit-cljs {:mvn/version "0.8.256" 8 - :exclusions [org.clojure/clojure org.clojure/clojurescript]} 9 - malabarba/lazy-map {:mvn/version "1.3" 10 - :exclusions [org.clojure/clojure org.clojure/clojurescript]} 11 - fipp {:mvn/version "0.6.17" 12 - :exclusions [org.clojure/clojure org.clojure/clojurescript]}}}
-392
pkgs/development/interpreters/clojurescript/lumo/deps.nix
··· 1 - # generated by clj2nix-1.0.4 2 - { pkgs }: 3 - 4 - let repos = [ 5 - "https://repo.clojars.org/" 6 - "https://repo1.maven.org/" 7 - "https://oss.sonatype.org/content/repositories/releases/" 8 - "https://oss.sonatype.org/content/repositories/public/" 9 - "https://repo.typesafe.com/typesafe/releases/" 10 - ]; 11 - 12 - in rec { 13 - makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; 14 - makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); 15 - 16 - packages = [ 17 - { 18 - name = "com.cognitect/transit-java"; 19 - path = pkgs.fetchMavenArtifact { 20 - inherit repos; 21 - artifactId = "transit-java"; 22 - groupId = "com.cognitect"; 23 - sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; 24 - version = "0.8.332"; 25 - }; 26 - } 27 - 28 - { 29 - name = "org.clojure/data.json"; 30 - path = pkgs.fetchMavenArtifact { 31 - inherit repos; 32 - artifactId = "data.json"; 33 - groupId = "org.clojure"; 34 - sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; 35 - version = "0.2.6"; 36 - }; 37 - } 38 - 39 - { 40 - name = "org.clojure/clojure"; 41 - path = pkgs.fetchMavenArtifact { 42 - inherit repos; 43 - artifactId = "clojure"; 44 - groupId = "org.clojure"; 45 - sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; 46 - version = "1.10.1"; 47 - }; 48 - } 49 - 50 - { 51 - name = "commons-codec/commons-codec"; 52 - path = pkgs.fetchMavenArtifact { 53 - inherit repos; 54 - artifactId = "commons-codec"; 55 - groupId = "commons-codec"; 56 - sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; 57 - version = "1.10"; 58 - }; 59 - } 60 - 61 - { 62 - name = "com.google.errorprone/error_prone_annotations"; 63 - path = pkgs.fetchMavenArtifact { 64 - inherit repos; 65 - artifactId = "error_prone_annotations"; 66 - groupId = "com.google.errorprone"; 67 - sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; 68 - version = "2.1.3"; 69 - }; 70 - } 71 - 72 - { 73 - name = "org.clojure/core.specs.alpha"; 74 - path = pkgs.fetchMavenArtifact { 75 - inherit repos; 76 - artifactId = "core.specs.alpha"; 77 - groupId = "org.clojure"; 78 - sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; 79 - version = "0.2.44"; 80 - }; 81 - } 82 - 83 - { 84 - name = "org.clojure/spec.alpha"; 85 - path = pkgs.fetchMavenArtifact { 86 - inherit repos; 87 - artifactId = "spec.alpha"; 88 - groupId = "org.clojure"; 89 - sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; 90 - version = "0.2.176"; 91 - }; 92 - } 93 - 94 - { 95 - name = "org.codehaus.mojo/animal-sniffer-annotations"; 96 - path = pkgs.fetchMavenArtifact { 97 - inherit repos; 98 - artifactId = "animal-sniffer-annotations"; 99 - groupId = "org.codehaus.mojo"; 100 - sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; 101 - version = "1.14"; 102 - }; 103 - } 104 - 105 - { 106 - name = "com.googlecode.json-simple/json-simple"; 107 - path = pkgs.fetchMavenArtifact { 108 - inherit repos; 109 - artifactId = "json-simple"; 110 - groupId = "com.googlecode.json-simple"; 111 - sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; 112 - version = "1.1.1"; 113 - }; 114 - } 115 - 116 - { 117 - name = "com.cognitect/transit-cljs"; 118 - path = pkgs.fetchMavenArtifact { 119 - inherit repos; 120 - artifactId = "transit-cljs"; 121 - groupId = "com.cognitect"; 122 - sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; 123 - version = "0.8.256"; 124 - }; 125 - } 126 - 127 - { 128 - name = "org.clojure/google-closure-library"; 129 - path = pkgs.fetchMavenArtifact { 130 - inherit repos; 131 - artifactId = "google-closure-library"; 132 - groupId = "org.clojure"; 133 - sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; 134 - version = "0.0-20170809-b9c14c6b"; 135 - }; 136 - } 137 - 138 - { 139 - name = "fipp"; 140 - path = pkgs.fetchMavenArtifact { 141 - inherit repos; 142 - artifactId = "fipp"; 143 - groupId = "fipp"; 144 - sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275"; 145 - version = "0.6.17"; 146 - }; 147 - } 148 - 149 - { 150 - name = "org.clojure/clojurescript"; 151 - path = pkgs.fetchMavenArtifact { 152 - inherit repos; 153 - artifactId = "clojurescript"; 154 - groupId = "org.clojure"; 155 - sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1"; 156 - version = "1.10.520"; 157 - }; 158 - } 159 - 160 - { 161 - name = "com.google.jsinterop/jsinterop-annotations"; 162 - path = pkgs.fetchMavenArtifact { 163 - inherit repos; 164 - artifactId = "jsinterop-annotations"; 165 - groupId = "com.google.jsinterop"; 166 - sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; 167 - version = "1.0.0"; 168 - }; 169 - } 170 - 171 - { 172 - name = "com.fasterxml.jackson.core/jackson-core"; 173 - path = pkgs.fetchMavenArtifact { 174 - inherit repos; 175 - artifactId = "jackson-core"; 176 - groupId = "com.fasterxml.jackson.core"; 177 - sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; 178 - version = "2.8.7"; 179 - }; 180 - } 181 - 182 - { 183 - name = "malabarba/lazy-map"; 184 - path = pkgs.fetchMavenArtifact { 185 - inherit repos; 186 - artifactId = "lazy-map"; 187 - groupId = "malabarba"; 188 - sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; 189 - version = "1.3"; 190 - }; 191 - } 192 - 193 - { 194 - name = "com.cognitect/transit-js"; 195 - path = pkgs.fetchMavenArtifact { 196 - inherit repos; 197 - artifactId = "transit-js"; 198 - groupId = "com.cognitect"; 199 - sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; 200 - version = "0.8.846"; 201 - }; 202 - } 203 - 204 - { 205 - name = "org.mozilla/rhino"; 206 - path = pkgs.fetchMavenArtifact { 207 - inherit repos; 208 - artifactId = "rhino"; 209 - groupId = "org.mozilla"; 210 - sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; 211 - version = "1.7R5"; 212 - }; 213 - } 214 - 215 - { 216 - name = "org.clojure/google-closure-library-third-party"; 217 - path = pkgs.fetchMavenArtifact { 218 - inherit repos; 219 - artifactId = "google-closure-library-third-party"; 220 - groupId = "org.clojure"; 221 - sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; 222 - version = "0.0-20170809-b9c14c6b"; 223 - }; 224 - } 225 - 226 - { 227 - name = "com.google.javascript/closure-compiler-externs"; 228 - path = pkgs.fetchMavenArtifact { 229 - inherit repos; 230 - artifactId = "closure-compiler-externs"; 231 - groupId = "com.google.javascript"; 232 - sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; 233 - version = "v20180805"; 234 - }; 235 - } 236 - 237 - { 238 - name = "org.javassist/javassist"; 239 - path = pkgs.fetchMavenArtifact { 240 - inherit repos; 241 - artifactId = "javassist"; 242 - groupId = "org.javassist"; 243 - sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f"; 244 - version = "3.18.1-GA"; 245 - }; 246 - } 247 - 248 - { 249 - name = "com.google.guava/guava"; 250 - path = pkgs.fetchMavenArtifact { 251 - inherit repos; 252 - artifactId = "guava"; 253 - groupId = "com.google.guava"; 254 - sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee"; 255 - version = "25.1-jre"; 256 - }; 257 - } 258 - 259 - { 260 - name = "org.msgpack/msgpack"; 261 - path = pkgs.fetchMavenArtifact { 262 - inherit repos; 263 - artifactId = "msgpack"; 264 - groupId = "org.msgpack"; 265 - sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449"; 266 - version = "0.6.12"; 267 - }; 268 - } 269 - 270 - { 271 - name = "com.google.j2objc/j2objc-annotations"; 272 - path = pkgs.fetchMavenArtifact { 273 - inherit repos; 274 - artifactId = "j2objc-annotations"; 275 - groupId = "com.google.j2objc"; 276 - sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0"; 277 - version = "1.1"; 278 - }; 279 - } 280 - 281 - { 282 - name = "com.cognitect/transit-clj"; 283 - path = pkgs.fetchMavenArtifact { 284 - inherit repos; 285 - artifactId = "transit-clj"; 286 - groupId = "com.cognitect"; 287 - sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba"; 288 - version = "0.8.309"; 289 - }; 290 - } 291 - 292 - { 293 - name = "args4j/args4j"; 294 - path = pkgs.fetchMavenArtifact { 295 - inherit repos; 296 - artifactId = "args4j"; 297 - groupId = "args4j"; 298 - sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb"; 299 - version = "2.0.26"; 300 - }; 301 - } 302 - 303 - { 304 - name = "org.clojure/core.rrb-vector"; 305 - path = pkgs.fetchMavenArtifact { 306 - inherit repos; 307 - artifactId = "core.rrb-vector"; 308 - groupId = "org.clojure"; 309 - sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155"; 310 - version = "0.0.14"; 311 - }; 312 - } 313 - 314 - { 315 - name = "org.checkerframework/checker-qual"; 316 - path = pkgs.fetchMavenArtifact { 317 - inherit repos; 318 - artifactId = "checker-qual"; 319 - groupId = "org.checkerframework"; 320 - sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7"; 321 - version = "2.0.0"; 322 - }; 323 - } 324 - 325 - { 326 - name = "org.clojure/tools.reader"; 327 - path = pkgs.fetchMavenArtifact { 328 - inherit repos; 329 - artifactId = "tools.reader"; 330 - groupId = "org.clojure"; 331 - sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6"; 332 - version = "1.3.2"; 333 - }; 334 - } 335 - 336 - { 337 - name = "com.google.javascript/closure-compiler-unshaded"; 338 - path = pkgs.fetchMavenArtifact { 339 - inherit repos; 340 - artifactId = "closure-compiler-unshaded"; 341 - groupId = "com.google.javascript"; 342 - sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d"; 343 - version = "v20180805"; 344 - }; 345 - } 346 - 347 - { 348 - name = "org.clojure/test.check"; 349 - path = pkgs.fetchMavenArtifact { 350 - inherit repos; 351 - artifactId = "test.check"; 352 - groupId = "org.clojure"; 353 - sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf"; 354 - version = "0.10.0-alpha4"; 355 - }; 356 - } 357 - 358 - { 359 - name = "com.google.protobuf/protobuf-java"; 360 - path = pkgs.fetchMavenArtifact { 361 - inherit repos; 362 - artifactId = "protobuf-java"; 363 - groupId = "com.google.protobuf"; 364 - sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998"; 365 - version = "3.0.2"; 366 - }; 367 - } 368 - 369 - { 370 - name = "com.google.code.findbugs/jsr305"; 371 - path = pkgs.fetchMavenArtifact { 372 - inherit repos; 373 - artifactId = "jsr305"; 374 - groupId = "com.google.code.findbugs"; 375 - sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804"; 376 - version = "3.0.2"; 377 - }; 378 - } 379 - 380 - { 381 - name = "com.google.code.gson/gson"; 382 - path = pkgs.fetchMavenArtifact { 383 - inherit repos; 384 - artifactId = "gson"; 385 - groupId = "com.google.code.gson"; 386 - sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a"; 387 - version = "2.7"; 388 - }; 389 - } 390 - 391 - ]; 392 - }
-20
pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch
··· 1 - diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js 2 - index 21e78bb..ecbfca4 100644 3 - --- a/vendor/nexe/exe.js 4 - +++ b/vendor/nexe/exe.js 5 - @@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath); 6 - */ 7 - 8 - function makeOutputDirectory(next) { 9 - - mkdirp(path.dirname(options.output), function() { 10 - - next(); 11 - - }); 12 - + mkdirp(path.dirname(options.output)).then(() => next()); 13 - }, 14 - 15 - /** 16 - @@ -1107,4 +1105,3 @@ exports.package = function(path, options) { 17 - 18 - return obj; 19 - } 20 - -
-13
pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch
··· 1 - diff --git a/scripts/bundle.js b/scripts/bundle.js 2 - index 16425a4..0d510fc 100644 3 - --- a/scripts/bundle.js 4 - +++ b/scripts/bundle.js 5 - @@ -73,6 +73,8 @@ const plugins = [ 6 - if (!isDevBuild) { 7 - plugins.push( 8 - babelMinify({ 9 - + evaluate: false, 10 - + mangle: false, 11 - comments: false, 12 - removeConsole: true, 13 - removeDebugger: true,
-51
pkgs/development/interpreters/clojurescript/lumo/package.json
··· 1 - { 2 - "name": "lumo-build-deps", 3 - "version": "1.10.1", 4 - "dependencies": { 5 - "@babel/core": "^7.1.5", 6 - "@babel/plugin-external-helpers": "7.8.3", 7 - "@babel/plugin-proposal-class-properties": "^7.1.0", 8 - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", 9 - "@babel/plugin-transform-runtime": "^7.1.0", 10 - "@babel/preset-env": "^7.1.5", 11 - "@babel/preset-stage-2": "7.8.3", 12 - "@babel/runtime": "^7.1.5", 13 - "async": "^3.1.1", 14 - "async-retry": "^1.2.3", 15 - "babel-core": "^7.0.0-bridge.0", 16 - "babel-eslint": "10.0.3", 17 - "babel-jest": "^25.1.0", 18 - "babel-loader": "^8.0.4", 19 - "babel-plugin-transform-flow-strip-types": "6.22.0", 20 - "browserify": "^16.2.3", 21 - "chalk": "^3.0.0", 22 - "colors": "^1.3.3", 23 - "cross-env": "7.0.0", 24 - "death": "^1.1.0", 25 - "flow-bin": "0.118.0", 26 - "google-closure-compiler-js": "20170910.0.1", 27 - "glob": "^7.1.3", 28 - "gunzip-maybe": "^1.4.1", 29 - "insert-module-globals": "^7.2.0", 30 - "jszip": "2.x", 31 - "mkdirp": "^1.0.3", 32 - "ncp": "^2.0.0", 33 - "node-fetch": "^2.2.1", 34 - "paredit.js": "0.3.6", 35 - "posix-getopt": "github:anmonteiro/node-getopt#master", 36 - "prettier": "1.19.1", 37 - "progress": "^2.0.0", 38 - "read-pkg": "^5.2.0", 39 - "request": "^2.88.0", 40 - "rollup": "^1.9.0", 41 - "rollup-plugin-babel": "^4.3.2", 42 - "rollup-plugin-babel-minify": "^9.1.1", 43 - "rollup-plugin-commonjs": "^10.0.0", 44 - "rollup-plugin-node-resolve": "^5.0.0", 45 - "rollup-plugin-replace": "^2.1.1", 46 - "tar-stream": "^2.0.1", 47 - "webpack": "^4.25.1", 48 - "webpack-cli": "^3.2.3", 49 - "which-promise": "^1.0.0" 50 - } 51 - }
+17 -11
pkgs/development/libraries/waylandpp/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 3 , cmake 4 + , makeFontsConf 4 5 , pkg-config 5 6 , pugixml 6 7 , wayland ··· 8 9 , libffi 9 10 , buildPackages 10 11 , docSupport ? true 11 - , doxygen ? null 12 - , graphviz ? null 12 + , doxygen 13 + , graphviz 13 14 }: 14 15 15 - assert docSupport -> doxygen != null; 16 - 17 - with lib; 18 16 stdenv.mkDerivation rec { 19 17 pname = "waylandpp"; 20 - version = "0.2.10"; 18 + version = "1.0.0"; 21 19 22 20 src = fetchFromGitHub { 23 21 owner = "NilsBrause"; 24 22 repo = pname; 25 23 rev = version; 26 - sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o="; 24 + hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; 27 25 }; 28 26 29 27 cmakeFlags = [ ··· 32 30 "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" 33 31 ]; 34 32 35 - nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; 33 + # Complains about not being able to find the fontconfig config file otherwise 34 + FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf { fontDirectories = [ ]; }); 35 + 36 + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals docSupport [ doxygen graphviz ]; 36 37 buildInputs = [ pugixml wayland libGL libffi ]; 37 38 38 - outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; 39 + outputs = [ "bin" "dev" "lib" "out" ] ++ lib.optionals docSupport [ "doc" "devman" ]; 40 + 41 + # Resolves the warning "Fontconfig error: No writable cache directories" 42 + preBuild = '' 43 + export XDG_CACHE_HOME="$(mktemp -d)" 44 + ''; 39 45 40 46 meta = with lib; { 41 47 description = "Wayland C++ binding"; 42 48 homepage = "https://github.com/NilsBrause/waylandpp/"; 43 - license = with licenses; [ bsd2 hpnd ]; 44 - maintainers = with maintainers; [ minijackson ]; 49 + license = with lib.licenses; [ bsd2 hpnd ]; 50 + maintainers = with lib.maintainers; [ minijackson ]; 45 51 }; 46 52 }
+35 -19
pkgs/development/python-modules/ibis-framework/default.nix
··· 5 5 , pytestCheckHook 6 6 , atpublic 7 7 , cached-property 8 + , click 9 + , clickhouse-cityhash 8 10 , clickhouse-driver 9 - , click 10 11 , dask 11 12 , datafusion 12 13 , duckdb 13 14 , duckdb-engine 14 - , graphviz 15 + , geoalchemy2 16 + , geopandas 17 + , graphviz-nox 15 18 , importlib-metadata 19 + , lz4 16 20 , multipledispatch 17 21 , numpy 22 + , packaging 18 23 , pandas 19 24 , parsy 20 25 , poetry-core 21 26 , poetry-dynamic-versioning 27 + , psycopg2 22 28 , pyarrow 23 29 , pydantic 30 + , pymysql 31 + , pyspark 24 32 , pytest-benchmark 33 + , pytest-randomly 25 34 , pytest-mock 26 35 , pytest-xdist 27 36 , python 28 37 , pytz 29 38 , regex 30 - , requests 39 + , shapely 31 40 , sqlalchemy 32 41 , sqlite 33 42 , tabulate 34 43 , toolz 35 44 }: 36 45 let 37 - # ignore tests for which dependencies are not available 38 - backends = [ 46 + testBackends = [ 39 47 "dask" 40 48 "datafusion" 41 49 "duckdb" ··· 70 78 propagatedBuildInputs = [ 71 79 atpublic 72 80 cached-property 73 - clickhouse-driver 74 - dask 75 - datafusion 76 - duckdb 77 - duckdb-engine 78 - graphviz 79 81 importlib-metadata 80 82 multipledispatch 81 83 numpy 84 + packaging 82 85 pandas 83 86 parsy 84 87 poetry-dynamic-versioning 85 - pyarrow 86 88 pydantic 87 89 pytz 88 90 regex 89 - requests 90 - sqlalchemy 91 91 tabulate 92 92 toolz 93 93 ]; ··· 97 97 click 98 98 pytest-benchmark 99 99 pytest-mock 100 + pytest-randomly 100 101 pytest-xdist 101 - sqlite 102 - ]; 102 + ] ++ lib.concatMap (name: passthru.extras-require.${name}) testBackends; 103 103 104 104 preBuild = '' 105 105 # setup.py exists only for developer convenience and is automatically generated ··· 109 109 pytestFlagsArray = [ 110 110 "--dist=loadgroup" 111 111 "-m" 112 - "'${lib.concatStringsSep " or " backends} or core'" 112 + "'${lib.concatStringsSep " or " testBackends} or core'" 113 113 ]; 114 114 115 115 preCheck = '' ··· 125 125 find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} + 126 126 127 127 # load data 128 - for backend in ${lib.concatStringsSep " " backends}; do 128 + for backend in ${lib.concatStringsSep " " testBackends}; do 129 129 ${python.interpreter} ci/datamgr.py load "$backend" 130 130 done 131 131 ''; ··· 136 136 137 137 pythonImportsCheck = [ 138 138 "ibis" 139 - ] ++ (map (backend: "ibis.backends.${backend}") backends); 139 + ] ++ map (backend: "ibis.backends.${backend}") testBackends; 140 + 141 + passthru = { 142 + extras-require = { 143 + clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 ]; 144 + dask = [ dask pyarrow ]; 145 + datafusion = [ datafusion ]; 146 + duckdb = [ duckdb duckdb-engine sqlalchemy ]; 147 + geospatial = [ geoalchemy2 geopandas shapely ]; 148 + mysql = [ pymysql sqlalchemy ]; 149 + pandas = [ ]; 150 + postgres = [ psycopg2 sqlalchemy ]; 151 + pyspark = [ pyarrow pyspark ]; 152 + sqlite = [ sqlalchemy sqlite ]; 153 + visualization = [ graphviz-nox ]; 154 + }; 155 + }; 140 156 141 157 meta = with lib; { 142 158 description = "Productivity-centric Python Big Data Framework";
+2 -2
pkgs/development/python-modules/nbclient/default.nix
··· 15 15 16 16 let nbclient = buildPythonPackage rec { 17 17 pname = "nbclient"; 18 - version = "0.6.2"; 18 + version = "0.6.3"; 19 19 format = "setuptools"; 20 20 21 21 disabled = pythonOlder "3.7"; 22 22 23 23 src = fetchPypi { 24 24 inherit pname version; 25 - hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs="; 25 + hash = "sha256-uAcm/B+4mg6Pi+HnfijQAmsejtkLwUPIoMdiLk+M3Z4="; 26 26 }; 27 27 28 28 propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
+2
pkgs/development/python-modules/pyopenssl/default.nix
··· 74 74 homepage = "https://github.com/pyca/pyopenssl"; 75 75 license = licenses.asl20; 76 76 maintainers = with maintainers; [ SuperSandro2000 ]; 77 + # https://github.com/pyca/pyopenssl/issues/873 78 + broken = stdenv.isDarwin && stdenv.isAarch64; 77 79 }; 78 80 }
+4 -4
pkgs/development/python-modules/ujson/default.nix
··· 10 10 buildPythonPackage rec { 11 11 pname = "ujson"; 12 12 version = "5.1.0"; 13 - disabled = isPyPy || pythonOlder "3.5"; 13 + disabled = isPyPy || pythonOlder "3.7"; 14 14 15 15 src = fetchPypi { 16 16 inherit pname version; ··· 28 28 pythonImportsCheck = [ "ujson" ]; 29 29 30 30 meta = with lib; { 31 - description = "Ultra fast JSON encoder and decoder for Python"; 32 - homepage = "https://pypi.python.org/pypi/ujson"; 31 + description = "Ultra fast JSON encoder and decoder"; 32 + homepage = "https://github.com/ultrajson/ultrajson"; 33 33 license = licenses.bsd3; 34 - maintainers = with maintainers; [ ]; 34 + maintainers = with maintainers; [ SuperSandro2000 ]; 35 35 }; 36 36 }
+5 -9
pkgs/games/gimx/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 2 - , ncurses5, bluez, libmhash, gimxPDP ? false }: 2 + , ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: 3 3 4 4 let 5 5 gimx-config = fetchFromGitHub { ··· 11 11 12 12 in stdenv.mkDerivation rec { 13 13 pname = "gimx"; 14 - version = "8.0"; 14 + version = "unstable-2021-08-31"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "matlo"; 18 18 repo = "GIMX"; 19 - rev = "v${version}"; 19 + rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a"; 20 20 fetchSubmodules = true; 21 - sha256 = "0265gg6q7ymg76fb4pjrfdwjd280b3zzry96qy92w0h411slph85"; 21 + sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; 22 22 }; 23 23 24 24 patches = [ ./conf.patch ]; ··· 28 28 xorg.libX11 xorg.libXi xorg.libXext 29 29 ]; 30 30 31 - postPatch = lib.optionals gimxPDP '' 31 + postPatch = lib.optionals gimxPdpGamepad '' 32 32 substituteInPlace ./shared/gimxcontroller/include/x360.h \ 33 33 --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" 34 34 substituteInPlace ./loader/firmware/EMU360.hex \ ··· 60 60 cp -r ${./custom} $out/share/custom 61 61 62 62 makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \ 63 - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ 64 - --add-flags "-c $out/share/config/Dualshock4.xml" 65 - 66 - makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4-noff \ 67 63 --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ 68 64 --add-flags "-c $out/share/custom/Dualshock4.xml" 69 65
+2 -11
pkgs/servers/uxplay/default.nix
··· 2 2 , stdenv 3 3 , pkg-config 4 4 , fetchFromGitHub 5 - , fetchpatch 6 5 , cmake 7 6 , wrapGAppsHook 8 7 , avahi ··· 14 13 15 14 stdenv.mkDerivation rec { 16 15 pname = "uxplay"; 17 - version = "1.50"; 16 + version = "1.52"; 18 17 19 18 src = fetchFromGitHub { 20 19 owner = "FDH2"; 21 20 repo = "UxPlay"; 22 21 rev = "v${version}"; 23 - sha256 = "sha256-43BCpYh0XtsnI064/ddcz2/Imj399g+bxLlT0BpqLMI="; 22 + sha256 = "sha256-2wPUG50fbXLg6w2Rni3NyeiCyUNPcOvxvqopD9QZJaQ="; 24 23 }; 25 - 26 - patches = [ 27 - # https://github.com/FDH2/UxPlay/issues/91 28 - (fetchpatch { 29 - url = "https://github.com/FDH2/UxPlay/commit/f373fb2edcfb1f4c279e5796cf21e4a865800a71.patch"; 30 - sha256 = "sha256-ENT/sMyPjDdZ4gdxiatYJ/UxuCl+ekk0iQOn8ELDAKQ="; 31 - }) 32 - ]; 33 24 34 25 nativeBuildInputs = [ 35 26 cmake
+16 -3
pkgs/tools/admin/exoscale-cli/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub }: 1 + { lib, buildGoModule, fetchFromGitHub, installShellFiles }: 2 2 3 3 buildGoModule rec { 4 4 pname = "exoscale-cli"; ··· 13 13 14 14 vendorSha256 = null; 15 15 16 - excludedPackages = [ "./completion" "./docs" ]; 16 + nativeBuildInputs = [ installShellFiles ]; 17 17 18 18 ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; 19 19 ··· 21 21 # because these are passed to "go install" which does not recognize -o 22 22 postBuild = '' 23 23 mv $GOPATH/bin/cli $GOPATH/bin/exo 24 + 25 + mkdir -p manpage 26 + $GOPATH/bin/docs --man-page 27 + rm $GOPATH/bin/docs 28 + 29 + $GOPATH/bin/completion bash 30 + $GOPATH/bin/completion zsh 31 + rm $GOPATH/bin/completion 32 + ''; 33 + 34 + postInstall = '' 35 + installManPage manpage/* 36 + installShellCompletion --cmd exo --bash bash_completion --zsh zsh_completion 24 37 ''; 25 38 26 39 meta = { 27 40 description = "Command-line tool for everything at Exoscale: compute, storage, dns"; 28 41 homepage = "https://github.com/exoscale/cli"; 29 42 license = lib.licenses.asl20; 30 - maintainers = with lib.maintainers; [ dramaturg ]; 43 + maintainers = with lib.maintainers; [ dramaturg viraptor ]; 31 44 mainProgram = "exo"; 32 45 }; 33 46 }
+1
pkgs/top-level/aliases.nix
··· 776 776 lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 777 777 lua5_expat = throw "'lua5_expat' has been renamed to/replaced by 'luaPackages.luaexpat'"; # Converted to throw 2022-02-22 778 778 lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 779 + lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 779 780 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 780 781 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 781 782 lzma = xz; # moved from top-level 2021-03-14
+7 -11
pkgs/top-level/all-packages.nix
··· 4235 4235 4236 4236 rav1e = callPackage ../tools/video/rav1e { }; 4237 4237 4238 + raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; 4239 + 4238 4240 razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; 4239 4241 4240 4242 replay-sorcery = callPackage ../tools/video/replay-sorcery { }; ··· 10813 10815 10814 10816 thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; 10815 10817 10816 - thedesk = callPackage ../applications/misc/thedesk { 10817 - electron = electron_14; 10818 - }; 10818 + thedesk = callPackage ../applications/misc/thedesk { }; 10819 10819 10820 10820 theharvester = callPackage ../tools/security/theharvester { }; 10821 10821 ··· 14252 14252 14253 14253 kanif = callPackage ../applications/networking/cluster/kanif { }; 14254 14254 14255 - lumo = callPackage ../development/interpreters/clojurescript/lumo { 14256 - nodejs = nodejs_latest; 14257 - }; 14258 - 14259 14255 kona = callPackage ../development/interpreters/kona {}; 14260 14256 14261 14257 lolcode = callPackage ../development/interpreters/lolcode { }; ··· 25632 25628 25633 25629 csa = callPackage ../applications/audio/csa { }; 25634 25630 25635 - csound = callPackage ../applications/audio/csound { }; 25631 + csound = callPackage ../applications/audio/csound { 25632 + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI; 25633 + }; 25636 25634 25637 25635 csound-manual = callPackage ../applications/audio/csound/csound-manual { 25638 25636 python = python27; ··· 30527 30525 30528 30526 weston = callPackage ../applications/window-managers/weston { }; 30529 30527 30530 - whalebird = callPackage ../applications/misc/whalebird { 30531 - electron = electron_14; 30532 - }; 30528 + whalebird = callPackage ../applications/misc/whalebird { }; 30533 30529 30534 30530 wio = callPackage ../applications/window-managers/wio { 30535 30531 wlroots = wlroots_0_14;