diff options
Diffstat (limited to 'nixpkgs/pkgs/development')
782 files changed, 28007 insertions, 5206 deletions
diff --git a/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/nixpkgs/pkgs/development/compilers/aspectj/default.nix index 639ca8122762..46e76e02fca6 100644 --- a/nixpkgs/pkgs/development/compilers/aspectj/default.nix +++ b/nixpkgs/pkgs/development/compilers/aspectj/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "aspectj"; - version = "1.9.19"; + version = "1.9.20"; builder = ./builder.sh; src = let versionSnakeCase = builtins.replaceStrings ["."] ["_"] version; in fetchurl { url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M="; + sha256 = "sha256-zrU7JlEyUwoYxQ+sTaJM4YGVW5NucDXDiEao4glJAk0="; }; inherit jre; diff --git a/nixpkgs/pkgs/development/compilers/cairo/default.nix b/nixpkgs/pkgs/development/compilers/cairo/default.nix index 46eeaec16782..31eda13e26b0 100644 --- a/nixpkgs/pkgs/development/compilers/cairo/default.nix +++ b/nixpkgs/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg="; + hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw="; }; - cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE="; + cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg="; nativeCheckInputs = [ rustfmt diff --git a/nixpkgs/pkgs/development/compilers/ccl/default.nix b/nixpkgs/pkgs/development/compilers/ccl/default.nix index cbf89d5253dc..332e0b1bccf4 100644 --- a/nixpkgs/pkgs/development/compilers/ccl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ccl/default.nix @@ -2,10 +2,10 @@ let options = rec { - /* TODO: there are also FreeBSD and Windows versions */ + # TODO: there are also FreeBSD and Windows versions x86_64-linux = { arch = "linuxx86"; - sha256 = "0d5bsizgpw9hv0jfsf4bp5sf6kxh8f9hgzz9hsjzpfhs3npmmac4"; + sha256 = "0mhmm8zbk42p2b9amy702365m687k5p0xnz010yqrki6mwyxlkx9"; runtime = "lx86cl64"; kernel = "linuxx8664"; }; @@ -17,13 +17,13 @@ let }; armv7l-linux = { arch = "linuxarm"; - sha256 = throw "ccl all-in-one linuxarm archive missing upstream"; + sha256 = "1a4y07cmmn1r88b4hl4msb0bvr2fxd2vw9lf7h4j9f7a5rpq7124"; runtime = "armcl"; kernel = "linuxarm"; }; x86_64-darwin = { arch = "darwinx86"; - sha256 = "1l060719k8mjd70lfdnr0hkybk7v88zxvfrsp7ww50q808cjffqk"; + sha256 = "1xclnik6pqhkmr15cbqa2n1ddzdf0rs452lyiln3c42nmkf9jjb6"; runtime = "dx86cl64"; kernel = "darwinx8664"; }; @@ -31,49 +31,15 @@ let }; cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); - # The 1.12 github release of CCL seems to be missing the usual - # ccl-1.12-linuxarm.tar.gz tarball, so we build it ourselves here - linuxarm-src = runCommand "ccl-1.12-linuxarm.tar.gz" { - outer = fetchurl { - url = "https://github.com/Clozure/ccl/archive/v1.12.tar.gz"; - sha256 = "0lmxhll6zgni0l41h4kcf3khbih9r0f8xni6zcfvbi3dzfs0cjkp"; - }; - inner = fetchurl { - url = "https://github.com/Clozure/ccl/releases/download/v1.12/linuxarm.tar.gz"; - sha256 = "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c"; - }; - } '' - tar xf $outer - tar xf $inner -C ccl - tar czf $out ccl - ''; - -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "ccl"; - version = "1.12"; + version = "1.12.2"; - src = if cfg.arch == "linuxarm" then linuxarm-src else fetchurl { + src = fetchurl { url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz"; sha256 = cfg.sha256; }; - patches = [ - # Pull upstream fiux for -fno-common toolchains: - # https://github.com/Clozure/ccl/pull/316 - (fetchpatch { - name = "fno-common-p1.patch"; - url = "https://github.com/Clozure/ccl/commit/185dc1a00e7492f8be98e5f93b561758423595f1.patch"; - sha256 = "0wqfds7346qdwdsxz3bl2p601ib94rdp9nknj7igj01q8lqfpajw"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "https://github.com/Clozure/ccl/commit/997de91062d1f152d0c3b322a1e3694243e4a403.patch"; - sha256 = "10w6zw8wgalkdyya4m48lgca4p9wgcp1h44hy9wqr94dzlllq0f6"; - }) - ]; - buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/default.nix b/nixpkgs/pkgs/development/compilers/chicken/4/default.nix index 08952e028de5..de64d20d3e05 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/4/default.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/4/default.nix @@ -18,4 +18,4 @@ let egg2nix = callPackage ./egg2nix.nix { }; }; -in lib.recurseIntoAttrs self +in self diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/default.nix b/nixpkgs/pkgs/development/compilers/chicken/5/default.nix index 6aed893c97e6..e66b4940ff03 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/default.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/default.nix @@ -1,40 +1,42 @@ { lib, newScope, fetchurl }: -let - callPackage = newScope self; - self = with lib; { - inherit callPackage; +lib.makeScope newScope (self: { - fetchegg = { pname, version, sha256, ... }: - fetchurl { - inherit sha256; - url = - "https://code.call-cc.org/egg-tarballs/5/${pname}/${pname}-${version}.tar.gz"; - }; - - eggDerivation = callPackage ./eggDerivation.nix { }; - - chicken = callPackage ./chicken.nix { - bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; }; + fetchegg = { pname, version, sha256, ... }: + fetchurl { + inherit sha256; + url = + "https://code.call-cc.org/egg-tarballs/5/${pname}/${pname}-${version}.tar.gz"; }; - chickenEggs = recurseIntoAttrs (mapAttrs (pname: - eggData@{ version, synopsis, dependencies, license, ... }: - self.eggDerivation { - name = "${pname}-${version}"; - src = self.fetchegg (eggData // { inherit pname; }); - buildInputs = map (x: self.chickenEggs.${x}) dependencies; - meta.homepage = - "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; - meta.description = synopsis; - meta.license = (licenses // { - "bsd-2-clause" = licenses.bsd2; - "bsd-3-clause" = licenses.bsd3; - "public-domain" = licenses.publicDomain; - }).${license} or license; - }) (importTOML ./deps.toml)); + eggDerivation = self.callPackage ./eggDerivation.nix { }; - egg2nix = callPackage ./egg2nix.nix { }; + chicken = self.callPackage ./chicken.nix { + bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; }; }; -in lib.recurseIntoAttrs self + chickenEggs = lib.recurseIntoAttrs (lib.makeScope self.newScope (eggself: + (lib.mapAttrs + (pname: + eggData@{ version, synopsis, dependencies, license, ... }: + self.eggDerivation { + name = "${pname}-${version}"; + src = self.fetchegg (eggData // { inherit pname; }); + buildInputs = map (x: eggself.${x}) dependencies; + meta.homepage = + "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; + meta.description = synopsis; + meta.license = (lib.licenses // { + "bsd-1-clause" = lib.licenses.bsd1; + "bsd-2-clause" = lib.licenses.bsd2; + "bsd-3-clause" = lib.licenses.bsd3; + "lgpl-2.0+" = lib.licenses.lgpl2Plus; + "lgpl-2.1-or-later" = lib.licenses.lgpl21Plus; + "public-domain" = lib.licenses.publicDomain; + }).${license} or license; + }) + (lib.importTOML ./deps.toml)))); + + egg2nix = self.callPackage ./egg2nix.nix { }; + +}) diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml b/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml index b61c38506bb5..e54ac4691c70 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml +++ b/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml @@ -107,9 +107,9 @@ version = "0.6" [apropos] dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "1xnqfnbnac4pzm4j3mphq09p18q962dxg11cfyxqk8k6v8qrv5nh" +sha256 = "0njkdxwd9122l9vql64nqm7dy3lggikr2bzwidwk7i8yz3nm3g6w" synopsis = "CHICKEN apropos" -version = "3.7.2" +version = "3.8.1" [arcadedb] dependencies = ["uri-common", "medea"] @@ -282,9 +282,9 @@ version = "1.37" [bitwise-utils] dependencies = [] license = "public-domain" -sha256 = "09fdcv81069br4pz0ccr2jj6xgakvwbshdiy21r85865r7r6g05m" +sha256 = "065q6ha8wsj6qhg7zxkaj2qrj5sm3iz2v7shcp5wh7j3fqwbs5q5" synopsis = "Bitwise utilities" -version = "1.2.5" +version = "1.3.0" [blas] dependencies = ["bind", "compile-file", "srfi-13"] @@ -364,11 +364,11 @@ synopsis = "Byte array utility procedures for blobs." version = "2.3" [cairo] -dependencies = [] +dependencies = ["srfi-1"] license = "lgpl-2.1" -sha256 = "1krsjlydqa9zj0bpad0w4x636kg30ng1azlyyn8j8vx3b8lcd362" +sha256 = "1x69i4aysn8mf93ic36947p6gvgglk8c0vg2m6vdhimf6y65szi1" synopsis = "Chicken bindings for Cairo, a vector graphics library" -version = "0.1.17" +version = "0.1.18" [call-table-generics] dependencies = ["brev-separate"] @@ -1157,9 +1157,9 @@ version = "0.4.2" [gochan] dependencies = ["matchable", "srfi-18", "queues"] license = "bsd" -sha256 = "1yp3yzfx97qfx8kkxvjvs1vnr2h8iffnx1zaqq05dbh5ivnx74j8" +sha256 = "1pyzr387zbbw7x9zk524qcs368hzxv4c46p24cz3x2nl30y84d5h" synopsis = "golang channels in CHICKEN" -version = "5.2.9" +version = "5.2.10" [graph-bfs] dependencies = ["srfi-1", "iset", "matchable", "yasos", "digraph"] @@ -1213,9 +1213,9 @@ version = "0.10.1" [hash-trie] dependencies = [] license = "mit" -sha256 = "0kcr99fdc0b09inq8ansb79ynblcxryvsg67zfms5y7z91v11p0c" +sha256 = "1860bp5h3kh0ra6b2qvb5pccylajq1x2hng0skqnv8ik068lnfr0" synopsis = "hash-trie" -version = "1.1.7" +version = "1.1.8" [heap-o-rama] dependencies = ["srfi-18"] @@ -1395,9 +1395,9 @@ version = "0.3" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "1cxjbl5kl4xk42a4p8j3av6ip0gqvp5yxahsccvm0snc98n3ngqg" +sha256 = "1mw6z3piddy9xz494kv0243jhhirlb1dp15dph2p1ks4bhipbr4m" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.12" +version = "0.0.13" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1556,9 +1556,9 @@ version = "1.2.1" [list-utils] dependencies = ["utf8", "srfi-1", "check-errors"] license = "bsd" -sha256 = "0wqmsvh3sfgp8ssh98n8y615lxnjlcda1k375jfss7vf8k5xn032" +sha256 = "0sbd04kmiahk7mbw1cy64n1qjz2rpldjx66aj41r964kjscm6izv" synopsis = "list-utils" -version = "2.4.3" +version = "2.5.1" [live-define] dependencies = ["matchable"] @@ -1794,9 +1794,9 @@ version = "0.7" [micro-benchmark] dependencies = ["micro-stats", "srfi-1"] license = "gplv3" -sha256 = "0ahvxdm350bc9v80gnb8ccmjqqp60jznfjkx7w5ypf0q61mnj8sj" +sha256 = "022fkwr1wm1im40rgk3g5dz8n4rvlw1zdmskqsh9idv31gbfi456" synopsis = "Easily create micro-benchmarks" -version = "0.0.19" +version = "0.0.20" [micro-stats] dependencies = ["srfi-1", "sequences", "sequences-utils"] @@ -2333,9 +2333,9 @@ version = "2.1.2" [rlimit] dependencies = ["srfi-13"] license = "bsd" -sha256 = "0jmz98253k3q9a6kyyby6jm722w3s74c5y3km7ih9ybjjmcdkyzv" +sha256 = "1yxdn9y11i8s9mj5dknlpz588d48bklylxcq73v0s48a5m7vfpwp" synopsis = "Setting resource limits" -version = "1.0.1" +version = "1.0.2" [rocksdb] dependencies = [] @@ -2368,9 +2368,9 @@ version = "0.9.12" [s9fes-char-graphics] dependencies = ["srfi-1", "utf8", "format"] license = "public-domain" -sha256 = "1h12l59860cyv8xwvvpf96dnlqwd25mrq2qapj9nyxv0vbkcs4p6" +sha256 = "1ysz8vrx7zwfv4drx955ca28avmdfilafd9a20sl67y5vwb47i8m" synopsis = "Scheme 9 from Empty Space Char Graphics" -version = "1.3.3" +version = "1.4.2" [salmonella-diff] dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"] @@ -2508,9 +2508,9 @@ version = "1.9.1" [sequences-utils] dependencies = ["srfi-1", "srfi-69", "sequences"] license = "bsd" -sha256 = "0s5yadn034a3g89xjcy0yxga7k60dadcnynv16yvbcfg4wjrs81k" +sha256 = "1c0yq4bzq6lkax4pwky5vyb2gl0yw88r7fzsbx37xsw14lb4fl64" synopsis = "(More) Generic sequence operators" -version = "0.4.0" +version = "0.5.0" [sequences] dependencies = ["fast-generic", "srfi-42"] @@ -3047,9 +3047,9 @@ version = "0.2.3" [srfi-18] dependencies = [] license = "bsd" -sha256 = "0v2pkdck0ji1wiqgg8sg4z6rbkj2qw4vy4b9lx0w0pmhlxqpg1xd" +sha256 = "0mkg3g045md9v74p4ac24q0c4xvvinz1nggakyg7wlg7c176i2l9" synopsis = "SRFI-18 thread library" -version = "0.1.6" +version = "0.1.7" [srfi-180] dependencies = ["r7rs", "srfi-60", "srfi-145", "srfi-121"] @@ -3068,9 +3068,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "14nyv6m67k2angmhg028rd50mq77qi1zfr5f0praiyy07k2pmcpz" +sha256 = "0mq9nd1ck1qq9bs415xw4sqlbw1jcrg9n1vrh8kiqy197xbymh0h" synopsis = "Time Data Types and Procedures" -version = "4.7.3" +version = "4.7.5" [srfi-193] dependencies = [] @@ -3159,9 +3159,9 @@ version = "4.2.2" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] license = "bsd" -sha256 = "1wxz4kj6dqylfiqi035vzsphgbj68y6wwivmx25z5j11c8v3s81c" +sha256 = "15g2knq5b76f3nhxnmxidhkvbw9dyyc00hrzvsnpkmnfqzcmxbxw" synopsis = "Localization" -version = "3.0.6" +version = "3.0.7" [srfi-34] dependencies = [] @@ -3647,11 +3647,11 @@ synopsis = "tracing and breakpoints" version = "2.0" [transducers] -dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors"] +dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors", "r7rs"] license = "mit" -sha256 = "0mkrrfvskwgy5w8c9gz21np3p9857sm8fylq0hjz608jaxzybpcz" +sha256 = "162f0xvk69jha55sszdkgm47q18k3x5bc2g6psn2107im4ma45fi" synopsis = "Transducers for working with foldable data types." -version = "0.4.0" +version = "0.4.2" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] @@ -3789,9 +3789,9 @@ version = "3.6.3" [uuid-lib] dependencies = ["record-variants"] license = "bsd" -sha256 = "0da71k0f3j1l9wjnfk9gqs9gw3v1192xhxbxv2gfmah3fvxf203p" +sha256 = "1hk5p2yvwq4dx93a1wnxggrbwkh050b6m9jlw44s7xvhxhvdqyns" synopsis = "OSF DCE 1.1 UUID" -version = "0.0.10" +version = "0.0.14" [uuid] dependencies = [] @@ -3915,9 +3915,9 @@ version = "0.2" [zshbrev] dependencies = ["brev"] license = "lgplv3" -sha256 = "16sn87z72x8d4ddbkwgz1jxas471r5nvazwi0klsn204v1qc30dy" +sha256 = "1id8a728ibi3fzcpfdd7ary41g7nrlb7pc3vjpmz70jp1q53qppx" synopsis = "Access Chicken functions from any shell and access zsh functions from Chicken" -version = "1.19" +version = "1.20" [zstd] dependencies = [] diff --git a/nixpkgs/pkgs/development/compilers/circt/default.nix b/nixpkgs/pkgs/development/compilers/circt/default.nix index 19765f97a174..77482b048a8d 100644 --- a/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-IEMIFbMBLEKgntDiRfVH6qgj9a5RLWQnKrMnl5A3AYQ="; + sha256 = "sha256-ol8inyUrKezv+lhDIq2DhP4LHNJLhZylRbtIfoVAMYk="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/compilers/closure/default.nix b/nixpkgs/pkgs/development/compilers/closure/default.nix index bb8294ff6c73..02fff2b3d9b3 100644 --- a/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20230502"; + version = "20230802"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-h/kKVX49KuivQwrG9KQr7PG0U0heiQmZd3pSyQvanSI="; + sha256 = "sha256-IwqeBain2dqgg7H26G7bpusexkAqaiWEMv5CRc3EqV8="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh index 89801eb7c21a..e75a84a9550e 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh @@ -2,4 +2,4 @@ # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for # CUDAToolkit_ROOT. We have to help it locate libcudart -export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" +export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh index 89256e86f789..5ea57594211c 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh @@ -56,7 +56,7 @@ setupCUDAToolkitCompilers() { # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for # CUDAToolkit_ROOT. We have to help it locate libcudart if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then - export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" + export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" fi } diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index ec2c9cf72a9e..038841a7097d 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -1,3 +1,10 @@ +# Type Aliases +# +# See ./extension.nix: +# - ReleaseAttrs +# - ReleaseFeaturesAttrs +# +# General callPackage-supplied arguments { lib , stdenv , backendStdenv @@ -5,23 +12,58 @@ , autoPatchelfHook , autoAddOpenGLRunpathHook , markForCudatoolkitRootHook +, lndir +, symlinkJoin +}: +# Function arguments +{ + # Short package name (e.g., "cuda_cccl") + # pname : String + pname +, # Long package name (e.g., "CXX Core Compute Libraries") + # description : String + description +, # platforms : List System + platforms +, # version : Version + version +, # releaseAttrs : ReleaseAttrs + releaseAttrs +, # releaseFeaturesAttrs : ReleaseFeaturesAttrs + releaseFeaturesAttrs +, }: - -pname: -attrs: - let - arch = "linux-x86_64"; + # Useful imports + inherit (lib.lists) optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) optionalString; in backendStdenv.mkDerivation { - inherit pname; - inherit (attrs) version; + # NOTE: Even though there's no actual buildPhase going on here, the derivations of the + # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package + # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are + # also sensitive to the compiler flags provided to stdenv. + inherit pname version; + strictDeps = true; - src = assert (lib.hasAttr arch attrs); fetchurl { - url = "https://developer.download.nvidia.com/compute/cuda/redist/${attrs.${arch}.relative_path}"; - inherit (attrs.${arch}) sha256; + outputs = with releaseFeaturesAttrs; + [ "out" ] + ++ optionals hasBin [ "bin" ] + ++ optionals hasLib [ "lib" ] + ++ optionals hasStatic [ "static" ] + ++ optionals hasDev [ "dev" ] + ++ optionals hasDoc [ "doc" ] + ++ optionals hasSample [ "sample" ]; + + src = fetchurl { + url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.relative_path}"; + inherit (releaseAttrs) sha256; }; + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + nativeBuildInputs = [ autoPatchelfHook # This hook will make sure libcuda can be found @@ -46,23 +88,87 @@ backendStdenv.mkDerivation { "$ORIGIN" ]; - dontBuild = true; + installPhase = with releaseFeaturesAttrs; + # Pre-install hook + '' + runHook preInstall + '' + # doc and dev have special output handling. Other outputs need to be moved to their own + # output. + # Note that moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 + + '' + mkdir -p "$out" + rm LICENSE + mv * "$out" + '' + # Handle bin, which defaults to out + + optionalString hasBin '' + moveToOutput "bin" "$bin" + '' + # Handle lib, which defaults to out + + optionalString hasLib '' + moveToOutput "lib" "$lib" + '' + # Handle static libs, which isn't handled by the setup hook + + optionalString hasStatic '' + moveToOutput "**/*.a" "$static" + '' + # Handle samples, which isn't handled by the setup hook + + optionalString hasSample '' + moveToOutput "samples" "$sample" + '' + # Post-install hook + + '' + runHook postInstall + ''; - # TODO: choose whether to install static/dynamic libs - installPhase = '' - runHook preInstall - rm LICENSE - mkdir -p $out - mv * $out - runHook postInstall + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = [ "postPatchelf" ]; + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it + # if it was empty. + # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases + # which are empty strings are skipped/unset and result in errors of the form "command not + # found: <customPhaseName>". + postPatchelf = '' + mkdir -p "$out" + for output in $outputs; do + if [ "$output" = "out" ]; then + continue + fi + ${getExe lndir} "''${!output}" "$out" + done ''; + # Make the CUDA-patched stdenv available passthru.stdenv = backendStdenv; + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + meta = { - description = attrs.name; + inherit description platforms; license = lib.licenses.unfree; maintainers = lib.teams.cuda.members; - platforms = lib.optionals (lib.hasAttr arch attrs) [ "x86_64-linux" ]; + # Force the use of the default, fat output by default (even though `dev` exists, which + # causes Nix to prefer that output over the others if outputSpecified isn't set). + outputsToInstall = [ "out" ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 730ee1d28f56..58f2b205dd59 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -1,33 +1,139 @@ -final: prev: let - +# Type Aliases +# +# ReleaseAttrs : { +# "relative_path" : String, +# "sha256" : String, +# "md5" : String, +# "size" : String, +# } +# +# NOTE: PackageAttrs must have at least one of the arches. +# PackageAttrs : { +# "name" : String, +# "license" : String, +# "version" : String, +# "license_path" : None | String, +# "linux-aarch64" : None | ReleaseAttrs, +# "linux-ppc64le" : None | ReleaseAttrs, +# "linux-sbsa" : None | ReleaseAttrs, +# "linux-x86_64" : None | ReleaseAttrs, +# "windows-x86_64" : None | ReleaseAttrs, +# } +# +# ReleaseFeaturesAttrs : { +# "hasBin" : Boolean, +# "hasDev" : Boolean, +# "hasDoc" : Boolean, +# "hasLib" : Boolean, +# "hasOut" : Boolean, +# "hasSample" : Boolean, +# "hasStatic" : Boolean, +# "rootDirs" : List String, +# } +# +# NOTE: PackageFeatureAttrs must have at least one of the arches. +# PackageFeatureAttrs : { +# "linux-aarch64" : None | ReleaseFeaturesAttrs, +# "linux-ppc64le" : None | ReleaseFeaturesAttrs, +# "linux-sbsa" : None | ReleaseFeaturesAttrs, +# "linux-x86_64" : None | ReleaseFeaturesAttrs, +# "windows-x86_64" : None | ReleaseFeaturesAttrs, +# } +# +final: prev: +let + # NOTE: We use hasAttr throughout instead of the (?) operator because hasAttr does not require + # us to interpolate our variables into strings (like ${attrName}). + inherit (builtins) attrNames concatMap hasAttr listToAttrs removeAttrs; inherit (final) callPackage; - inherit (prev) cudaVersion lib; - - ### Cuda Toolkit Redist + inherit (prev) cudaVersion; + inherit (prev.lib.attrsets) nameValuePair optionalAttrs; + inherit (prev.lib.lists) optionals; + inherit (prev.lib.trivial) flip importJSON pipe; - # Manifest files for redist cudatoolkit. These can be found at + # Manifest files for CUDA redistributables (aka redist). These can be found at # https://developer.download.nvidia.com/compute/cuda/redist/ - cudaToolkitRedistManifests = { - "11.4" = ./manifests/redistrib_11.4.4.json; - "11.5" = ./manifests/redistrib_11.5.2.json; - "11.6" = ./manifests/redistrib_11.6.2.json; - "11.7" = ./manifests/redistrib_11.7.0.json; - "11.8" = ./manifests/redistrib_11.8.0.json; - "12.0" = ./manifests/redistrib_12.0.1.json; - "12.1" = ./manifests/redistrib_12.1.1.json; - "12.2" = ./manifests/redistrib_12.2.0.json; + # Maps a cuda version to the specific version of the manifest. + cudaVersionMap = { + "11.4" = "11.4.4"; + "11.5" = "11.5.2"; + "11.6" = "11.6.2"; + "11.7" = "11.7.0"; + "11.8" = "11.8.0"; + "12.0" = "12.0.1"; + "12.1" = "12.1.1"; + "12.2" = "12.2.0"; }; - # Function to build a single cudatoolkit redist package - buildCudaToolkitRedistPackage = callPackage ./build-cuda-redist-package.nix { }; + # Check if the current CUDA version is supported. + cudaVersionMappingExists = hasAttr cudaVersion cudaVersionMap; + + # Maps a cuda version to its manifest files. + # The manifest itself is from NVIDIA, but the features manifest is generated + # by us ahead of time and allows us to split pacakges into multiple outputs. + # Package names (e.g., "cuda_cccl") are mapped to their attributes or features. + # Since we map each attribute to a package name, we need to make sure to get rid of meta + # attributes included in the manifest. Currently, these are any of the following: + # - release_date + # - release_label + # - release_product + redistManifests = + let + # Remove meta attributes from the manifest + # removeAttrs : AttrSet String b -> Attr String b + removeMetaAttrs = flip removeAttrs [ "release_date" "release_label" "release_product" ]; + # processManifest : Path -> Attr Set (String PackageAttrs) + processManifest = flip pipe [ importJSON removeMetaAttrs ]; + # fullCudaVersion : String + fullCudaVersion = cudaVersionMap.${cudaVersion}; + in + { + # features : Attr Set (String PackageFeatureAttrs) + features = processManifest ./manifests/redistrib_features_${fullCudaVersion}.json; + # manifest : Attr Set (String PackageAttrs) + manifest = processManifest ./manifests/redistrib_${fullCudaVersion}.json; + }; + + # Function to build a single redist package + buildRedistPackage = callPackage ./build-cuda-redist-package.nix { }; + + # Function that builds all redist packages given manifests + buildRedistPackages = { features, manifest }: + let + wrapper = pname: + let + # Get the redist architectures the package provides distributables for + packageAttrs = manifest.${pname}; + + # Check if supported + # TODO(@connorbaker): Currently hardcoding x86_64-linux as the only supported platform. + isSupported = packageAttrs ? linux-x86_64; + + # Build the derivation + drv = buildRedistPackage { + inherit pname; + # TODO(@connorbaker): We currently discard the license attribute. + inherit (manifest.${pname}) version; + description = manifest.${pname}.name; + platforms = [ "x86_64-linux" ]; + releaseAttrs = manifest.${pname}.linux-x86_64; + releaseFeaturesAttrs = features.${pname}.linux-x86_64; + }; - # Function that builds all cudatoolkit redist packages given a cuda version and manifest file - buildCudaToolkitRedistPackages = { version, manifest }: let - attrs = lib.filterAttrs (key: value: key != "release_date") (lib.importJSON manifest); - in lib.mapAttrs buildCudaToolkitRedistPackage attrs; + # Wrap in an optional so we can filter out the empty lists created by unsupported + # packages with concatMap. + wrapped = optionals isSupported [ (nameValuePair pname drv) ]; + in + wrapped; - # All cudatoolkit redist packages for the current cuda version - cudaToolkitRedistPackages = lib.optionalAttrs (lib.hasAttr cudaVersion cudaToolkitRedistManifests) - (buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; }); + # concatMap provides us an easy way to filter out packages for unsupported platforms. + # We wrap the buildRedistPackage call in a list to prevent errors when the package is not + # supported (by returning an empty list). + redistPackages = listToAttrs (concatMap wrapper (attrNames manifest)); + in + redistPackages; -in cudaToolkitRedistPackages + # All redistributable packages for the current CUDA version + redistPackages = optionalAttrs cudaVersionMappingExists (buildRedistPackages redistManifests); +in +redistPackages diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json new file mode 100644 index 000000000000..04a33a88a863 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json @@ -0,0 +1,1518 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json new file mode 100644 index 000000000000..f07f1826dec8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json @@ -0,0 +1,1536 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json new file mode 100644 index 000000000000..c4f02188c4d4 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json @@ -0,0 +1,1546 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json new file mode 100644 index 000000000000..56ef5a91b038 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json @@ -0,0 +1,1565 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json new file mode 100644 index 000000000000..4a71b484e287 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json @@ -0,0 +1,1938 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json new file mode 100644 index 000000000000..f02ba5bfca84 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json @@ -0,0 +1,2050 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json new file mode 100644 index 000000000000..f02ba5bfca84 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json @@ -0,0 +1,2050 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json new file mode 100644 index 000000000000..e5201f7f81eb --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json @@ -0,0 +1,2030 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index b962b6caa1b2..a0ac0b0fcb1f 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -1,6 +1,8 @@ final: prev: let inherit (prev) lib pkgs; + cudaVersionOlder = lib.versionOlder final.cudaVersion; + cudaVersionAtLeast = lib.versionAtLeast final.cudaVersion; in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { ### Overrides to fix the components of cudatoolkit-redist @@ -10,51 +12,83 @@ in libcufile = prev.libcufile.overrideAttrs (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ - prev.libcublas + final.libcublas.lib pkgs.numactl pkgs.rdma-core ]; # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = + ["libcuda.so.1"] + # Before 12.0 libcufile depends on itself for some reason. + ++ lib.optionals (cudaVersionOlder "12.0") [ + "libcufile.so.0" + ]; }); - libcusolver = final.addBuildInputs prev.libcusolver [ - prev.libcublas - ]; + libcusolver = final.addBuildInputs prev.libcusolver ( + # Always depends on this + [final.libcublas.lib] + # Dependency from 12.0 and on + ++ lib.optionals (cudaVersionAtLeast "12.0") [ + final.libnvjitlink.lib + ] + # Dependency from 12.1 and on + ++ lib.optionals (cudaVersionAtLeast "12.1") [ + final.libcusparse.lib + ] + ); - cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: - let - inherit (prev.backendStdenv) cc; - in - { - # Required by cmake's enable_language(CUDA) to build a test program - # When implementing cross-compilation support: this is - # final.pkgs.targetPackages.cudaPackages.cuda_cudart - env.cudartRoot = "${prev.lib.getDev final.cuda_cudart}"; + libcusparse = final.addBuildInputs prev.libcusparse ( + lib.optionals (cudaVersionAtLeast "12.0") [ + final.libnvjitlink.lib + ] + ); - # Point NVCC at a compatible compiler + cuda_gdb = final.addBuildInputs prev.cuda_gdb ( + # x86_64 only needs gmp from 12.0 and on + lib.optionals (cudaVersionAtLeast "12.0") [ + pkgs.gmp + ] + ); - # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to - # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the - # setupCudaHook, i.e. we want it the hook to be propagated into the - # same nativeBuildInputs. - # - # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, - # so that the final offsets for the propagated hook would be `(-1, 0) + - # (0, 0) = (-1, 0)`. - # - # In practice, TargetTarget appears to work: - # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 - depsTargetTargetPropagated = [ - final.setupCudaHook - ]; - }); + cuda_nvcc = prev.cuda_nvcc.overrideAttrs (_: { + # Required by cmake's enable_language(CUDA) to build a test program + # When implementing cross-compilation support: this is + # final.pkgs.targetPackages.cudaPackages.cuda_cudart + env = { + # Given the multiple-outputs each CUDA redist has, we can specify the exact components we + # need from the package. CMake requires: + # - the cuda_runtime.h header, which is in the dev output + # - the dynamic library, which is in the lib output + # - the static library, which is in the static output + cudartInclude = "${final.cuda_cudart.dev}"; + cudartLib = "${final.cuda_cudart.lib}"; + cudartStatic = "${final.cuda_cudart.static}"; + }; + + # Point NVCC at a compatible compiler + + # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to + # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the + # setupCudaHook, i.e. we want it the hook to be propagated into the + # same nativeBuildInputs. + # + # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, + # so that the final offsets for the propagated hook would be `(-1, 0) + + # (0, 0) = (-1, 0)`. + # + # In practice, TargetTarget appears to work: + # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 + depsTargetTargetPropagated = [ + final.setupCudaHook + ]; + }); cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ]; - buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ]; + buildInputs = oldAttrs.buildInputs ++ [ final.cuda_cupti.lib ]; # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; }); cuda_demo_suite = final.addBuildInputs prev.cuda_demo_suite [ @@ -62,8 +96,8 @@ in pkgs.libGLU pkgs.libglvnd pkgs.mesa - prev.libcufft - prev.libcurand + final.libcufft.lib + final.libcurand.lib ]; nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { @@ -100,7 +134,7 @@ in nvidia_driver = prev.nvidia_driver.overrideAttrs (oldAttrs: { # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; # No need to support this package as we have drivers already # in linuxPackages. meta.broken = true; diff --git a/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix index be7461582303..37ccb5f1a02b 100644 --- a/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.42"; + version = "3.1.45"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I="; + npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-elp/LPd9SAuVZy42Wkgb6pCbPi2GnETTfyRJqU92S0E="; + hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg="; rev = version; }; diff --git a/nixpkgs/pkgs/development/compilers/erg/default.nix b/nixpkgs/pkgs/development/compilers/erg/default.nix index a3ed2397c8eb..860461e28b64 100644 --- a/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-bpKzC7xHP4vfl2WcyMEsFK1aAbkP3dtlpyNvXUWHWKg="; + hash = "sha256-oA0AXTMEdfItvIZi1ITQ3ZR6JPSg9/1V6oeK2wcRERw="; }; - cargoHash = "sha256-wIp+zQpHLmZNwgbSXQKV45YwO5qpZqdcUE6gnF/Wzhk="; + cargoHash = "sha256-dLMU48/umKHPV6iahazxOYA/eDvFWhzV9xveT2xQ+EE="; nativeBuildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/development/compilers/flix/default.nix b/nixpkgs/pkgs/development/compilers/flix/default.nix index 667dbaf109b9..47a84a6e5f2d 100644 --- a/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-kIH5vv/7pKgfAL1BaWYH6PSyEaKVONcccUczsudyfO4="; + sha256 = "sha256-NVQY2TgIR9ROy4x8PWxCjuaOkNx0bcUA4oZHjpQbHc4="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 95758fb56ab0..0a748647a1f5 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -74,39 +74,20 @@ in { inherit wrapFlutter; stable = mkFlutter { - version = "3.10.5"; - engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420"; - dartVersion = "3.0.5"; + version = "3.13.0"; + engineVersion = "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952"; + dartVersion = "3.1.0"; dartHash = { - x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28="; - aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ="; - x86_64-darwin = "sha256-4gJ659bNzs2lfI1LRwFACgu/ttkj+3xIrqLijju+CaI="; - aarch64-darwin = "sha256-RJt+muq5IrcAhVLYEgdbVygcY1oB7tnVCN+iqktC+6c="; + x86_64-linux = "sha256-sGpRyuUTkZ0cpG/O21NCHaOsQRjNklsl9G6Ia1tZxAw="; + aarch64-linux = "sha256-wcDtL/Lh0NFC01QlnKwx8ovTHZ5ww+rb1sELn92R1uU="; + x86_64-darwin = "sha256-h+e7ABlLWCxc6wrbjiy5lgp6O/DnNKdXFNJtgnXBZNA="; + aarch64-darwin = "sha256-sAWnd09mbcRLP0WjSjjWF7+WQ7LP3tWsq5Kqw8e4APg="; }; flutterHash = rec { - x86_64-linux = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI="; + x86_64-linux = "sha256-gXNQ9RuHVC/3puHNygWPRdezx8iiKmiOnxQmoX6XUFo="; aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-1ZC5aCoGVBCeTSsu/ZEl1v53lLnzulx8Ya6YXvo4yIY="; - aarch64-darwin = "sha256-TCMempLjO47IbP5MAZVHlXXvNaURGo+EbaL0K8e27wU="; - }; - patches = flutter3Patches; - }; - - v37 = mkFlutter { - version = "3.7.12"; - engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314"; - dartVersion = "2.19.6"; - dartHash = { - x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo="; - aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck="; - x86_64-darwin = "sha256-tuIQhIOX2ub0u99CW/l7nCya9YVNokCZNgbVFqO4ils="; - aarch64-darwin = "sha256-Oe8/0ygDN3xf5/2I3N/OBzF0bps7Mg0K2zJKj+E9Nak="; - }; - flutterHash = rec { - x86_64-linux = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; - aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-cJF8KB9fNb3hTZShDAPsMmr1neRdIMLvIl/m2tpzwQs="; - aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4="; + x86_64-darwin = "sha256-vI8TsXIfTg4PYf5dzxDaJt+PIdmVFBmd2slKK7c1By0="; + aarch64-darwin = "sha256-VhGJlp+HG8QLZx8u0xK+cgbneoDM7zhNvm3Oco4nBms="; }; patches = flutter3Patches; }; diff --git a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 603b1456018d..30c293c8d75d 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -191,7 +191,7 @@ let hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; }); - setSourceRoot = if overrideUnpackCmd then "sourceRoot=`pwd`" else null; + sourceRoot = if overrideUnpackCmd then "." else null; unpackCmd = if overrideUnpackCmd then "unzip -o $src -d $out" else null; installPhase = diff --git a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index 1c8a5dc4059f..e3dc78646620 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,232 +1,118 @@ { - "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { - skyNotice = "sha256-+EitMZAAvJ1mIlfm5ZTfY+pk8tfyu33XM7P8qOdj+J8="; + "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952" = { + skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { - "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; + "artifacts.zip" = "sha256-rAWcm/vjJ7P9q69z0bZNhBv/NO+sGhFJe+r/BHPR1To="; }; android-arm-profile = { - "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4="; - "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg="; - "darwin-x64.zip" = "sha256-gOmxGurYyuuGxPnzK+2O1s7d7x514R9MfincibxVTCI="; + "artifacts.zip" = "sha256-08+LDA7qNcMFH4xk+WfAXYqIDueCSHNmD/i/XaDeTrA="; + "linux-x64.zip" = "sha256-LWdrWdSGDAfX0gGtqQ2mSschBW3EAgaBldL/Cw99ft8="; + "darwin-x64.zip" = "sha256-FeBLBp3U2BPun/iPpTmHvaj3ZO8l7DQhwArqKN+D1m0="; }; android-arm-release = { - "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho="; - "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY="; - "darwin-x64.zip" = "sha256-UiJNbIvjYvIX2oFNCz+TurUdhHS8vcl9X6WEkEs5hvU="; + "artifacts.zip" = "sha256-VCWSWfL74PJ6F6N18mOHjOkN8oTkL8coDfemV0Pc/Fw="; + "linux-x64.zip" = "sha256-xtQJ9merALKe20LZai+5ApJNOXR3uweIYQFWSyjmBEE="; + "darwin-x64.zip" = "sha256-YuEY7ZQAqpo0wbvI/iK3YYUSguZGi/wSl/DLPzmlNj8="; }; android-arm64 = { - "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ="; + "artifacts.zip" = "sha256-z4gvkNofQaFv8tFAXcLepsge9CV1T7cBe3EZRdBT7Ms="; }; android-arm64-profile = { - "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0="; - "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0="; - "darwin-x64.zip" = "sha256-AWivGn0TCVEW+N8g9bpEP1JuKWhrccb+ANQgyLjBjfw="; + "artifacts.zip" = "sha256-7DHKcgwdaG6+MH7uVqSk2UGxLM4VsHVk5vUtYMn11kQ="; + "linux-x64.zip" = "sha256-3ZahRPzDVBff2pGUjjoIABH1lmwyrx05GnaJNyF4OiY="; + "darwin-x64.zip" = "sha256-Pmil9S314EoWJhfo0nrtBh1VLUeiavKvp/LIPZJoy6U="; }; android-arm64-release = { - "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE="; - "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg="; - "darwin-x64.zip" = "sha256-/j5sVfyllkhsc9mpdbOqlT7VT1H6nD3Y+mYnWXDh0yI="; + "artifacts.zip" = "sha256-GI+ADau8sbD9+ctXrciraeXNPGMto2+bBDyJcKt9YTE="; + "linux-x64.zip" = "sha256-riHs2bbOFNH7VqD3snEu5RuKrMqbsuFnDBZ9Apxq/+g="; + "darwin-x64.zip" = "sha256-DwTskXkcNqNsU3I+t9UMvKjxG4O2mN4cUGLB4dSWBHM="; }; android-x64 = { - "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q="; + "artifacts.zip" = "sha256-0dkDhr/TJi4ROcN1BV1OsUwWSnZuEHzgM0DKSeUIrnA="; }; android-x64-profile = { - "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM="; - "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs="; - "darwin-x64.zip" = "sha256-J5JJH9GAQaQKahimb09fLC59VchPP15iMHY9bDMfdf8="; + "artifacts.zip" = "sha256-2g+GaZHO17/rLa6Y1DHfDEq0Q05NRxQ5ese2Eo5rvNA="; + "linux-x64.zip" = "sha256-O3bHS/UHz8ymXq8ZEutLIj7K8wVTdt7vTo3OLGAkkh8="; + "darwin-x64.zip" = "sha256-vEzg6vxm1CbvVBSAoWwZhAS/bsuDlesmo30zWwK2a7g="; }; android-x64-release = { - "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY="; - "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U="; - "darwin-x64.zip" = "sha256-hDftGgKqW6tzH/+jFOYfzxssbS01XtiWEeycJr3QSoc="; + "artifacts.zip" = "sha256-nlYI2ffULiDrehOSFEZkZoav/RJ0VykwREQkUwNX2/I="; + "linux-x64.zip" = "sha256-iUy8tjpkFd3V/RIVRPbNNEsa/GAXhtLsNAkEOvdKhks="; + "darwin-x64.zip" = "sha256-xZf2f4L/hSJEN63hQqtP0rbXkB2iw/Co4vLXYe/oeI4="; }; android-x86 = { - "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y="; + "artifacts.zip" = "sha256-OIB7VnhCasOflVtGFOe1DgCLP4Os82R6H7ucp0Wrez0="; }; android-x86-jit-release = { - "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk="; + "artifacts.zip" = "sha256-dyjGkQJu73sOaxKvmIlbS5j0zO78RXHZrJQVi7qpBAU="; }; darwin-arm64 = { - "artifacts.zip" = "sha256-lfkEToKFBBOee7KgOl1z/ZeMQwEBWkmAYb2Hbfk8dfg="; - "font-subset.zip" = "sha256-W7GnLvCobED7uyhpURF4T4SL4yZIQmE2JFQVQIxl0NI="; + "artifacts.zip" = "sha256-Ro+N5e5RhXgfqVDSEvqCKPdXRK1QnYCvIqmtlEW4s8c="; + "font-subset.zip" = "sha256-yCboANBEarWZDtoTwDFbtnlsPW2kPwZ5Jp31V2hbga4="; }; darwin-arm64-profile = { - "artifacts.zip" = "sha256-DfYS+FEqjtq02jFRBqVR3SVWe4LAoPa5MMKWCbvF7mI="; + "artifacts.zip" = "sha256-Lf3LLkRhtGNA9cWZwv4Q9MncXzOoVCgmp+6osWRUCE0="; }; darwin-arm64-release = { - "artifacts.zip" = "sha256-gG/OcCJE3XPO6T8bltMtPxdlYX5HQ/4qYsdHe0OdDaE="; + "artifacts.zip" = "sha256-6BSQ2zodrQmZKkHeaGVVT4D7jNekhwNOul5C6qwLbO8="; }; darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-G84GGK6gtR+CYu9S/GhdNTL4KWqgFBp8QdvWOq+IZlk="; - "FlutterMacOS.framework.zip" = "sha256-1/txBoXDIs7Gn5zsZ4jYQXK73+iaZV4sRdYKqEBUTxU="; - "artifacts.zip" = "sha256-H7Moy6E1eRrOXYYAIgiJHOmstyy3YaCnu8O3IPr9BK8="; - "font-subset.zip" = "sha256-VSkG3zZw/4DDInwxPaMXT2B1LXIb0Ejkb2xf5SVrwW4="; - "gen_snapshot.zip" = "sha256-Pknv1fUcXGbWzt6So0DgWnvL4b43k51KMWiX1YXd2As="; + "FlutterEmbedder.framework.zip" = "sha256-4jYk+aYjOS/CZajS1oVBexg2+C9fy0OmfaI6i3rrhXo="; + "FlutterMacOS.framework.zip" = "sha256-Im7DTFf1zXrG6n1OtM4Jixd992mS2r47GRnAa7/urNc="; + "artifacts.zip" = "sha256-SdnPPnx4NOfOlJU1234977/cVRCa/5KTI/1kqCtTxG0="; + "font-subset.zip" = "sha256-F7qt7X0FNXODb3rvTkXacK3wG/aEVn+ny8DHFL3gEkI="; + "gen_snapshot.zip" = "sha256-czdCi1cPdD/nu0LJIsgUj42O6D5x5xTKfM8l/UiKZqw="; }; darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-3umN1HNX4UA00EFsBnWS0X04QRKlcCnChDYd9L6x1L4="; - "artifacts.zip" = "sha256-8Aj2+nTKKeVLEYN+swVlVqRB/3fVSwrb3i1g1JUDsNY="; - "gen_snapshot.zip" = "sha256-bi3RqSdOQODpPmY+eBUQPiNeZ/bECoOUx/pOADpTZiA="; + "FlutterMacOS.framework.zip" = "sha256-gdfoq6jdHFDb2JXCf45qJ2ekTildUptLb/k0XuHYuh8="; + "artifacts.zip" = "sha256-aEoenQh0Q8xuLU6OeFND3GBbOvhMNsovbbFQwQfudm0="; + "gen_snapshot.zip" = "sha256-tY3qmpdF7MP4iEfqgouzLehr901H3QTLxeV28RoLPDY="; }; darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-LfDQuCcBXEV3Jao/sbfIvjn1d2ZfZrWgzNzFE1zE3Rw="; - "FlutterMacOS.framework.zip" = "sha256-2xuPPJifdu/kvvtR0viMvbTOXfv8ndtNAhTmef8863o="; - "artifacts.zip" = "sha256-3p41zRjvWYCl/Kk/7/0MjV2FS10XEtyX1hYmxTHT8lU="; - "gen_snapshot.zip" = "sha256-ExXwj1QO1XQznZ49rW08tibA5BaURShE6pUYDokZfpE="; - }; - "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k="; - "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA="; - ios = { - "artifacts.zip" = "sha256-yqJ4+lNsedRFbe11dBK4KGMX5+Nilj1V0i2E94n7q+0="; - }; - ios-profile = { - "artifacts.zip" = "sha256-ZguLM1QoYyg5dXPw3Fl1zSLdbirShV3xZuxl1CfEf50="; - }; - ios-release = { - "Flutter.dSYM.zip" = "sha256-Y57wt1y4NIdbRMM1r/d1Dv8bekwO9/9gpLkTEcw7Hfs="; - "artifacts.zip" = "sha256-Sm4Pkm1mWu3k5S+aws+kRpth+o3yTBYITg23LhnSViE="; - }; - linux-arm64 = { - "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw="; - "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU="; - }; - linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg="; - }; - linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-xB0eqrBYD7vhOwYUgJwNaBftNZJgdwxA9AUpEfX0iFs="; - }; - linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-aHLKV129WIRsLUG6xTMwCKB4eXD3jonqinjI8KSsOus="; - }; - linux-x64 = { - "artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8="; - "font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY="; - }; - linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M="; - }; - linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-AnkLMPW3mwiXdiDz3Zo802QZRi+8EMCy4Mx2ODSbMOU="; - }; - linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; - }; - }; - "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = { - skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo="; - flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; - android-arm = { - "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU="; - }; - android-arm-profile = { - "artifacts.zip" = "sha256-MZK1zaSv9yuZaVDR1dReCM7WRDxKql0yxsPa8WFc1yw="; - "linux-x64.zip" = "sha256-9OlBv2C6Msj73g624TixbstudCTbdIJ6PzPMsbQENy4="; - "darwin-x64.zip" = "sha256-lVJ31F7UMaXQym3touJQ2cN8svKBaWJurDTVZPeMzCo="; - }; - android-arm-release = { - "artifacts.zip" = "sha256-tjHckwoxQkkKoyTl6+wBKK40mFDmSDvCPNhBHVA+xxw="; - "linux-x64.zip" = "sha256-zE9oYkv4WBcbgEdYfYIcdDXX3tnYfCg+3KA3oA03nYA="; - "darwin-x64.zip" = "sha256-mCr29gIn808NF4k8kdC7oLTSU6AXq7I/bJF3BBdJlAo="; - }; - android-arm64 = { - "artifacts.zip" = "sha256-8W/JrOGhAzHWpM2Jh9vjdkaB6ODmCItqcmF47GqbNQk="; - }; - android-arm64-profile = { - "artifacts.zip" = "sha256-9SGBWp05lxLQTpLuzq8FYSQQOpjo8UL93Pv4YYFD4QE="; - "linux-x64.zip" = "sha256-5nH2AAxupRIhn8gNH+1V+vSP+qqfx5MS97EC4s3QHe8="; - "darwin-x64.zip" = "sha256-kkutEwKcj1wKJREbxbx8+DW53WVbizg6zKIFFVujgAM="; - }; - android-arm64-release = { - "artifacts.zip" = "sha256-7O7RBfEo6enZtVNsnt4HH0bex8Xpz9mqCvb2LNLbg3Q="; - "linux-x64.zip" = "sha256-loucmX4+0R11L1nzewiMTeRZoB6wLK0WasW5W3rIvYU="; - "darwin-x64.zip" = "sha256-0bpNQDfIzQqwQpzThLfOXEEEpH/uCJCRF331d0/pzfs="; - }; - android-x64 = { - "artifacts.zip" = "sha256-j7AezbyzH07yOR0/W1ttfCjMHMdOlXLQjAsu/ExqmqA="; - }; - android-x64-profile = { - "artifacts.zip" = "sha256-J8cqdcHoj1hpo6zY5R6S9lvkVXp7wvzQlurM7TEUe+k="; - "linux-x64.zip" = "sha256-YuRHctkDjLZVGQr+m5uM+AxYNLkfqycV4UNcAp7JavE="; - "darwin-x64.zip" = "sha256-Mw8C279cVbQHTdIsHhIT5HWe52X8XXbkIDpVcEz1tWc="; - }; - android-x64-release = { - "artifacts.zip" = "sha256-uhq3fXcxXjF4/YHSkf6V4wToL9jOUKBm3978j/7xI/s="; - "linux-x64.zip" = "sha256-iJfatLW7jVcrfNdVx/QOPiyON5ce0tSNGOBx0TILrKE="; - "darwin-x64.zip" = "sha256-3P3QZ+jW3Jl6PJvRY9pBHQdhj8UcsHFAjln8q6UlL+A="; - }; - android-x86 = { - "artifacts.zip" = "sha256-/xLacCi65hg1gEahty0btrc+NR/jfebSAIt31qwIlZY="; - }; - android-x86-jit-release = { - "artifacts.zip" = "sha256-Ntq0i+sFruDhlyp9VBxBnsNqqGoQeXMeIwfi+BNlr0Q="; - }; - darwin-arm64 = { - "artifacts.zip" = "sha256-A21Tnn4jC5IzdL3c7n6/q9H6uJ/ofvJ+K9W8PPpAoYM="; - "font-subset.zip" = "sha256-NhnUOK1Gn4ekKOf5rDoy4HodzhlS8ylf/MN/6l4Dk18="; - }; - darwin-arm64-profile = { - "artifacts.zip" = "sha256-aDWrz3bebC6kZRe2LgunsmFhbxJhmP1bsZv5A/SGF2Y="; - }; - darwin-arm64-release = { - "artifacts.zip" = "sha256-F44e39KSX8juojFBV/CSvFES+RQW+gHKDWtfnydqiNo="; - }; - darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-+S2unNH8cpfqUiPLTwGUUW00DdNYFDN8KM/O1pMdxQs="; - "FlutterMacOS.framework.zip" = "sha256-iCGXzxBhJGR6rWcECRg0W5Qv4I6ePo7UrWIqjQK1bWI="; - "artifacts.zip" = "sha256-2Ng0rxVDeMCH3kFHS7rhVd6R8oiJqvfsNDp+rzgtA50="; - "font-subset.zip" = "sha256-5IyNNLUT27WUCr61LjnMjmAZEv63ZaF+rl/p2XHFlVU="; - "gen_snapshot.zip" = "sha256-zPJaXPdvbQGx79c41XdRrBW/+3aV/INaPtO47+hHdxM="; - }; - darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-PV4sTACDGeLLPz+AchxngWrQypmmUVQ48bQlAfH323w="; - "artifacts.zip" = "sha256-LBosuXu9mPh5WT0Mmgu9rX5Nuy+iIGN8Xvi7uVAyFhc="; - "gen_snapshot.zip" = "sha256-douXVnavzSGBuld3WhwHagBNK6FEU679puM8/fNGz2I="; - }; - darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-A8kyc1fmsGemgUVhI46yTC6XNkrXdoPYvwXomHoW6kM="; - "FlutterMacOS.framework.zip" = "sha256-dZ/MO9J+zanoGfvPaAinnANte92bQOlh697fd/LvGqA="; - "artifacts.zip" = "sha256-T/wxPd1LmstfGHr2Fx6cfhRifaGm6CUlig6cBMcOO5g="; - "gen_snapshot.zip" = "sha256-qeZxVp6btr/fUQRf7nOhlnSC03+QTcRaggiVOmPxVuo="; - }; - "flutter_patched_sdk.zip" = "sha256-kRRFCqQGBDimqwMiSn4yRMNRfZHt03YJqsKW47IBIvQ="; - "flutter_patched_sdk_product.zip" = "sha256-BowamIQHPZgfcZbWG7OFrB5GeEwdcA7AdUrF2Y+KIds="; + "FlutterMacOS.dSYM.zip" = "sha256-dNlx9PsXeJeV6FMPOliRyuc5p58DeEmXus2zP1dOqPs="; + "FlutterMacOS.framework.zip" = "sha256-ibmcuVjd3kswmUvXzZi8vl5uNEbnWvMAwzWYxs8i1zw="; + "artifacts.zip" = "sha256-KCXwR/ZZK1jyLQaIAsb+wAz4awVU1QozydIQt10M30A="; + "gen_snapshot.zip" = "sha256-hZT+IMHbvSTjk2WcNvfPl+vdXZ2vbB/MjiYP1Q+cKD8="; + }; + "flutter_patched_sdk.zip" = "sha256-vm9Zt+obBuYHQchQlqlinGYg9mwmoo41HwqYzy8QXP0="; + "flutter_patched_sdk_product.zip" = "sha256-JjMQ2zEGXKIcyYqYfCxDYlRbwglVMQ8H1zs5h6To1es=" + ; ios = { - "artifacts.zip" = "sha256-VoofDPEBUW2jBrXg3Z556uC2UdrD9JCpioZNhX1p/P0="; + "artifacts.zip" = "sha256-9/GWCsOvwEXVWYMYn48sZTe44GhB2JBJtPDRFUqgTek="; }; ios-profile = { - "artifacts.zip" = "sha256-5jDIqk7tWuRxXsAzrjBq9xzQrt/eREmmoEF3zc2xQ5M="; + "artifacts.zip" = "sha256-XZ4AFdG60gUx2xv3qZdk8Hh/0ZuIeJXeBxBoWlmhP4I="; }; ios-release = { - "Flutter.dSYM.zip" = "sha256-TuDld2LcHshl1mXcuIwfZgWLm1My4RpXUwI2B/QbLRk="; - "artifacts.zip" = "sha256-bGuUCKVqNNWWGVccVVKIBmCxTqgu4Q2Kj/Znnl9ZR2Q="; + "Flutter.dSYM.zip" = "sha256-QWCVU518mUHDXDdUm58XfS1TWYNkXI8LnfOIZ0PYLjs="; + "artifacts.zip" = "sha256-tFmIpEogaqCcx4ftVRah3Bw3CeB0dTku0xUMvUVfR00="; }; linux-arm64 = { - "artifacts.zip" = "sha256-jME3ivE+M+ceAt3aGPSeVwPaW8UhwGQOoL5lmRUqrOU="; - "font-subset.zip" = "sha256-MqavBMXOlx5JX94Oe/8GGuuDNh7A2UkjiOrEhCDW5cc="; + "artifacts.zip" = "sha256-MFsYOUIYLRINLNOjsDLFX4WPwcW3FTQ7P55/i8xQqcI="; + "font-subset.zip" = "sha256-nIWE1Mep1R1EMS3vS31qdTybhFOCyr7/agPEjlAodOQ="; }; linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-+ojrvr3bpCAwBc5ZJxSSvfxpW9M8h+YeQqdKno9TJgI="; + "linux-arm64-flutter-gtk.zip" = "sha256-2zYHns8gycYy7VNjXfJdf/yl71VJSDFSIMb6lQ0JuKI="; }; linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-5Smyc7JvudBG16l4Twq8QrZgfYXXeUGXb9NRNCBE+D4="; + "linux-arm64-flutter-gtk.zip" = "sha256-doGUIbTinn5kfw20NZRyph96ZkSa77Vm+y1Z/jBUi/E="; }; linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-WWHhfgD83eMkAYC1jlZdkqO2J8lxf0VlIBGB8qfXQp0="; + "linux-arm64-flutter-gtk.zip" = "sha256-3zeRvhTZ3nFhOuiacJLTTlPBkyP1u3lh00j3e4jJpXU="; }; linux-x64 = { - "artifacts.zip" = "sha256-LpCjbAjQQmDL3r5iKHkB1072qKbIkvVusPvMYCj1ZI4="; - "font-subset.zip" = "sha256-2TWRwNIMSomFb+ZDKN6ZF9egehq0SBkcyD+0g+GvmEM="; + "artifacts.zip" = "sha256-L8DrlHTLYneYo5yMdgXVZw3YikF0qBKijGVLJZJLTEA="; + "font-subset.zip" = "sha256-KC733fwlRIK6DhjAJopnKdzjaC1JhvJ8nK74x+5DtIE="; }; linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-BV+Sp1EUTndrlu93eQB5txa/lsUPEEk42TbImFGzmk8="; + "linux-x64-flutter-gtk.zip" = "sha256-5hu5uRB4gOnZyH4zWBj/b2Flz6+5DUK2ytTHWGVfp4A="; }; linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-HhT2wm2dqc2ZoPprzm2TTP6pG/glh4ugmmowUYNtBRo="; + "linux-x64-flutter-gtk.zip" = "sha256-gYGBrExyYlIl+nYnCvlGBq13bP0E5bzzM089THEqHBM="; }; linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-eluXkoISuzObXt2aiBmZGW6x8MsPTiD9bbVM4xcpe2w="; + "linux-x64-flutter-gtk.zip" = "sha256-Hw/hAMohLko1AMu3sr4Dq5OwvmrBP2PPJcJRVMgy6B4="; }; }; } diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch index 874619046134..ceaf59b5f535 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index ab746724e9..1087983c87 100644 +index 3532c23114..25dfcae4c7 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -215,8 +215,6 @@ function shared::execute() { +@@ -229,8 +229,6 @@ function shared::execute() { exit 1 fi @@ -11,39 +11,39 @@ index ab746724e9..1087983c87 100644 BIN_NAME="$(basename "$PROG_NAME")" case "$BIN_NAME" in flutter*) +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 13efbde879..467b3a7cbf 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -664,6 +664,7 @@ class Cache { + + /// Update the cache to contain all `requiredArtifacts`. + Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async { ++ return; + if (!_lockEnabled) { + return; + } diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 738fef987d..03a152e64f 100644 +index 5d6d78639f..90a4dfa555 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults['machine'] as bool? ?? false; + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; final bool ci = await globals.botDetector.isRunningOnBot; final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; +@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; + final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - if (topLevelResults.command?.name != 'upgrade' && - (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } - +- // See if the user specified a specific device. - globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; - -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index dd80b1e46e..8e54517765 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -668,6 +668,7 @@ - - /// Update the cache to contain all `requiredArtifacts`. - Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async { -+ return; - if (!_lockEnabled) { - return; - } + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + if (specifiedDeviceId != null) { diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch new file mode 100644 index 000000000000..9d1de65c320d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch @@ -0,0 +1,34 @@ +From ddb81649092776ecac635af7040685588798b5a5 Mon Sep 17 00:00:00 2001 +From: hacker1024 <hacker1024@users.sourceforge.net> +Date: Sun, 27 Aug 2023 22:47:24 +1000 +Subject: [PATCH] Allow replacing the Dart binary used for Pub commands with + NIX_FLUTTER_PUB_DART + +--- + packages/flutter_tools/lib/src/dart/pub.dart | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart +index 40e60f9005..22fd3cebc7 100644 +--- a/packages/flutter_tools/lib/src/dart/pub.dart ++++ b/packages/flutter_tools/lib/src/dart/pub.dart +@@ -3,6 +3,7 @@ + // found in the LICENSE file. + + import 'dart:async'; ++import 'dart:io' as io; + + import 'package:meta/meta.dart'; + import 'package:package_config/package_config.dart'; +@@ -544,7 +545,7 @@ class _DefaultPub implements Pub { + + List<String> _computePubCommand() { + // TODO(zanderso): refactor to use artifacts. +- final String sdkPath = _fileSystem.path.joinAll(<String>[ ++ final String sdkPath = io.Platform.environment['NIX_FLUTTER_PUB_DART'] ?? _fileSystem.path.joinAll(<String>[ + Cache.flutterRoot!, + 'bin', + 'cache', +-- +2.41.0 + diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch index 42ad756f8ea4..6e6ae4e6fb98 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch @@ -1,8 +1,8 @@ diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart -index 8e4cb81340..2c20940423 100644 +index 9f33a22cc3..c46255742c 100644 --- a/dev/bots/prepare_package.dart +++ b/dev/bots/prepare_package.dart -@@ -526,7 +526,7 @@ class ArchiveCreator { +@@ -602,7 +602,7 @@ class ArchiveCreator { Future<String> _runGit(List<String> args, {Directory? workingDirectory}) { return _processRunner.runProcess( @@ -12,10 +12,10 @@ index 8e4cb81340..2c20940423 100644 ); } diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart -index 666c190067..b6c3761f6f 100644 +index a58b75c009..02da0daeb7 100644 --- a/packages/flutter_tools/lib/src/commands/downgrade.dart +++ b/packages/flutter_tools/lib/src/commands/downgrade.dart -@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand { +@@ -120,7 +120,7 @@ class DowngradeCommand extends FlutterCommand { // Detect unknown versions. final ProcessUtils processUtils = _processUtils!; final RunResult parseResult = await processUtils.run(<String>[ @@ -24,7 +24,7 @@ index 666c190067..b6c3761f6f 100644 ], workingDirectory: workingDirectory); if (parseResult.exitCode != 0) { throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}'); -@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand { +@@ -192,7 +192,7 @@ class DowngradeCommand extends FlutterCommand { continue; } final RunResult parseResult = await _processUtils!.run(<String>[ @@ -34,55 +34,37 @@ index 666c190067..b6c3761f6f 100644 if (parseResult.exitCode == 0) { buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.'); diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart -index dc47f17057..8068e2d1f5 100644 +index 0702b35e7e..36b2a95b65 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart -@@ -111,7 +111,7 @@ class FlutterVersion { - String? channel = _channel; - if (channel == null) { +@@ -407,7 +407,7 @@ abstract class FlutterVersion { + /// wrapper that does that. + @visibleForTesting + static List<String> gitLog(List<String> args) { +- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args; ++ return <String>['git', '--git-dir','.git', '-c', 'log.showSignature=false', 'log'] + args; + } + } + +@@ -559,7 +559,7 @@ class _FlutterVersionGit extends FlutterVersion { + String? get repositoryUrl { + if (_repositoryUrl == null) { final String gitChannel = _runGit( - 'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream', + 'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream', globals.processUtils, - _workingDirectory, + flutterRoot, ); -@@ -119,7 +119,7 @@ class FlutterVersion { +@@ -567,7 +567,7 @@ class _FlutterVersionGit extends FlutterVersion { if (slash != -1) { final String remote = gitChannel.substring(0, slash); _repositoryUrl = _runGit( - 'git ls-remote --get-url $remote', + 'git --git-dir .git ls-remote --get-url $remote', globals.processUtils, - _workingDirectory, + flutterRoot, ); -@@ -298,7 +298,7 @@ class FlutterVersion { - /// the branch name will be returned as `'[user-branch]'`. - String getBranchName({ bool redactUnknownBranches = false }) { - _branch ??= () { -- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils); -+ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils); - return branch == 'HEAD' ? channel : branch; - }(); - if (redactUnknownBranches || _branch!.isEmpty) { -@@ -331,7 +331,7 @@ class FlutterVersion { - /// wrapper that does that. - @visibleForTesting - static List<String> gitLog(List<String> args) { -- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args; -+ return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args; - } - - /// Gets the release date of the latest available Flutter version. -@@ -708,7 +708,7 @@ class GitTagVersion { - String gitRef = 'HEAD' - }) { - if (fetchTags) { -- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); -+ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); - if (channel == 'dev' || channel == 'beta' || channel == 'stable') { - globals.printTrace('Skipping request to fetchTags - on well known channel $channel.'); - } else { -@@ -718,7 +718,7 @@ class GitTagVersion { +@@ -952,7 +952,7 @@ class GitTagVersion { } // find all tags attached to the given [gitRef] final List<String> tags = _runGit( @@ -91,7 +73,7 @@ index dc47f17057..8068e2d1f5 100644 // Check first for a stable tag final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$'); -@@ -739,7 +739,7 @@ class GitTagVersion { +@@ -973,7 +973,7 @@ class GitTagVersion { // recent tag and number of commits past. return parse( _runGit( diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index a53e78103ad5..9753a1077a63 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , cmake , jq @@ -10,24 +9,15 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.2.0"; + version = "12.3.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-2i6DZA42b0s1ul6VDhjPi9lpSYvsRD8r9yiRoRfVoW0="; + hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; }; - patches = [ - # Fix build on Darwin - # FIXME: remove for next release - (fetchpatch { - url = "https://github.com/KhronosGroup/glslang/commit/6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a.diff"; - hash = "sha256-O1N62X6LZNRNHHz90TLJDbt6pDr28EI6IKMbMXcKBj8="; - }) - ]; - # These get set at all-packages, keep onto them for child drvs passthru = { spirv-tools = spirv-tools; @@ -48,8 +38,11 @@ stdenv.mkDerivation rec { # Fix the paths in .pc, even though it's unclear if these .pc are really useful. postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ + substituteInPlace $out/lib/pkgconfig/*.pc \ --replace '=''${prefix}//' '=/' + + # add a symlink for backwards compatibility + ln -s $out/bin/glslang $out/bin/glslangValidator ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/compilers/go/1.21.nix b/nixpkgs/pkgs/development/compilers/go/1.21.nix index c95211c6d9e3..d85bcbfa5a3d 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.21.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.21.nix @@ -17,8 +17,8 @@ }: let - useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; diff --git a/nixpkgs/pkgs/development/compilers/go/binary.nix b/nixpkgs/pkgs/development/compilers/go/binary.nix index 352e0e395206..3b4e8010d27e 100644 --- a/nixpkgs/pkgs/development/compilers/go/binary.nix +++ b/nixpkgs/pkgs/development/compilers/go/binary.nix @@ -11,6 +11,7 @@ let "armv6l" = "armv6l"; "armv7l" = "armv6l"; "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; }.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}"); toGoPlatform = platform: "${toGoKernel platform}-${toGoCPU platform}"; diff --git a/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix b/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix new file mode 100644 index 000000000000..f243ca30abf3 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix @@ -0,0 +1,22 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.21.0"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70"; + darwin-arm64 = "3aca44de55c5e098de2f406e98aba328898b05d509a2e2a356416faacf2c4566"; + linux-386 = "0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba"; + linux-amd64 = "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742"; + linux-arm64 = "f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3"; + linux-armv6l = "e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1"; + linux-loong64 = "e484cdc55221f7e7853666ed4f0ef462eef46b52253f84df60a7b908416060cb"; + linux-mips = "6311d8ccd6ff9ce3cc8ecc72017d651d23e7325943fa72f4b65cd750be8aacd8"; + linux-mips64 = "6d9cb425dc61f60bff41e2dec873abbcc5b8dbd1d32997f994d707b662f3c363"; + linux-mips64le = "92f7933d997c589b4f506c6b3cc5b27ff43b294c3a2d40bf4d7eeaf375f92afb"; + linux-mipsle = "9bb9f938457411042074a57284d40a086e63f7778f86e1632e018bbc38948c92"; + linux-ppc64 = "e34dcc1df804bf8bac035ace3304f23696a9138a79a398dce981d89072d3ae23"; + linux-ppc64le = "e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f"; + linux-riscv64 = "87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7"; + linux-s390x = "be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix index f124cb4d4e68..606d77c1737f 100644 --- a/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode - +, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { pname = "ispc"; - version = "1.19.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3"; + sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4"; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses ]; @@ -52,7 +52,10 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DFILE_CHECK_EXECUTABLE=${llvmPackages.llvm}/bin/FileCheck" + "-DLLVM_AS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-as" "-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config" + "-DLLVM_DIS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-dis" "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" @@ -68,6 +71,6 @@ stdenv.mkDerivation rec { description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; # TODO: buildable on more platforms? - maintainers = with maintainers; [ aristid thoughtpolice athas ]; + maintainers = with maintainers; [ aristid thoughtpolice athas alexfmpe ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix b/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix index 9bae485b34d1..85c0d7043efd 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.2"; + version = "1.9.3"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "4c2d799f442d7fe718827b19da2bacb72ea041b9ce55f24eee7b1313f57c4383"; + sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "682397f8895149f0e283f0b27bffc6694033bdfb19f9366c80f6efdf3685f27c"; + sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = "a2e8eb31a89b26e4a99349303aeff8e8ee780144bbdb1f7eda6f41024d42cadb"; + sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - sha256 = "77c71ff8cb1fcdb84097e86a9fb579a8b34d8e7fd8e24d43107042e0fb988b76"; + sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/development/compilers/julia/1.9.nix b/nixpkgs/pkgs/development/compilers/julia/1.9.nix index 810a03152527..002cca08aac5 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.9.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.9.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-hwY9TC6kHHNqoujLvHwvGgYuIjlVFX+EBFU87XZJE80="; + hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 89474f27614f..6fd5b8801927 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.0"; + version = "1.9.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1s5y9180r97qmfysw3rm39y5c646rj4z149ywhnyj2cqby00vi8z"; + sha256 = "0hh3qa4nical29wkm3byqvmd00xhx9gp7hslx8l0z3ngxqyqcx3x"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/kotlin/native.nix b/nixpkgs/pkgs/development/compilers/kotlin/native.nix index 9236809b5761..4f6dddb3fa13 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/native.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.0"; + version = "1.9.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "0728zm72ywyl6yhrfkad3whg2xly9bx7whp8alfi980qf468b1jh"; - "macos-x86_64" = "09j2i06qypw7ag2wrfkci9gnvprj96n3362p5vynr65jrzm5b8ww"; - "linux-x86_64" = "1v58n8ap5kifhawz30lk6rb2sp0qyiiy8gihw2ngbbhvakkigg8q"; + "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; + "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; + "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; }.${arch}; in fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index 692a0256e901..77ba2d2d008a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 692a0256e901..77ba2d2d008a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 51020fcdb0ca..362de957886d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/nixpkgs/pkgs/development/compilers/lobster/default.nix b/nixpkgs/pkgs/development/compilers/lobster/default.nix index 712dcf12215d..357401aaf43b 100644 --- a/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.9"; + version = "2023.11"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-30OOdl/BzWJeLhSWuzLAhwELRPcOJIi7FqwL/ztUOUo="; + sha256 = "sha256-c0EElDvoFzIZvYZpjWd9az+KUxDXTETOp89I/tRCrQ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/compilers/lunarml/default.nix b/nixpkgs/pkgs/development/compilers/lunarml/default.nix index ff3122ce2198..5d0b952aa36d 100644 --- a/nixpkgs/pkgs/development/compilers/lunarml/default.nix +++ b/nixpkgs/pkgs/development/compilers/lunarml/default.nix @@ -5,19 +5,16 @@ , lua5_3 }: -let - pname = "lunarml"; -in stdenvNoCC.mkDerivation { - inherit pname; + pname = "lunarml"; - version = "unstable-2023-06-25"; + version = "unstable-2023-08-25"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "f58f90cf7a2f26340403245907ed183f6a12ab52"; - sha256 = "djHJfUAPplsejFW9L3fbwTeeWgvR+gKkI8TmwIh8n7E="; + rev = "69d09b47601f4041ca7e8a513c75f3e4835af9dd"; + sha256 = "sha256-GXUcWI4/akOKIvCHrsOfceZEdyNZdIdalTc6wX+svS4="; }; outputs = [ "out" "doc" ]; @@ -37,18 +34,21 @@ stdenvNoCC.mkDerivation { doCheck = true; installPhase = '' - mkdir -p $doc/${pname} $out/{bin,lib} + runHook preInstall + + mkdir -p $doc/lunarml $out/{bin,lib} cp -r bin $out cp -r lib $out - cp -r doc/* README.* LICENSE* $doc/${pname} - cp -r example $doc/${pname} + cp -r example $doc/lunarml + + runHook postInstall ''; meta = { description = "Standard ML compiler that produces Lua/JavaScript"; homepage = "https://github.com/minoki/LunarML"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ toastal ]; + maintainers = with lib.maintainers; [ toastal ratsclub ]; platforms = mlton.meta.platforms; }; } diff --git a/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix b/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix index 8fcb1c7c043a..cfd6166d0456 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix @@ -19,16 +19,12 @@ let sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - # The loosely held nixpkgs convention for SBCL is to keep the last two - # versions. - # https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841 - "2.3.6" = { - sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk="; - }; - "2.3.7" = { sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc="; }; + "2.3.8" = { + sha256 = "sha256-QhVxsqyRbli+jrzqXvSr+NeQKGPbah0KXvqVAK3KDSk="; + }; }; in with versionMap.${version}; diff --git a/nixpkgs/pkgs/development/compilers/typescript/default.nix b/nixpkgs/pkgs/development/compilers/typescript/default.nix index d63fe8651a1b..af60548c32e0 100644 --- a/nixpkgs/pkgs/development/compilers/typescript/default.nix +++ b/nixpkgs/pkgs/development/compilers/typescript/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.1.6"; + version = "5.2.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-YBAAiO7MBJ41VK6A9zeExB7ZSbbrQ23sVTHAqo+/H/w="; + hash = "sha256-wjoqDmCudN5+9C3GrP1viiXBvsWgU0UIYWaFeK/TJEY="; }; - npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI="; + npmDepsHash = "sha256-7Wm6nlpqZRNqBU0mYFZRVWQkO4uqvrKrp2h2aEmZtow="; meta = with lib; { description = "A superset of JavaScript that compiles to clean JavaScript output"; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 8b932499ca44..9f958e8d1c44 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,8 +7,8 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.15.0"; };} - { case = "8.16"; out = { version = "1.16.5"; };} - { case = "8.17"; out = { version = "1.16.5"; };} + { case = "8.16"; out = { version = "1.17.0"; };} + { case = "8.17"; out = { version = "1.17.0"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -16,7 +16,7 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.17"; out = "1.17.0"; } + { case = "8.17"; out = "1.18.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } @@ -24,6 +24,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y="; release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno="; release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg="; diff --git a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 464ef4fc301d..725f7654de9b 100644 --- a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,11 +5,13 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.5.0".sha256 = "sha256-Lia3o156Pbe8rDHOA1IniGYsG5/qzZkzDKdHecfmS+c="; release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw="; release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc"; release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0="; diff --git a/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/nixpkgs/pkgs/development/coq-modules/serapi/default.nix index ac09d26935af..b33c89aa63c1 100644 --- a/nixpkgs/pkgs/development/coq-modules/serapi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -87,6 +87,10 @@ in then [ ./janestreet-0.15.patch ] + else if version == "8.17.0+0.17.0" + then [ + ./janestreet-0.16.patch + ] else [ ]; diff --git a/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch b/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch new file mode 100644 index 000000000000..01aac57639ad --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch @@ -0,0 +1,17 @@ +diff --git a/serlib/ser_stdlib.ml b/serlib/ser_stdlib.ml +index 894d300..11c9217 100644 +--- a/serlib/ser_stdlib.ml ++++ b/serlib/ser_stdlib.ml +@@ -28,6 +28,7 @@ let ref_to_yojson f x = f !x + let ref_of_yojson f x = Result.map (fun x -> ref x) (f x) + let hash_fold_ref = hash_fold_ref_frozen + let compare_ref = compare_ref ++let (==) x y = (==) x y + + module Lazy = struct + type 'a t = 'a lazy_t +@@ -35,3 +36,4 @@ module Lazy = struct + end + + module Option = Stdlib.Option ++module List = Stdlib.List diff --git a/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix index da3d1e7e7c60..1a0c3665ea27 100644 --- a/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; rev = "refs/tags/${version}"; - hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; + hash = "sha256-RBoDT/KnbQHeuE5WpoL4QWu3gojiNdsi+/NEY2e/sHs="; }; subPackages = [ "." ]; - vendorHash = "sha256-SKqorfgesYE0kXR/Fm6gI7Me0CxtDeNsTRGYuGJW+vo="; + vendorHash = "sha256-tS6OmH757VDdViPHJAJAftQu+Y1YozE7gXkt5anDlT0="; doCheck = false; diff --git a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index af496df582c1..a9384d9b2b8b 100644 --- a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, makeDesktopItem, icoutils, fdupes, imagemagick, jdk11, fetchzip }: -# TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 -# This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: -# https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 -# If you're updating this derivation, check the link above to see if it's been fixed upstream -# and try replacing all occurrences of jdk11 with jre and test whether it works. +{ fdupes +, fetchzip +, icoutils +, imagemagick +, jdk17 +, lib +, makeDesktopItem +, stdenv +}: + let iconame = "STM32CubeMX"; in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.1"; + version = "6.9.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; + sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; stripRoot = false; }; - nativeBuildInputs = [ icoutils fdupes imagemagick ]; + nativeBuildInputs = [ fdupes icoutils imagemagick ]; desktopItem = makeDesktopItem { name = "STM32CubeMX"; exec = "stm32cubemx"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { cat << EOF > $out/bin/${pname} #!${stdenv.shell} - ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX EOF chmod +x $out/bin/${pname} @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ angaz wucke13 ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 2aaefaed7a43..0008b181fec2 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1386"; + version = "1.11.1.1413"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-e5RLnsydCZKRv6P/yC8FxK5AgK0Gj6YJw7E41neGYsM="; + hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/cyber/default.nix b/nixpkgs/pkgs/development/interpreters/cyber/default.nix index 9c1d94b0c7f8..4d756b152d44 100644 --- a/nixpkgs/pkgs/development/interpreters/cyber/default.nix +++ b/nixpkgs/pkgs/development/interpreters/cyber/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-08-11"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "242ba2573cbac2acecc8c06878a8d754dd7a8716"; - hash = "sha256-jArkFdvWnHNouNGsTn8O2lbU7eZdLbPD0xEfkrFH5Aw="; + rev = "be76bc13590285cffa502c3c97470a80ff1f27bd"; + hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/expr/default.nix b/nixpkgs/pkgs/development/interpreters/expr/default.nix index d2f4816e0ae5..bc9145bf3403 100644 --- a/nixpkgs/pkgs/development/interpreters/expr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.14.3"; + version = "1.15.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-4BYFFuoKI5EdxBrgMi33PgjXL6TI7jOQ8H7jLlNKfks="; + hash = "sha256-UZUy2qZQh5vGWVw08ZSJTTy6Obh2dIHkk7p1G+B0du0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-vQmQdPmfZtudnFqqNeMRdbRVytpbcCt/wH1xSTO+cMQ="; + vendorHash = "sha256-RnrM7L1QppUPBi3sJ4xM/UChFHADEpAA36JaURP7Vo4="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix index 511cf691e28a..30b7aabbcdcd 100644 --- a/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-hNwDX2yg7J8rcR9QRSGgqFTeqH+ydyDtPbIGC2nK5RI="; + sha256 = "sha256-D9maTCNNJ9ivj76SEjddFSYNu+RLEZG+3SgOWEAD7aU="; }; - vendorHash = "sha256-DrVtT2OBNquWVp/8Je45dBPDXafEc2Q+jffwY2S8J80="; + vendorHash = "sha256-ioC7R5Pm2nmHXI+/ko1UoNJCvEFzvhZcAcVtaFECz2c="; doCheck = false; diff --git a/nixpkgs/pkgs/development/interpreters/luau/default.nix b/nixpkgs/pkgs/development/interpreters/luau/default.nix index 4bacb15a79d9..2ae58455f42e 100644 --- a/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.591"; + version = "0.592"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-eCYB+B5bglUcF+xAAHBWwwgDrvY9NatmcwL/GUnIhOk="; + hash = "sha256-S0Sr28jPnFBurLlCCj3BzTLh7yvzEPlR0MAUz7cDf1k="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/interpreters/php/8.3.nix b/nixpkgs/pkgs/development/interpreters/php/8.3.nix index 0e7d7111f245..2c529a3ec965 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.3.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0beta3"; + version = "8.3.0RC1"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0beta3.tar.xz"; - hash = "sha256-XW3t9BOsBFvThYXF66faVl8VyMLFB+Oi7h45vWUmE6Y="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC1.tar.xz"; + hash = "sha256-pWnkxSIhzKU8Cp+AiGzqhqRtWoJu+zBfCM45n2ugH7c="; }; }); in diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix index 46b01999f96c..74aff43f7cae 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix @@ -1,7 +1,8 @@ self: dontUse: with self; let - pythonInterpreter = python.pythonForBuild.interpreter; + inherit (python) pythonForBuild; + pythonInterpreter = pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; pythonCheckInterpreter = python.interpreter; setuppy = ../run_setup.py; @@ -66,11 +67,9 @@ in { makePythonHook { name = "pypa-build-hook.sh"; propagatedBuildInputs = [ build wheel ]; - substitutions = { - inherit pythonInterpreter; - }; - } ./pypa-build-hook.sh) {}; - + } ./pypa-build-hook.sh) { + inherit (pythonForBuild.pkgs) build; + }; pipInstallHook = callPackage ({ makePythonHook, pip }: makePythonHook { @@ -81,6 +80,17 @@ in { }; } ./pip-install-hook.sh) {}; + pypaInstallHook = callPackage ({ makePythonHook, installer }: + makePythonHook { + name = "pypa-install-hook"; + propagatedBuildInputs = [ installer ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./pypa-install-hook.sh) { + inherit (pythonForBuild.pkgs) installer; + }; + pytestCheckHook = callPackage ({ makePythonHook, pytest }: makePythonHook { name = "pytest-check-hook"; @@ -134,9 +144,8 @@ in { pythonRelaxDepsHook = callPackage ({ makePythonHook, wheel }: makePythonHook { name = "python-relax-deps-hook"; - propagatedBuildInputs = [ wheel ]; substitutions = { - inherit pythonInterpreter; + inherit pythonInterpreter pythonSitePackages wheel; }; } ./python-relax-deps-hook.sh) {}; diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index 3b7130049769..5d77613bf565 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -6,7 +6,7 @@ pypaBuildPhase() { runHook preBuild echo "Creating a wheel..." - @pythonInterpreter@ -m build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags echo "Finished creating a wheel..." runHook postBuild diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh new file mode 100644 index 000000000000..2d925742daa7 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh @@ -0,0 +1,26 @@ +# Setup hook for PyPA installer. +echo "Sourcing pypa-install-hook" + +pypaInstallPhase() { + echo "Executing pypaInstallPhase" + runHook preInstall + + pushd dist > /dev/null + + for wheel in *.whl; do + @pythonInterpreter@ -m installer --prefix "$out" "$wheel" + echo "Successfully installed $wheel" + done + + popd > /dev/null + + export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + + runHook postInstall + echo "Finished executing pypaInstallPhase" +} + +if [ -z "${dontUsePypaInstall-}" ] && [ -z "${installPhase-}" ]; then + echo "Using pypaInstallPhase" + installPhase=pypaInstallPhase +fi diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index 31bdec914f69..1ac91fb40e4e 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -78,24 +78,27 @@ pythonRelaxDepsHook() { pushd dist # See https://peps.python.org/pep-0491/#escaping-and-unicode - local -r pkg_name="${pname//[^[:alnum:].]/_}-$version" + local -r pkg_name="${pname//[^[:alnum:].]/_}" local -r unpack_dir="unpacked" - local -r metadata_file="$unpack_dir/$pkg_name/$pkg_name.dist-info/METADATA" + local -r metadata_file="$unpack_dir/$pkg_name*/$pkg_name*.dist-info/METADATA" # We generally shouldn't have multiple wheel files, but let's be safer here for wheel in "$pkg_name"*".whl"; do - @pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" + PYTHONPATH="@wheel@/@pythonSitePackages@:$PYTHONPATH" \ + @pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" rm -rf "$wheel" - _pythonRelaxDeps "$metadata_file" - _pythonRemoveDeps "$metadata_file" + # Using no quotes on purpose since we need to expand the glob from `$metadata_file` + _pythonRelaxDeps $metadata_file + _pythonRemoveDeps $metadata_file if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "pythonRelaxDepsHook: resulting METADATA for '$wheel':" - cat "$unpack_dir/$pkg_name/$pkg_name.dist-info/METADATA" + cat $metadata_file fi - @pythonInterpreter@ -m wheel pack "$unpack_dir/$pkg_name" + PYTHONPATH="@wheel@/@pythonSitePackages@:$PYTHONPATH" \ + @pythonInterpreter@ -m wheel pack "$unpack_dir/$pkg_name"* done # Remove the folder since it will otherwise be in the dist output. diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index 79e45b8dc395..8a75dbf43a74 100644 --- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -12,8 +12,8 @@ , update-python-libraries , setuptools , flitBuildHook -, pipBuildHook -, pipInstallHook +, pypaBuildHook +, pypaInstallHook , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook @@ -161,6 +161,20 @@ let in inputs: builtins.map (checkDrv) inputs; + isBootstrapInstallPackage = builtins.elem (attrs.pname or null) [ + "flit-core" "installer" + ]; + + isBootstrapPackage = isBootstrapInstallPackage || builtins.elem (attrs.pname or null) ([ + "build" "packaging" "pyproject-hooks" "wheel" + ] ++ lib.optionals (python.pythonOlder "3.11") [ + "tomli" + ]); + + isSetuptoolsDependency = builtins.elem (attrs.pname or null) [ + "setuptools" "wheel" + ]; + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" @@ -174,7 +188,15 @@ let wrapPython ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook - ] ++ lib.optionals catchConflicts [ + ] ++ lib.optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ + # + # 1. When building a package that is also part of the bootstrap chain, we + # must ignore conflicts after installation, because there will be one with + # the package in the bootstrap. + # + # 2. When a package is a dependency of setuptools, we must ignore conflicts + # because the hook that checks for conflicts uses setuptools. + # pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ pythonRemoveBinBytecodeHook @@ -184,15 +206,26 @@ let setuptoolsBuildHook ] ++ lib.optionals (format == "flit") [ flitBuildHook - ] ++ lib.optionals (format == "pyproject") [ - pipBuildHook - ] ++ lib.optionals (format == "wheel") [ + ] ++ lib.optionals (format == "pyproject") [( + if isBootstrapPackage then + pypaBuildHook.override { + inherit (python.pythonForBuild.pkgs.bootstrap) build; + wheel = null; + } + else + pypaBuildHook + )] ++ lib.optionals (format == "wheel") [ wheelUnpackHook ] ++ lib.optionals (format == "egg") [ eggUnpackHook eggBuildHook eggInstallHook - ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ - pipInstallHook - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + ] ++ lib.optionals (format != "other") [( + if isBootstrapInstallPackage then + pypaInstallHook.override { + inherit (python.pythonForBuild.pkgs.bootstrap) installer; + } + else + pypaInstallHook + )] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ # This is a test, however, it should be ran independent of the checkPhase and checkInputs pythonImportsCheckHook ] ++ lib.optionals (python.pythonAtLeast "3.3") [ diff --git a/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix index 6a723413c850..91ca84b34b83 100644 --- a/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix +++ b/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix @@ -32,12 +32,17 @@ let } else result; - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix { + mkPythonDerivation = if python.isPy3k then + ./mk-python-derivation.nix + else + ./python2/mk-python-derivation.nix; + + buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules })); - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix { + buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. })); diff --git a/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix new file mode 100644 index 000000000000..e5f9c00b2fb2 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -0,0 +1,252 @@ +# Generic builder only used for EOL and deprecated Python 2. + +{ lib +, config +, python +, wrapPython +, unzip +, ensureNewerSourcesForZipFilesHook +# Whether the derivation provides a Python module or not. +, toPythonModule +, namePrefix +, update-python-libraries +, setuptools +, pipBuildHook +, pipInstallHook +, pythonCatchConflictsHook +, pythonImportsCheckHook +, pythonOutputDistHook +, pythonRemoveBinBytecodeHook +, pythonRemoveTestsDirHook +, setuptoolsBuildHook +, setuptoolsCheckHook +, wheelUnpackHook +, eggUnpackHook +, eggBuildHook +, eggInstallHook +}: + +{ name ? "${attrs.pname}-${attrs.version}" + +# Build-time dependencies for the package +, nativeBuildInputs ? [] + +# Run-time dependencies for the package +, buildInputs ? [] + +# Dependencies needed for running the checkPhase. +# These are added to buildInputs when doCheck = true. +, checkInputs ? [] +, nativeCheckInputs ? [] + +# propagate build dependencies so in case we have A -> B -> C, +# C can import package A propagated by B +, propagatedBuildInputs ? [] + +# DEPRECATED: use propagatedBuildInputs +, pythonPath ? [] + +# Enabled to detect some (native)BuildInputs mistakes +, strictDeps ? true + +, outputs ? [ "out" ] + +# used to disable derivation, useful for specific python versions +, disabled ? false + +# Raise an error if two packages are installed with the same name +# TODO: For cross we probably need a different PYTHONPATH, or not +# add the runtime deps until after buildPhase. +, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) + +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] + +# Skip wrapping of python programs altogether +, dontWrapPythonPrograms ? false + +# Don't use Pip to install a wheel +# Note this is actually a variable for the pipInstallPhase in pip's setupHook. +# It's included here to prevent an infinite recursion. +, dontUsePipInstall ? false + +# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs +, permitUserSite ? false + +# Remove bytecode from bin folder. +# When a Python script has the extension `.py`, bytecode is generated +# Typically, executables in bin have no extension, so no bytecode is generated. +# However, some packages do provide executables with extensions, and thus bytecode is generated. +, removeBinBytecode ? true + +# Several package formats are supported. +# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. +# "wheel" : Install from a pre-compiled wheel. +# "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. +# "egg": Install a package from an egg. +# "other" : Provide your own buildPhase and installPhase. +, format ? "setuptools" + +, meta ? {} + +, passthru ? {} + +, doCheck ? config.doCheckByDefault or false + +, disabledTestPaths ? [] + +, ... } @ attrs: + +assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format"; + +let + inherit (python) stdenv; + + withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"]; + + name_ = name; + + validatePythonMatches = attrName: let + isPythonModule = drv: + # all pythonModules have the pythonModule attribute + (drv ? "pythonModule") + # Some pythonModules are turned in to a pythonApplication by setting the field to false + && (!builtins.isBool drv.pythonModule); + isMismatchedPython = drv: drv.pythonModule != python; + + optionalLocation = let + pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; + in lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; + + leftPadName = name: against: let + len = lib.max (lib.stringLength name) (lib.stringLength against); + in lib.strings.fixedWidthString len " " name; + + throwMismatch = drv: let + myName = "'${namePrefix}${name}'"; + theirName = "'${drv.name}'"; + in throw '' + Python version mismatch in ${myName}: + + The Python derivation ${myName} depends on a Python derivation + named ${theirName}, but the two derivations use different versions + of Python: + + ${leftPadName myName theirName} uses ${python} + ${leftPadName theirName myName} uses ${toString drv.pythonModule} + + Possible solutions: + + * If ${theirName} is a Python library, change the reference to ${theirName} + in the ${attrName} of ${myName} to use a ${theirName} built from the same + version of Python + + * If ${theirName} is used as a tool during the build, move the reference to + ${theirName} in ${myName} from ${attrName} to nativeBuildInputs + + * If ${theirName} provides executables that are called at run time, pass its + bin path to makeWrapperArgs: + + makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ]; + + ${optionalLocation} + ''; + + checkDrv = drv: + if (isPythonModule drv) && (isMismatchedPython drv) + then throwMismatch drv + else drv; + + in inputs: builtins.map (checkDrv) inputs; + + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. + self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ + "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "disabledTestPaths" "outputs" + ]) // { + + name = namePrefix + name_; + + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + pythonRemoveTestsDirHook + ] ++ lib.optionals catchConflicts [ + pythonCatchConflictsHook + ] ++ lib.optionals removeBinBytecode [ + pythonRemoveBinBytecodeHook + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ lib.optionals (format == "setuptools") [ + setuptoolsBuildHook + ] ++ lib.optionals (format == "pyproject") [( + pipBuildHook + )] ++ lib.optionals (format == "wheel") [ + wheelUnpackHook + ] ++ lib.optionals (format == "egg") [ + eggUnpackHook eggBuildHook eggInstallHook + ] ++ lib.optionals (format != "other") [( + pipInstallHook + )] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + # This is a test, however, it should be ran independent of the checkPhase and checkInputs + pythonImportsCheckHook + ] ++ lib.optionals withDistOutput [ + pythonOutputDistHook + ] ++ nativeBuildInputs; + + buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath); + + propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [ + # we propagate python even for packages transformed with 'toPythonApplication' + # this pollutes the PATH but avoids rebuilds + # see https://github.com/NixOS/nixpkgs/issues/170887 for more context + python + ]); + + inherit strictDeps; + + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + + # Python packages don't have a checkPhase, only an installCheckPhase + doCheck = false; + doInstallCheck = attrs.doCheck or true; + nativeInstallCheckInputs = [ + ] ++ lib.optionals (format == "setuptools") [ + # Longer-term we should get rid of this and require + # users of this function to set the `installCheckPhase` or + # pass in a hook that sets it. + setuptoolsCheckHook + ] ++ nativeCheckInputs; + installCheckInputs = checkInputs; + + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' + wrapPythonPrograms + '' + attrs.postFixup or ""; + + # Python packages built through cross-compilation are always for the host platform. + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + + outputs = outputs ++ lib.optional withDistOutput "dist"; + + meta = { + # default to python's platforms + platforms = python.meta.platforms; + isBuildPythonPackage = python.meta.platforms; + } // meta; + } // lib.optionalAttrs (attrs?checkPhase) { + # If given use the specified checkPhase, otherwise use the setup hook. + # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. + installCheckPhase = attrs.checkPhase; + } // lib.optionalAttrs (disabledTestPaths != []) { + disabledTestPaths = lib.escapeShellArgs disabledTestPaths; + })); + + passthru.updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; +in lib.extendDerivation + (disabled -> throw "${name} not supported for interpreter ${python.executable}") + passthru + self diff --git a/nixpkgs/pkgs/development/interpreters/risor/default.nix b/nixpkgs/pkgs/development/interpreters/risor/default.nix index 61753ba2b99e..149d386fff39 100644 --- a/nixpkgs/pkgs/development/interpreters/risor/default.nix +++ b/nixpkgs/pkgs/development/interpreters/risor/default.nix @@ -7,19 +7,20 @@ buildGoModule rec { pname = "risor"; - version = "0.14.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-QhXIwFrApSkWY2YYYGlojKsByNA2xpyVTm0SpYWB/Ds="; + hash = "sha256-/7jUz2180m+YVyE9z4UKOhVv0DSqrCWdkyAftluMHeo="; }; - vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4="; + proxyVendor = true; + vendorHash = "sha256-OUQY5yzsbMS81gRb1mIvkRHal4mvOE2Na2HAsqkeWG4="; subPackages = [ - "cmd/..." + "cmd/risor" ]; ldflags = [ @@ -43,3 +44,4 @@ buildGoModule rec { maintainers = with maintainers; [ figsoda ]; }; } + diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 11119b768825..71f3f8be9b01 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.18"; + version = "3.4.19"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-+yHTJWedZNCkkRMIRT103QMTFJODlbJ2PwVbTghEo0M="; + hash = "sha256-+ZYpS9UOB16qCjhrKwFGBn43t3KNOv/QIrLKIPAywWs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index 6ce6e35189bf..8d4903add899 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, callPackage, makeSetupHook +{ lib, stdenv, callPackage, makeSetupHook, runCommand +, tzdata # Version specific stuff , release, version, src @@ -7,7 +8,7 @@ let baseInterp = - stdenv.mkDerivation { + stdenv.mkDerivation rec { pname = "tcl"; inherit version src; @@ -15,6 +16,14 @@ let setOutputFlags = false; + postPatch = '' + substituteInPlace library/clock.tcl \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \ + --replace "/usr/share/lib/zoneinfo" "" \ + --replace "/usr/lib/zoneinfo" "" \ + --replace "/usr/local/etc/zoneinfo" "" + ''; + preConfigure = '' cd unix ''; @@ -55,6 +64,12 @@ let name = "tcl-package-hook"; propagatedBuildInputs = [ buildPackages.makeWrapper ]; } ./tcl-package-hook.sh) {}; + # verify that Tcl's clock library can access tzdata + tests.tzdata = runCommand "${pname}-test-tzdata" {} '' + ${baseInterp}/bin/tclsh <(echo "set t [clock scan {2004-10-30 05:00:00} \ + -format {%Y-%m-%d %H:%M:%S} \ + -timezone :America/New_York]") > $out + ''; }; }; diff --git a/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/nixpkgs/pkgs/development/interpreters/trealla/default.nix index 4c04940470e0..34b722d9dcf9 100644 --- a/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ b/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.24.21"; + version = "2.25.2"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-zpHdZiDtNcQko+gn92fiGWSvYT4aQ4t6nYFwf6zu0cA="; + hash = "sha256-3NBrJFSTcjftvTYn26SMeU2HtR81J2qlDAwAZRdis4M="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 414bccfb8523..936caafaffa7 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-6bbz8FH87MahD3R7G3cmsJD0461L4OoCbFejyXsuER0="; + hash = "sha256-4h+c5ke4MZuIMiCaLBt6RsRe9PWAn6VqW2Z6Wnh7X30="; fetchSubmodules = true; }; - cargoHash = "sha256-QbKYnKdJK9zImZDl057l8/Za4A+N82WrqQCzrOsc6fE="; + cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; diff --git a/nixpkgs/pkgs/development/interpreters/wazero/default.nix b/nixpkgs/pkgs/development/interpreters/wazero/default.nix index 880dbf321f82..18fa05ccc238 100644 --- a/nixpkgs/pkgs/development/interpreters/wazero/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-Yn5mg/K+RT6CoW1vMrpvRFOao83IAZE1mP+DGp4SmKk="; + hash = "sha256-iUPAVOmZNX4qs7bHu9dXtQP/G8FwyblJvZ3pauA9ev0="; }; vendorHash = null; @@ -46,5 +46,6 @@ buildGoModule rec { changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; + mainProgram = "wazero"; }; } diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index aa1cd1d809f0..4c8c7ed8f435 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.28.1"; + version = "2.28.2"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-SXfOulwAVNvmwvEUZBrO1DzjvytB6mS2o3LWuhKcsV0="; + hash = "sha256-ZLEQL6Igk1FbAu8z3Yc53uG6V+nbumoJKUK4u+0aHF4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index ac97871d9ca1..772650bd3a8a 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -36,14 +36,21 @@ stdenv.mkDerivation rec { patches = [ # CVE-2021-36217 / CVE-2021-3502 (fetchpatch { + name = "CVE-2021-3502.patch"; url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch"; sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU="; }) # CVE-2021-3468 (fetchpatch { + name = "CVE-2021-3468.patch"; url = "https://github.com/lathiat/avahi/commit/447affe29991ee99c6b9732fc5f2c1048a611d3b.patch"; sha256 = "sha256-qWaCU1ZkCg2PmijNto7t8E3pYRN/36/9FrG8okd6Gu8="; }) + (fetchpatch { + name = "CVE-2023-1981.patch"; + url = "https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f.patch"; + sha256 = "sha256-BEYFGCnQngp+OpiKIY/oaKygX7isAnxJpUPCUvg+efc="; + }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index c618a2ee3b5b..85c785be3cb3 100644 --- a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-jpNsH8c5ObnO+/AqsribvyFZhm7mmCFGNx9p4QHZKQE="; + sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/azmq/default.nix b/nixpkgs/pkgs/development/libraries/azmq/default.nix new file mode 100644 index 000000000000..7317c51aabde --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/azmq/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, ninja +, zeromq +, catch2 +}: + +stdenv.mkDerivation { + pname = "azmq"; + version = "unstable-2023-03-23"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "azmq"; + rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf"; + hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + boost + catch2 + zeromq + ]; + + # Broken for some reason on this platform. + doCheck = !(stdenv.isAarch64 && stdenv.isLinux); + + meta = with lib; { + homepage = "https://github.com/zeromq/azmq"; + license = licenses.boost; + description = "C++ language binding library integrating ZeroMQ with Boost Asio"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix index eb0ea3c94b28..0b6cd66cae38 100644 --- a/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.2.12"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; + sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA="; }; buildInputs = [ bctoolbox belr ]; diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index a48b6f4fa7f5..b8201f8ce5c6 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit curl grpc; + inherit grpc; + curl = (curl.override { c-aresSupport = true; }).tests.withCheck; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix index 0d236c36aa3c..82d591abc139 100644 --- a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "${finalAttrs.src.name}/library/"; + sourceRoot = "${finalAttrs.src.name}/library"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index ec108adc61eb..003de885c791 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gfortran, perl -, mpi, blas, lapack, scalapack, openssh +{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook +, gfortran, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; - nativeBuildInputs = [ autoreconfHook perl openssh ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] ++ lib.optional enableCuda cudatoolkit; @@ -76,15 +76,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' #patchShebangs ./ - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - # Run dual threaded export OMP_NUM_THREADS=2 diff --git a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix index 84513d20a57a..71077d6e315e 100644 --- a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix +++ b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + enableParallelBuilding = true; + configureFlags = lib.optional exampleSupport "--enable-example"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index cd9e99b352eb..b42fdbd60ccb 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.18"; + version = "1.3.20"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HYVh1XxxmRoo9GgTQ3hcI6aj61TVvNI4l9B+OCX/LVY="; + sha256 = "sha256-IK4R87gG5PvA+gtZMftHO7V0i+6dSH9qoSiFCDV4pe0="; }; buildInputs = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; + changelog = "https://github.com/FreeTDS/freetds/releases/tag/v${version}"; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/futuresql/default.nix b/nixpkgs/pkgs/development/libraries/futuresql/default.nix new file mode 100644 index 000000000000..2adc148701a7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/futuresql/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }: +stdenv.mkDerivation rec { + pname = "futuresql"; + version = "0.1.1"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtbase ]; + + # a library, nothing to wrap + dontWrapQtApps = true; +} diff --git a/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch b/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch new file mode 100644 index 000000000000..eea9dc6e0378 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch @@ -0,0 +1,32 @@ +From 1e000ca711886055176a2f90197a383d09de0e67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + <rosen644835@gmail.com> +Date: Fri, 18 Dec 2020 14:19:36 +0100 +Subject: [PATCH] msginit: Do not use POT-Creation-Date. + +* gettext-tools/src/msginit.c (po_revision_date): Do not use +POT-Creation-Date when the file is automatically generated. +--- + gettext-tools/src/msginit.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c +index 8ca9a3b77..06e0e7195 100644 +--- a/gettext-tools/src/msginit.c ++++ b/gettext-tools/src/msginit.c +@@ -1075,9 +1075,9 @@ static const char * + po_revision_date (const char *header) + { + if (no_translator) +- /* Because the PO file is automatically generated, we use the +- POT-Creation-Date, not the current time. */ +- return get_field (header, "POT-Creation-Date"); ++ /* Because the PO file is automatically generated, we don't ++ generate PO-Revision-Date field. */ ++ return NULL; + else + { + /* Assume the translator will modify the PO file now. */ +-- +2.29.2 + diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 9230c27a3c1f..dc4af0813918 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff + # fix reproducibile output, in particular in the grub2 build + # https://savannah.gnu.org/bugs/index.php?59658 + ./0001-msginit-Do-not-use-POT-Creation-Date.patch ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; name = "gettext_formatstring-ruby.patch"; diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix index a64bb0967aa7..53377022ad69 100644 --- a/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -19,24 +19,50 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + # glog's custom FindUnwind.cmake module detects LLVM's unwind in case + # stdenv.cc is clang. But the module doesn't get installed, causing + # consumers of the CMake config file to fail at the configuration step. + # Explicitly disabling unwind support sidesteps the issue. + "-DWITH_UNWIND=OFF" ]; - # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed - doCheck = !stdenv.isDarwin; + doCheck = true; + # There are some non-thread safe tests that can fail enableParallelChecking = false; nativeCheckInputs = [ perl ]; - GTEST_FILTER = + env.GTEST_FILTER = let filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ "Symbolize.SymbolizeStackConsumption" "Symbolize.SymbolizeWithDemanglingStackConsumption" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ] ++ lib.optionals stdenv.cc.isClang [ + # Clang optimizes an expected allocation away. + # See https://github.com/google/glog/issues/937 + "DeathNoAllocNewHook.logging" + ] ++ lib.optionals stdenv.isDarwin [ + "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ]; + in + "-${builtins.concatStringsSep ":" filteredTests}"; + + checkPhase = + let + excludedTests = lib.optionals stdenv.isDarwin [ + "mock-log" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "logging" # works around segfaults on aarch64-darwin for now ]; + excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; in - lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}"; + '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; meta = with lib; { homepage = "https://github.com/google/glog"; diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 75a20bbbc355..2b088eb459ad 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -23,9 +23,29 @@ in stdenv.mkDerivation { pname = "gnu-config"; version = "2023-07-31"; - buildCommand = '' - install -Dm755 ${configGuess} $out/config.guess - install -Dm755 ${configSub} $out/config.sub + unpackPhase = '' + runHook preUnpack + cp ${configGuess} ./config.guess + cp ${configSub} ./config.sub + chmod +w ./config.sub ./config.guess + runHook postUnpack + ''; + + # If this isn't set, `pkgs.gnu-config.overrideAttrs( _: { patches + # = ...; })` will behave very counterintuitively: the (unpatched) + # gnu-config from the updateAutotoolsGnuConfigScriptsHook stdenv's + # defaultNativeBuildInputs will "update" the patched gnu-config by + # reverting the patch! + dontUpdateAutotoolsGnuConfigScripts = true; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 ./config.guess $out/config.guess + install -Dm755 ./config.sub $out/config.sub + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index b04d5966a5a9..2bfde78f7dbc 100644 --- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -41,6 +41,15 @@ stdenv.mkDerivation (finalAttrs: { --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" ''; + doCheck = true; + checkPhase = '' + runHook preCheck + + bin/unit-hyperscan + + runHook postCheck + ''; + meta = with lib; { description = "High-performance multiple regex matching library"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index c0e20ba7f594..69f25fd79c83 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -24,19 +24,19 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "igraph"; version = "0.10.6"; src = fetchFromGitHub { owner = "igraph"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE="; }; postPatch = '' - echo "${version}" > IGRAPH_VERSION + echo "${finalAttrs.version}" > IGRAPH_VERSION ''; outputs = [ "out" "dev" "doc" ]; @@ -95,9 +95,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library for complex network analysis and graph theory"; homepage = "https://igraph.org/"; - changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index ba9a0610bde0..4ed5cc06cf0a 100644 --- a/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.7"; + version = "1.89.8"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs="; + sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix index 022f68a9d351..113c377240b4 100644 --- a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Work around the "unpacker appears to have produced no directories" - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 73bbe1782b7f..d9064ee85d17 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-4"; + version = "6.0-5"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA="; + sha256 = "sha256-pKmR+IVJAaY91KiboCBkwZleMmMFToez1fW+eXyrZjs="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/nixpkgs/pkgs/development/libraries/kcp/default.nix b/nixpkgs/pkgs/development/libraries/kcp/default.nix new file mode 100644 index 000000000000..69a2b91553e4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kcp/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "kcp"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "kcp"; + rev = version; + hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A Fast and Reliable ARQ Protocol"; + homepage = "https://github.com/skywind3000/kcp"; + license = licenses.mit; + maintainers = with maintainers; [ rs0vere ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index 5ab33fcf46fd..f9aa5dc369c6 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -4,12 +4,12 @@ , fetchpatch , extra-cmake-modules , qtbase -, qttranslations , kcoreaddons , python3 , sqlite , postgresql , libmysqlclient +, qttools }: mkDerivation rec { @@ -34,9 +34,9 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qttranslations kcoreaddons python3 sqlite postgresql libmysqlclient ]; + buildInputs = [ kcoreaddons python3 sqlite postgresql libmysqlclient ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 281a490bf90a..a47182fda5e5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,8 +1,8 @@ -{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }: +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qtgraphicaleffects, qttools }: mkDerivation { pname = "kirigami2"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; outputs = [ "out" "dev" ]; } diff --git a/nixpkgs/pkgs/development/libraries/lcrq/default.nix b/nixpkgs/pkgs/development/libraries/lcrq/default.nix index 91a8e2e30f5b..865ec4697326 100644 --- a/nixpkgs/pkgs/development/libraries/lcrq/default.nix +++ b/nixpkgs/pkgs/development/libraries/lcrq/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "lcrq"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; - hash = "sha256-GvfmHST53qwVrztnmCzUVbVkgNGtAl5adqdNWOHItiU="; + hash = "sha256-r4UiZ9oNDxF3rHMqg+1NLLjm6LPZtzgtZOs7pRe5SdQ="; }; installFlags = [ "PREFIX=$(out)" ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://librecast.net/lcrq.html"; license = [ lib.licenses.gpl2 lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ]; - platforms = lib.platforms.gnu; + platforms = lib.platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index c8f050c300ce..de305474a3ab 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -30,7 +30,7 @@ let autoreconfHook = buildPackages.autoreconfHook269; in assert xarSupport -> libxml2 != null; -(stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; version = "3.6.2"; @@ -43,6 +43,16 @@ assert xarSupport -> libxml2 != null; outputs = [ "out" "lib" "dev" ]; + patches = [ + # fixes static linking; upstream in releases after 3.6.2 + # https://github.com/libarchive/libarchive/pull/1825 merged upstream + (assert finalAttrs.version == "3.6.2"; fetchpatch { + name = "001-only-add-iconv-to-pc-file-if-needed.patch"; + url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; + hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + }) + ]; + postPatch = let skipTestPaths = [ # test won't work in nix sandbox @@ -119,16 +129,4 @@ assert xarSupport -> libxml2 != null; passthru.tests = { inherit cmake nix samba; }; -})).overrideAttrs(previousAttrs: - assert previousAttrs.version == "3.6.2"; - lib.optionalAttrs stdenv.hostPlatform.isStatic { - patches = [ - # fixes static linking; upstream in releases after 3.6.2 - # https://github.com/libarchive/libarchive/pull/1825 merged upstream - (fetchpatch { - name = "001-only-add-iconv-to-pc-file-if-needed.patch"; - url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; - hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; - }) - ]; - }) +}) diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix index ba24182ade80..fe1b789fc42f 100644 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q="; + sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 38a62255b15e..b9d31c6fd874 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0iqih0fbafzlcfq3kljjr3pkywamwvahgm6b7b0z0xdbzq0idxdx"; - platforms."x86_64-linux".sha256 = "1cc7lmp984653b9909pnk4brs96bmgq7hd6p9i6xgxy2y4n3887m"; + platforms."aarch64-linux".sha256 = "0ij7y0whlq8g1sskbhirbw3ngbp95k1in2pi9kjhb9flydjwxq8g"; + platforms."x86_64-linux".sha256 = "0dyv1ddsakxi51a7iwmy006mx27gvjq49i45difkmjv6mw9s2fw9"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.14"; - gitRevision = "376a780"; - chromiumVersion = "116.0.5845.97"; + version = "116.0.15"; + gitRevision = "0b8c265"; + chromiumVersion = "116.0.5845.111"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/libcint/default.nix b/nixpkgs/pkgs/development/libraries/libcint/default.nix index 7163c312ea92..e90078b0c840 100644 --- a/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.2.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-sFdigOlS5fAi2dV4dhcPg3roqFdvpnh580WDqTA6DGg="; + hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index faf9029b8fc7..95d1474c1fbe 100644 --- a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-EPVz9+qEuJe4VGXNuUnbH61EDxdyohZhxoxleO5j/Uk="; + sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 9cf19fa3d312..49c3713bbe0e 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.15.0"; + version = "3.16.0"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-CNHBPeodU2EzvmQBa9KI+1vGuuD25gSwdU9dVhVG04Q="; + hash = "sha256-XgObeVQJ2X7hNIelGK55RTtkKvU6D+RkLMc24/PZCzY="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index e3f9d82d1a81..7b7721197f82 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/libgourou/default.nix b/nixpkgs/pkgs/development/libraries/libgourou/default.nix index 2d1b90675590..78b5654873bd 100644 --- a/nixpkgs/pkgs/development/libraries/libgourou/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgourou/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchzip, pugixml, updfparser, curl, openssl, libzip -, installShellFiles }: +{ lib +, stdenv +, fetchzip +, pugixml +, updfparser +, curl +, openssl +, libzip +, installShellFiles +}: stdenv.mkDerivation rec { name = "libgourou"; - version = "0.8.1"; + version = "0.8.2"; src = fetchzip { url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/"; - sha256 = "sha256-X56K4z1+k62Q9pxnN8kx35oc7+uJJN/o/tpnKx1FjwE="; + sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix index 44367aad1f93..c3fb4a053864 100644 --- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisoburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI="; + sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs="; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/nixpkgs/pkgs/development/libraries/liblc3/default.nix index 3e27e4064c59..f2ec852d3bf0 100644 --- a/nixpkgs/pkgs/development/libraries/liblc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblc3/default.nix @@ -7,7 +7,7 @@ let name = "liblc3"; - version = "1.0.3"; + version = "1.0.4"; in stdenv.mkDerivation { pname = name; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-PEnK12FWAtxOMR3WyuxOQTgF+lD9S5YX+oKuWRbFfXM="; + sha256 = "sha256-nQJgF/cWoCx5TkX4xOaLB9SzvhVXPY29bLh7UwPMWEE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index a74c4e7140fa..edbaf20690ff 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.06"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-xrGuiyu89AM0BRizyU8q51yOsAaCv7vRiyJELkLcz80="; + hash = "sha256-YEVsiyq4dppggdlv176G20/jJSDkoCI5fLIsrPR86CA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index c6e787eda618..4807c1c55142 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "40"; + version = "41"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-4wPKe8D1lOLWqoT2h4VCPmvwyNrQCbsgvk1XQliOiQ0="; + hash = "sha256-HOIZOV0vUMM+siOhQD+DGLFo8ebRAVp9udv0OUCN6MQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix index 37043e3e4bde..d1ea44b6ac2f 100644 --- a/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -9,6 +9,16 @@ , pkg-config , withBluez ? false , withRemote ? false + +# for passthru.tests +, ettercap +, nmap +, ostinato +, tcpreplay +, vde2 +, wireshark +, python3 +, haskellPackages }: stdenv.mkDerivation rec { @@ -44,6 +54,12 @@ stdenv.mkDerivation rec { fi ''; + passthru.tests = { + inherit ettercap nmap ostinato tcpreplay vde2 wireshark; + inherit (python3.pkgs) pcapy-ng scapy; + haskell-pcap = haskellPackages.pcap; + }; + meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index b84562850efe..a8826e4381eb 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU="; + sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix index 26d7616ba8f0..b03be435aac5 100644 --- a/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, lcms2 +, pkg-config + +# for passthru.tests +, deepin +, freeimage +, hdrmerge +, imagemagick +, python3 +}: stdenv.mkDerivation rec { pname = "libraw"; @@ -11,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-1729.patch"; + url = "https://github.com/LibRaw/LibRaw/commit/9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch"; + hash = "sha256-OAyqphxvtSM15NI77HwtGTmTmP9YNu3xhZ6D1CceJ7I="; + }) + ]; + outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; @@ -19,6 +41,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit imagemagick hdrmerge freeimage; + inherit (deepin) deepin-image-viewer; + inherit (python3.pkgs) rawkit; + }; + meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index d81a31ce05c4..d5738153f0ab 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -29,6 +29,16 @@ , common-updater-scripts , jq , nix + +# for passthru.tests +, enlightenment +, ffmpeg +, gegl +, gimp +, imagemagick +, imlib2 +, vips +, xfce }: stdenv.mkDerivation (finalAttrs: { @@ -193,6 +203,17 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + tests = { + inherit + gegl + gimp + imagemagick + imlib2 + vips; + inherit (enlightenment) efl; + inherit (xfce) xfwm4; + ffmpeg = ffmpeg.override { withSvg = true; }; + }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index 0dc795a96d84..7c6613873f3a 100644 --- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-zd0HDUzVYLyFjhIudBJQaKJUtYMjZeQRLALSkyD9tXU="; + hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI="; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix index 0a1e1e7f0a21..a1fe567af8b1 100644 --- a/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-01-03${lib.optionalString with_ustream_ssl "-${ustream-ssl.ssl_implementation.pname}"}"; + version = "unstable-2023-05-23"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "eac92a4d5d82eb31e712157e7eb425af728b2c43"; - sha256 = "0w6mmwmd3ljhkqfk0qswq28dp63k30s3brlgf8lyi7vj7mrhvn3c"; + rev = "75a3b870cace1171faf57bd55e5a9a2f1564f757"; + hash = "sha256-QhJ09i7IWP6rbxrYuhisVsCr82Ou/JAZMEdkaLhZp1o="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 0f1757f4e618..5779389dda1b 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, fetchpatch }: stdenv.mkDerivation rec { pname = "liburing"; @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; }; + patches = [ + # Pull upstream fix for parallel build failures: + # https://github.com/axboe/liburing/pull/891 + (fetchpatch { + name = "parallel.patch"; + url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; + hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; + }) + ]; + separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index 9a78bc4422c7..9102286746b6 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.80"; + version = "2.1.111"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-3Lf8JUnzD20Xq6UswCbcWpgEBs0z4OEo7CGt0vWiPhI="; + sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix index 12ac860320c7..ecc3736d1fbb 100644 --- a/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" ]; - sourceRoot = "./ZenLib/Project/GNU/Library/"; + sourceRoot = "ZenLib/Project/GNU/Library"; preConfigure = "sh autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix index e7e8d2032ed5..44f82f15852a 100644 --- a/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , python , cmake +, ninja }: let - pyEnv = python.withPackages (ps: [ ps.setuptools ]); + pyEnv = python.withPackages (ps: [ ps.setuptools ps.tomli ps.pip ps.setuptools ]); in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.3"; + version = "0.13.2"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY="; + sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg="; }; outputs = [ "out" "py" ]; nativeBuildInputs = [ cmake + ninja ]; # Not a propagatedBuildInput because only the $py output needs it; $out is @@ -31,33 +33,16 @@ stdenv.mkDerivation rec { python ]; - dontUseCmakeConfigure = true; - - buildPhase = '' - runHook preBuild - - substituteInPlace setup.py \ - --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]" - ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES - - runHook postBuild + postBuild = '' + pushd /build/source/api/python + ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES + popd ''; - # I was unable to find a way to build the library itself and have it install - # to $out, while also installing the Python bindings to $py without building - # the project twice (using cmake), so this is the best we've got. It uses - # something called CPack to create the tarball, but it's not obvious to me - # *how* that happens, or how to intercept it to just get the structured - # library output. - installPhase = '' - runHook preInstall - - mkdir -p $out $py/nix-support - echo "${python}" >> $py/nix-support/propagated-build-inputs - tar xf build/*.tar.gz --directory $out --strip-components 1 + postInstall = '' + pushd /build/source/api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py - - runHook postInstall + popd ''; meta = with lib; { @@ -65,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.lassulus ]; + maintainers = with maintainers; [ lassulus genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix index d3e3187bf757..6ab138016d19 100644 --- a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL libX11 libXi ]; - sourceRoot = "liquidfun/Box2D/"; + sourceRoot = "liquidfun/Box2D"; preConfigurePhases = "preConfigure"; diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index 1c08812db45c..b583eb93153a 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + enableParallelBuilding = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index f19672e566d1..05341188be6c 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.13.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; + hash = "sha256-FkiqQZ6xmwU2vkJxmr7k+Va5jIByWayAfUea+2DCFhk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index b4330796e52c..8badbf9e8760 100644 --- a/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs nss - for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do + for f in nss/coreconf/config.gypi nss/build.sh; do substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" done diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix index fd47a05a1bc9..8851b09214f1 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "2.7.1"; + version = "2.7.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ alexarice bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index f7495d3e9c8c..7448a99439d0 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; version = "3.2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 99e45c1013d1..1b955b57de42 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -132,6 +132,7 @@ stdenv.mkDerivation rec { cmakeDir = "../cmake"; cmakeFlags = [ + "-DABSL_ENABLE_INSTALL=ON" "-DCMAKE_BUILD_TYPE=RELEASE" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" @@ -143,6 +144,7 @@ stdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" "-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}" "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}" + "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}" "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" diff --git a/nixpkgs/pkgs/development/libraries/openturns/default.nix b/nixpkgs/pkgs/development/libraries/openturns/default.nix index 4c80c4b9ac81..d6735e77d460 100644 --- a/nixpkgs/pkgs/development/libraries/openturns/default.nix +++ b/nixpkgs/pkgs/development/libraries/openturns/default.nix @@ -26,24 +26,15 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A="; + sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; }; - patches = [ - # Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187 - # Remove with next version update. - (fetchpatch { - url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch"; - hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE="; - }) - ]; - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; buildInputs = [ swig @@ -84,6 +75,7 @@ stdenv.mkDerivation rec { description = "Multivariate probabilistic modeling and uncertainty treatment library"; license = with licenses; [ lgpl3 gpl3 ]; homepage = "https://openturns.github.io/www/"; + changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; maintainers = with maintainers; [ gdinh ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 08b92288e544..941d4da56894 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.77"; + version = "0.3.78"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-dRAo/GzWvXKVCGLM12YyTQmgXHEYn3QbOyaZKmlqTYY="; + sha256 = "sha256-tiVuab8kugp9ZOKL/m8uZQps/pcrVihwB3rRf6SGuzc="; }; patches = [ @@ -221,7 +221,7 @@ let moveToOutput "bin/pw-jack" "$jack" ''; - passthru.tests = nixosTests.installed-tests.pipewire; + passthru.tests.installed-tests = nixosTests.installed-tests.pipewire; meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; diff --git a/nixpkgs/pkgs/development/libraries/plog/default.nix b/nixpkgs/pkgs/development/libraries/plog/default.nix index 789502283b7f..45b0fa49a1ab 100644 --- a/nixpkgs/pkgs/development/libraries/plog/default.nix +++ b/nixpkgs/pkgs/development/libraries/plog/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "plog"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "SergiusTheBest"; repo = pname; rev = version; - hash = "sha256-CARTr1EEqXNJtp6XwHhr7aiRBiYR0cClzexpNCMaQJc="; + hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 04fdf5298257..e6e6b24360a4 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -46,6 +46,7 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch + ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch @@ -333,7 +334,17 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "qt5"; - f = addPackages; -} + baseScope = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt5"; + f = addPackages; + }; + + bootstrapScope = baseScope.overrideScope(final: prev: { + qtbase = prev.qtbase.override { qttranslations = null; }; + qtdeclarative = null; + }); + + finalScope = baseScope.overrideScope(final: prev: { + qttranslations = bootstrapScope.qttranslations; + }); +in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch new file mode 100644 index 000000000000..e1aa0119aa2f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch @@ -0,0 +1,79 @@ +commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) +Author: K900 <me@0upti.me> +Date: Mon Aug 14 22:44:02 2023 +0300 + + QLibraryPrivate: Actually merge load hints + + Or old and new load hints in mergeLoadHints() instead of just storing + new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects + with no file name differently and just set load hints directly. + + Mention that load hints are merged once the file name is set + in the documentation for QLibrary::setLoadHints(). + + Add a regression test into tst_qfactoryloader. + + Update and extend tst_QPluginLoader::loadHints() to take into account + load hints merging. + + Fixes: QTBUG-114480 + Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 + Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp +index 5d2f024267..45b5a3fe27 100644 +--- a/src/corelib/plugin/qlibrary.cpp ++++ b/src/corelib/plugin/qlibrary.cpp +@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) + if (pHnd.loadRelaxed()) + return; + +- loadHintsInt.storeRelaxed(lh); ++ loadHintsInt.fetchAndOrRelaxed(lh); + } + + QFunctionPointer QLibraryPrivate::resolve(const char *symbol) +@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) + + void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) + { ++ // Set the load hints directly for a dummy if this object is not associated ++ // with a file. Such object is not shared between multiple instances. ++ if (fileName.isEmpty()) { ++ loadHintsInt.storeRelaxed(lh); ++ return; ++ } ++ + // this locks a global mutex + QMutexLocker lock(&qt_library_mutex); + mergeLoadHints(lh); +@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const + lazy symbol resolution, and will not export external symbols for resolution + in other dynamically-loaded libraries. + ++ \note Hints can only be cleared when this object is not associated with a ++ file. Hints can only be added once the file name is set (\a hints will ++ be or'ed with the old hints). ++ + \note Setting this property after the library has been loaded has no effect + and loadHints() will not reflect those changes. + +diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp +index 0a63b93762..ceee5d6385 100644 +--- a/src/corelib/plugin/qpluginloader.cpp ++++ b/src/corelib/plugin/qpluginloader.cpp +@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const + void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) + { + if (!d) { +- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr ++ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr + d->errorString.clear(); ++ } else { ++ d->setLoadHints(loadHints); + } +- d->setLoadHints(loadHints); + } + + QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index de73bcbe2772..9f0feaf94e58 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -15,6 +15,7 @@ # optional dependencies , cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 +, qttranslations ? null # options , libGLSupported ? !stdenv.isDarwin @@ -310,6 +311,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" + ] ++ lib.optional (qttranslations != null) [ + "-translationdir" "${qttranslations}/translations" ] ); diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index be96236d7285..bac70d146bf9 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -36,7 +36,7 @@ qtModule { "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix index f49a4eb9a85d..bcd52cdc4a8f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix @@ -2,5 +2,6 @@ qtModule { pname = "qttranslations"; - qtInputs = [ qttools ]; + nativeBuildInputs = [ qttools ]; + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 9abd9fabc957..bddbf254c5f7 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -17,7 +17,7 @@ mkDerivation (args // { patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index d90834e0b3e2..0a4fbe713ec0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -48,6 +48,7 @@ let ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch + ./patches/0008-qtbase-allow-translations-outside-prefix.patch ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -171,6 +172,14 @@ let # TODO(@Artturin): convert to makeScopeWithSplicing' # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 - self = lib.makeScope newScope addPackages; -in -self + baseScope = lib.makeScope newScope addPackages; + + bootstrapScope = baseScope.overrideScope'(final: prev: { + qtbase = prev.qtbase.override { qttranslations = null; }; + qtdeclarative = null; + }); + + finalScope = baseScope.overrideScope'(final: prev: { + qttranslations = bootstrapScope.qttranslations; + }); +in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index 4a4ebb320757..c0a20503e64c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -93,6 +93,7 @@ , libGL , debug ? false , developerBuild ? false +, qttranslations ? null }: let @@ -233,7 +234,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" - ]; + ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix index 4795cd9e1bfe..61c642de1085 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix @@ -4,5 +4,6 @@ qtModule { pname = "qttranslations"; - qtInputs = [ qttools ]; + nativeBuildInputs = [ qttools ]; + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 0c243d4ba7a9..5d9aa71e8537 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -14,8 +14,6 @@ , python3 , which , nodejs -, qtbase -, perl , xorg , libXcursor , libXScrnSaver @@ -51,8 +49,6 @@ , systemd , pipewire , gn -, runCommand -, writeScriptBin , ffmpeg_4 , lib , stdenv @@ -60,10 +56,8 @@ , libxml2 , libxslt , lcms2 -, re2 , libkrb5 , mesa -, xkeyboard_config , enableProprietaryCodecs ? true # darwin , llvmPackages_14 @@ -135,7 +129,11 @@ qtModule { # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. ../patches/qtwebengine-xkb-includes.patch + ../patches/qtwebengine-link-pulseaudio.patch + + # Override locales install path so they go to QtWebEngine's $out + ../patches/qtwebengine-locales-path.patch ]; postPatch = '' @@ -225,7 +223,6 @@ qtModule { libxml2 libxslt lcms2 - re2 libevent ffmpeg_4 diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch new file mode 100644 index 000000000000..e96cbdbef11d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake +index b45ec1d208..05f69c131b 100644 +--- a/cmake/QtBuild.cmake ++++ b/cmake/QtBuild.cmake +@@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) + set(rel_path ".") + elseif(rel_path MATCHES "^\.\./") + # INSTALL_SYSCONFDIR is allowed to be outside the prefix. +- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") ++ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) + message(FATAL_ERROR + "Path component '${name}' is outside computed install prefix: ${rel_path} ") + return() diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch new file mode 100644 index 000000000000..58f2d96f8097 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch @@ -0,0 +1,28 @@ +diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt +index f860e0ba7..30e1a767a 100644 +--- a/src/core/api/CMakeLists.txt ++++ b/src/core/api/CMakeLists.txt +@@ -193,7 +193,8 @@ if(QT_FEATURE_framework) + + else() + install(FILES ${localeFiles} +- DESTINATION ${INSTALL_TRANSLATIONSDIR}/qtwebengine_locales ++ # Nixpkgs: INSTALL_TRANSLATIONSDIR points to Qt base translations store path ++ DESTINATION ${INSTALL_DATADIR}/qtwebengine_locales + CONFIGURATIONS ${config} + ) + install(FILES ${resourceFiles} +diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp +index c03c9a3b2..430fdfab2 100644 +--- a/src/core/web_engine_library_info.cpp ++++ b/src/core/web_engine_library_info.cpp +@@ -203,7 +203,8 @@ QString localesPath() + candidatePaths << getResourcesPath(frameworkBundle()) % QDir::separator() + % QLatin1String("qtwebengine_locales"); + #endif +- candidatePaths << QLibraryInfo::path(QLibraryInfo::TranslationsPath) % QDir::separator() ++ // Nixpkgs: match the changes made in CMakeLists.txt ++ candidatePaths << QLibraryInfo::path(QLibraryInfo::DataPath) % QDir::separator() + % QLatin1String("qtwebengine_locales"); + candidatePaths << fallbackDir(); + } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix index 98606d24a968..ce917a274159 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); moveToDev = false; diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 0d9d1d42c0fb..64f3b81edde9 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -13,10 +13,14 @@ , qttools , wrapQtAppsHook , gitUpdater -}: +, qt5Kvantum ? null +}: +let + isQt6 = lib.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation rec { - pname = "qtstyleplugin-kvantum"; + pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; version = "1.0.10"; src = fetchFromGitHub { @@ -37,8 +41,8 @@ stdenv.mkDerivation rec { qtsvg libX11 libXext - ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] + ++ lib.optional isQt6 qtwayland; sourceRoot = "${src.name}/Kvantum"; @@ -57,6 +61,12 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + postInstall = lib.optionalString isQt6 '' + # make default Kvantum themes available for Qt 6 apps + mkdir -p "$out/share" + ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "V"; }; diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index 202035232399..adaef49976a7 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -8,23 +8,26 @@ , haskellPackages , mercurial , python3Packages +, abseil-cpp }: stdenv.mkDerivation rec { pname = "re2"; - version = "2023-03-01"; + version = "2023-08-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-T+P7qT8x5dXkLZAL8VjvqPD345sa6ALX1f5rflE0dwc="; + hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja ]; + propagatedBuildInputs = [ abseil-cpp ]; + postPatch = '' substituteInPlace re2Config.cmake.in \ --replace "\''${PACKAGE_PREFIX_DIR}/" "" @@ -65,7 +68,7 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; homepage = "https://github.com/google/re2"; - maintainers = with maintainers; [ azahi ]; + maintainers = with maintainers; [ azahi networkexception ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/rtlcss/default.nix b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix new file mode 100644 index 000000000000..a553e8d33ddf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix @@ -0,0 +1,24 @@ +{ buildNpmPackage, fetchFromGitHub, lib, ... }: + +buildNpmPackage rec { + pname = "rtlcss"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "MohammadYounes"; + repo = "rtlcss"; + rev = "v${version}"; + hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k="; + }; + + npmDepsHash = "sha256-ghVgvw55w7T9WxokYtlFSgCfGvcOxFzm2wQIFi+6uBY="; + + dontNpmBuild = true; + + meta = with lib; { + description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; + homepage = "https://rtlcss.com"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index dd68fef04e6b..678aac37e898 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.47"; + version = "1.3.48"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wFn7vJA6FCfgFCjjDdyOtBv209yeJNFlG1fKMQ84Bj0="; + sha256 = "sha256-7C1syZAhMv0N+AuE/SuXqhatKhlzDOix4ZDxLRyuWOs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index e0a6ffd9d547..db85bfdd9c0b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,6 +1,7 @@ { stdenv, backendStdenv, lib, + lndir, zlib, useCudatoolkitRunfile ? false, cudaVersion, @@ -10,14 +11,6 @@ autoPatchelfHook, autoAddOpenGLRunpathHook, fetchurl, - # The distributed version of CUDNN includes both dynamically liked .so files, - # as well as statically linked .a files. However, CUDNN is quite large - # (multiple gigabytes), so you can save some space in your nix store by - # removing the statically linked libraries if you are not using them. - # - # Setting this to true removes the statically linked .a files. - # Setting this to false keeps these statically linked .a files. - removeStatic ? false, }: { version, url, @@ -48,11 +41,16 @@ in backendStdenv.mkDerivation { pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; version = versionTriple; + strictDeps = true; + outputs = ["out" "lib" "static" "dev"]; src = fetchurl { inherit url hash; }; + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + # Check and normalize Runpath against DT_NEEDED using autoPatchelf. # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") nativeBuildInputs = [ @@ -74,27 +72,49 @@ in # # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in # version 8.3.2 it seems to have been renamed to simply "lib/". + # + # doc and dev have special output handling. Other outputs need to be moved to their own + # output. + # Note that moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 installPhase = '' runHook preInstall - mkdir -p $out - cp -a include $out/include - [ -d "lib/" ] && cp -a lib $out/lib - [ -d "lib64/" ] && cp -a lib64 $out/lib64 - '' - + strings.optionalString removeStatic '' - rm -f $out/lib/*.a - rm -f $out/lib64/*.a - '' - + '' + mkdir -p "$out" + mv * "$out" + moveToOutput "lib64" "$lib" + moveToOutput "lib" "$lib" + moveToOutput "**/*.a" "$static" + runHook postInstall ''; # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' - patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + patchelf $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + patchelf $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + ''; + + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = ["postPatchelf"]; + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it + # if it was empty. + # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases + # which are empty strings are skipped/unset and result in errors of the form "command not + # found: <customPhaseName>". + postPatchelf = '' + mkdir -p "$out" + ${lib.meta.getExe lndir} "$lib" "$out" + ${lib.meta.getExe lndir} "$static" "$out" + ${lib.meta.getExe lndir} "$dev" "$out" ''; passthru = { @@ -111,6 +131,19 @@ in majorVersion = versions.major versionTriple; }; + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + meta = with lib; { # Check that the cudatoolkit version satisfies our min/max constraints (both # inclusive). We mark the package as broken if it fails to satisfies the @@ -127,5 +160,8 @@ in license = licenses.unfree; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; + # Force the use of the default, fat output by default (even though `dev` exists, which + # causes Nix to prefer that output over the others if outputSpecified isn't set). + outputsToInstall = ["out"]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix index 5a9d3c5066cc..2c576a190026 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, mpiCheckPhaseHook , pkg-config , fypp , gfortran @@ -64,13 +65,12 @@ stdenv.mkDerivation rec { "-DUSE_MPI=ON" ]; - checkInputs = [ openssh ]; + checkInputs = [ + openssh + mpiCheckPhaseHook + ]; doCheck = true; - preCheck = '' - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 - ''; meta = with lib; { description = "Distributed Block Compressed Sparse Row matrix library"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 04f263568ce6..b3753a63339a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -113,13 +113,17 @@ stdenv.mkDerivation { lapack blas ] ++ lists.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - libcublas # cublas_v2.h - libcusparse # cusparse.h + cuda_cudart.dev # cuda_runtime.h + cuda_cudart.lib # cudart + cuda_cudart.static # cudart_static + libcublas.dev # cublas_v2.h + libcublas.lib # cublas + libcusparse.dev # cusparse.h + libcusparse.lib # cusparse ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # <cuda_profiler_api.h> + cuda_nvprof.dev # <cuda_profiler_api.h> ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # <cuda_profiler_api.h> + cuda_profiler_api.dev # <cuda_profiler_api.h> ]) ++ lists.optionals rocmSupport [ hip hipblas diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix index 029f418edce3..59f495d67109 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix @@ -36,8 +36,8 @@ ]; } { - version = "2.7.1"; - hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA="; + version = "2.7.2"; + hash = "sha256-cpvBpw5RinQi/no6VFN6R0EDWne+M0n2bqxcNiV21WA="; supportedGpuTargets = [ "700" "701" diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index 2eb391dda46b..c5c7b7e6427d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -8,20 +8,22 @@ , cuda_nvcc , cudaFlags , cudaVersion +# passthru.updateScript +, gitUpdater }: let # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" gencode = lib.concatStringsSep " " cudaFlags.gencode; in backendStdenv.mkDerivation (finalAttrs: { - name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}"; - version = "2.16.5-1"; + pname = "nccl"; + version = "2.18.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; - repo = "nccl"; + repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; + hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; }; outputs = [ "out" "dev" ]; @@ -63,6 +65,12 @@ backendStdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; + # Run the update script with: `nix-shell maintainers/scripts/update.nix --argstr package cudaPackages.nccl` + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 92588307ca57..55438c63a5e0 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ abseil-cpp protobuf - python.pkgs.protobuf + (python.pkgs.protobuf.override { protobuf = protobuf; }) python.pkgs.numpy ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix index fbd9db6a419f..bb5d212061f2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true , mpi, openssh, zlib @@ -47,10 +47,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; makeFlags = [ "V=0" ]; - preCheck = '' - export OMPI_MCA_rmaps_base_oversubscribe=1 - export HYDRA_IFACE=lo - ''; + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + openssh + ]; # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix index a55c5fe573bf..1218c695590e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ++ lib.optional withMetis "--with-metis" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck; + inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; meta = { branch = "prev3-develop"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 0d553376288f..e2a5e76c5586 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh -, mpi, blas, lapack +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +, openssh, mpiCheckPhaseHook, mpi, blas, lapack } : assert blas.isILP64 == lapack.isILP64; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; @@ -61,17 +61,6 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlagsArray = [ "ARGS=--timeout 10000" ]; - preCheck = '' - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - - # Run single threaded - export OMP_NUM_THREADS=1 - ''; - meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 1dc1a0214627..0e73ed979eba 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-+BCXkOaWYZSFWGZmeZ2ZJwVxFwmHgRbb7GSj/lRxmfw="; + sha256 = "sha256-h15IyPYvIUPDOJ03KgEDyRhXe0Oi8XCR5LnzSpPc4PI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix index a45d0a419e62..004dd388385f 100644 --- a/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -23,16 +23,17 @@ stdenv.mkDerivation rec { url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; }) + # Fix -Wsign-compare warning on clang. + (fetchpatch { + url = "https://github.com/google/snappy/commit/27f34a580be4a3becf5f8c0cba13433f53c21337.patch"; + sha256 = "sha256-eq6ueeMAkd2bYmPJcKAZZzd5QlXyeWOrsxFIwR8KOpQ="; + }) ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - # See https://github.com/NixOS/nixpkgs/pull/219778#issuecomment-1464884412 - # and https://github.com/NixOS/nixpkgs/pull/221215#issuecomment-1482564003. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-sign-compare"; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" "-DSNAPPY_BUILD_TESTS=OFF" diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index dc85ac20bf6a..44ad21d6a141 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.250.0"; + version = "1.3.261.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-5mVcbOAuzux/Yuo0NMwZRTsdQr46UxjrtMhT5mPHyCQ="; + hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 623a8dad04a9..05576b0dab14 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-n9KPtTj/mHXrnFJnbWPO3H+Vol3Z2mg7XLl55ynyLwY="; + hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix index c166d36d5a60..13f55a2dc52b 100644 --- a/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-CsImBz46LbhkjaevdEy5X1B2alL+6wAdVYsrMht0p2U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 575d8f4c4e0c..b3802c3a4514 100644 --- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.10"; + version = "1.8.16"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "93c42f6d7c1209937431469f80427d48907f1b8d"; - hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4="; + rev = "cde095db6c75827fe4bd237039574aad373ad96b"; + hash = "sha256-m/RN6g0GxPiSvDZbiOaJFcT2j0K7sIaVGaxKWMVn6v8="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 163e35971a77..21c63f71221e 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -17,6 +17,7 @@ , gtest , doxygen , fixDarwinDylibNames +, useAVX2 ? stdenv.hostPlatform.avx2Support }: stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # unaccelerated routines. cmakeFlags = [ "-DTILEDB_WERROR=0" - ]; + ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ clang-tools diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 9d7cb73cc539..f637df891354 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { shadow ]; - # cmocka is checked / used(?) in the configure script + buildInputs = [ + openssl json_c curl libgcrypt uthash libuuid + ] + # cmocka is checked in the configure script # when unit and/or integration testing is enabled - buildInputs = [ openssl json_c curl libgcrypt uthash libuuid ] - # cmocka doesn't build with pkgsStatic, and we don't need it anyway - # when tests are not run - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - cmocka - ]; + # cmocka doesn't build with pkgsStatic, and we don't need it anyway + # when tests are not run + ++ lib.optional doInstallCheck cmocka; - nativeCheckInputs = [ + nativeInstallCheckInputs = [ cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 ]; @@ -70,27 +70,24 @@ stdenv.mkDerivation rec { --replace 'git describe --tags --always --dirty' 'echo "${version}"' ''; - configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + configureFlags = lib.optionals doInstallCheck [ "--enable-unit" "--enable-integration" ]; - doCheck = true; - preCheck = '' - # Since we rewrote the load path in the dynamic loader for the TCTI - # The various tcti implementation should be placed in their target directory - # before we could run tests - installPhase - # install already done, dont need another one - dontInstall=1 - ''; - postInstall = '' # Do not install the upstream udev rules, they rely on specific # users/groups which aren't guaranteed to exist on the system. rm -R $out/lib/udev ''; + doCheck = false; + doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + # Since we rewrote the load path in the dynamic loader for the TCTI + # The various tcti implementation should be placed in their target directory + # before we could run tests, so we make turn checkPhase into installCheckPhase + installCheckTarget = "check"; + meta = with lib; { description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; homepage = "https://github.com/tpm2-software/tpm2-tss"; diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix index 49aebdd7dca2..37c8a1fa450b 100644 --- a/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2021-02-15"; + version = "unstable-2023-06-05"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "2537be01858710e714c329153760c64fe3f8a73e"; - sha256 = "03ljxsn4w87bfrilccxhrkzqmd30hy6ihkvsinw0i3l7rpp5m4a7"; + rev = "f787c97b34894a38b15599886cacbca01271684f"; + hash = "sha256-PGPFtNaRXS6ryC+MA/w2CtPQfJa+vG5OXf/NPFMoIzQ="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix index c3e61e8d22a0..bbc4fcebdfc3 100644 --- a/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2021-04-14"; + version = "unstable-2023-08-10"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "4b3db1179747b6a6779029407984bacef851325c"; - sha256 = "1zflxazazzkrycpflzfg420kzp7kgy4dlz85cms279vk07dc1d52"; + rev = "5781664d5087ccc4b5ab58505883231212dbedbc"; + hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g="; }; hardeningDisable = [ "all" ]; diff --git a/nixpkgs/pkgs/development/libraries/uclient/default.nix b/nixpkgs/pkgs/development/libraries/uclient/default.nix index 458d726f2ca6..63a31c2bfbe9 100644 --- a/nixpkgs/pkgs/development/libraries/uclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/uclient/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uclient"; - version = "unstable-2022-02-24"; + version = "unstable-2023-04-13"; src = fetchgit { url = "https://git.openwrt.org/project/uclient.git"; - rev = "644d3c7e13c6a64bf5cb628137ee5bd4dada4b74"; - sha256 = "0vy4whs64699whp92d1zl7a8kh16yrfywqq0yp2y809l9z19sw22"; + rev = "007d945467499f43656b141171d31f5643b83a6c"; + hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix index 007ebc9c4573..76689da526d8 100644 --- a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "unstable-2022-12-08-${ssl_implementation.pname}"; + version = "unstable-2023-02-25"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "9217ab46536353c7c792951b57163063f5ec7a3b"; - sha256 = "1ldyyb3is213iljyccx98f56rb69rfpgdcb1kjxw9a176hvpipdd"; + rev = "498f6e268d4d2b0ad33b430f4ba1abe397d31496"; + hash = "sha256-qwF3pzJ/nUTaJ8NZtgLyXnSozekY3dovxK3ZWHPGORM="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix index 147248ee3461..c32c6e1e52f5 100644 --- a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4="; + sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/vkd3d/default.nix b/nixpkgs/pkgs/development/libraries/vkd3d/default.nix index 928cf2e78a23..77a275b20df5 100644 --- a/nixpkgs/pkgs/development/libraries/vkd3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.7.1"; + version = "1.8"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-4WUD6bRG/XwrOb5tl0ZyaaR0uy85eYXcb16eDeumOAQ="; + sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 7206fc1bc530..48e036ad030d 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.254"; + version = "1.3.261"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "v${version}"; - hash = "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A="; + hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; }; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh b/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh index b61be25ca2e7..7f6292ed23b7 100755 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh @@ -6,16 +6,17 @@ set -euf -o pipefail V_PACKAGES=( "vulkan-headers" "vulkan-loader" - "spirv-tools" "vulkan-validation-layers" "vulkan-tools" "vulkan-tools-lunarg" "vulkan-extension-layer" + "vulkan-utility-libraries" ) SDK_PACKAGES=( "spirv-headers" "spirv-cross" + "spirv-tools" ) nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index a4cb0ae82330..6e994eaa78c6 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.254"; + version = "1.3.261"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "v${version}"; - hash = "sha256-bxmDhKDM+OOTsSJEoGXlWPZciBcwevv0e4gHweH46JU="; + hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix new file mode 100644 index 000000000000..54e7afb3e58c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers }: + +stdenv.mkDerivation (finalAttrs: { + pname = "vulkan-utility-libraries"; + version = "1.3.261"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Utility-Libraries"; + rev = "v${finalAttrs.version}"; + hash = "sha256-szkBKNcxTHMYhhHFWr5WjD91Vf/AyZaGymvlDU9ff7s="; + }; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ vulkan-headers ]; + + meta = with lib; { + description = "A set of utility libraries for Vulkan"; + homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = []; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 726640293e34..789625f2f9f3 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -124,5 +124,5 @@ rec { ''; }; - wlroots = wlroots_0_15; + wlroots = wlroots_0_16; } diff --git a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index c88c7d42b128..845a8fcfdc49 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,32 +1,32 @@ -{ stdenv -, lib +{ dbus +, docbook-xsl-nons +, docbook_xml_dtd_43 , fetchurl +, glib +, lib +, libxslt , meson , ninja , pkg-config -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 -, dbus -, glib +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-dbus-proxy"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs="; + url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz"; + hash = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs="; }; nativeBuildInputs = [ + docbook-xsl-nons + docbook_xml_dtd_43 + libxslt meson ninja pkg-config - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 ]; buildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; - meta = with lib; { + meta = { description = "DBus proxy for Flatpak and others"; homepage = "https://github.com/flatpak/xdg-dbus-proxy"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21Plus; mainProgram = "xdg-dbus-proxy"; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index 50dbcdecc693..a389388ff65d 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -524,9 +524,7 @@ with prev; tar xf *.tar.gz ''; # Without this, source root is wrongly set to ./readline-2.6/doc - setSourceRoot = '' - sourceRoot=./readline-${lib.versions.majorMinor oa.version} - ''; + sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; }); sqlite = prev.sqlite.overrideAttrs (drv: { diff --git a/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/nixpkgs/pkgs/development/misc/brev-cli/default.nix index b51df0073977..04e3760f4b7e 100644 --- a/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.252"; + version = "0.6.259"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CwoSLAY6KNGaEKt+/ojlO/v1fRZSRsRpd67vXellLSQ="; + sha256 = "sha256-ALfWvfyQyMHSkj+6zE/+zpsdRFUr40XQHNOcAXhJFd8="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/nixpkgs/pkgs/development/misc/gokrazy/default.nix b/nixpkgs/pkgs/development/misc/gokrazy/default.nix new file mode 100644 index 000000000000..dfc29a0af08e --- /dev/null +++ b/nixpkgs/pkgs/development/misc/gokrazy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gokrazy"; + version = "unstable-2023-08-12"; + + src = fetchFromGitHub { + owner = "gokrazy"; + repo = "tools"; + rev = "23cde3b0d858497a63c21e93ad30859bf197995f"; + hash = "sha256-oqtkC04TaOkcXkGAZzATCBA0XnFsx7bSGP9ODyhgAxQ="; + }; + + vendorHash = "sha256-rIIMqYMgLNCMYEH+44v79i8yGbHDmUY21X3h1E2jP9Q="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + subPackages = [ "cmd/gok" ]; + + meta = with lib; { + description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs!"; + homepage = "https://github.com/gokrazy/gokrazy"; + license = licenses.bsd3; + maintainers = with maintainers; [ shayne ]; + mainProgram = "gok"; + }; +} diff --git a/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix index 01caa76f67b7..53c1dc13cdc9 100644 --- a/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-2pYnjjskmIxQXLXwQpSz/HxoCqvK0TuRDBoh/KrVTpM="; + sha256 = "sha256-rZyTdVn0mnNLrGPehah62/AvTgUpNEtzn+Di1O3G3Sg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/node-packages/aliases.nix b/nixpkgs/pkgs/development/node-packages/aliases.nix index e3ff0d15396a..03bcbc595d1d 100644 --- a/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -47,6 +47,7 @@ mapAliases { "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 antennas = pkgs.antennas; # added 2023-07-30 + inherit (pkgs) asar; # added 2023-08-26 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 @@ -65,8 +66,10 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 + inherit (pkgs) html-minifier; # added 2023-08-19 inherit (pkgs) htmlhint; # added 2023-08-19 hueadm = pkgs.hueadm; # added 2023-07-31 inherit (pkgs) hyperpotamus; # added 2023-08-19 @@ -80,8 +83,10 @@ mapAliases { inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) npm-check-updates; # added 2023-08-22 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 + inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index c715380e4f2a..af55cfddee18 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -26,7 +26,6 @@ , {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" , "alloy" -, "asar" , "audiosprite" , "autoprefixer" , "auto-changelog" @@ -134,7 +133,6 @@ , "git-standup" , "@gitbeaker/cli" , "gitmoji-cli" -, "glob" , "gramma" , "grammarly-languageserver" , "graphql" @@ -147,7 +145,6 @@ , "gulp" , "gulp-cli" , "he" -, "html-minifier" , "http-server" , "hsd" , "hs-airdrop" @@ -204,7 +201,6 @@ , "nodemon" , "np" , "npm" -, "npm-check-updates" , "npm-merge-driver" , "nrm" , "ocaml-language-server" @@ -245,7 +241,6 @@ , "rimraf" , "rollup" , {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"} -, "rtlcss" , "sass" , "semver" , "serve" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index 845812fdad5e..35bbb65656a1 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -75588,42 +75588,6 @@ in bypassCache = true; reconstructLock = true; }; - asar = nodeEnv.buildNodePackage { - name = "asar"; - packageName = "asar"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz"; - sha512 = "COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg=="; - }; - dependencies = [ - sources."@types/glob-7.2.0" - sources."@types/minimatch-5.1.2" - sources."@types/node-20.5.3" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."chromium-pickle-js-0.2.0" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Creating Electron app packages"; - homepage = "https://github.com/electron/asar"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; audiosprite = nodeEnv.buildNodePackage { name = "audiosprite"; packageName = "audiosprite"; @@ -88724,71 +88688,6 @@ in bypassCache = true; reconstructLock = true; }; - glob = nodeEnv.buildNodePackage { - name = "glob"; - packageName = "glob"; - version = "10.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."lru-cache-10.0.1" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - sources."path-key-3.1.1" - sources."path-scurry-1.10.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "the most correct and second fastest glob implementation in JavaScript"; - homepage = "https://github.com/isaacs/node-glob#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; @@ -90971,37 +90870,6 @@ in bypassCache = true; reconstructLock = true; }; - html-minifier = nodeEnv.buildNodePackage { - name = "html-minifier"; - packageName = "html-minifier"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz"; - sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; - }; - dependencies = [ - sources."camel-case-3.0.0" - sources."clean-css-4.2.4" - sources."commander-2.20.3" - sources."he-1.2.0" - sources."lower-case-1.1.4" - sources."no-case-2.3.2" - sources."param-case-2.1.1" - sources."relateurl-0.2.7" - sources."source-map-0.6.1" - sources."uglify-js-3.17.4" - sources."upper-case-1.1.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = "https://kangax.github.io/html-minifier/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; @@ -101470,438 +101338,6 @@ in bypassCache = true; reconstructLock = true; }; - npm-check-updates = nodeEnv.buildNodePackage { - name = "npm-check-updates"; - packageName = "npm-check-updates"; - version = "16.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.13.0.tgz"; - sha512 = "zTJCqov2+KpCLM7lOOxXLFiqKg8RLt10dempIbE9EfKCzoN1yqSrDcBCpU6uOmlSRy3IIGm1rK+piCrn+uulJw=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" - (sources."@npmcli/git-4.1.0" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@npmcli/installed-package-contents-2.0.2" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/promise-spawn-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - (sources."@npmcli/run-script-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - sources."@tufjs/models-1.0.4" - sources."@types/http-cache-semantics-4.0.1" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" - sources."argparse-2.0.1" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-from-1.1.2" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chownr-2.0.0" - sources."ci-info-3.8.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-3.0.0" - sources."cli-table3-0.6.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."commander-10.0.1" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."configstore-6.0.0" - sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.1" - sources."delegates-1.0.0" - sources."dir-glob-3.0.1" - sources."dot-prop-6.0.1" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."escape-goat-4.0.0" - sources."exponential-backoff-3.1.1" - sources."fast-glob-3.3.1" - sources."fast-memoize-2.5.2" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."foreground-child-3.1.1" - sources."form-data-encoder-2.1.4" - sources."fp-and-or-0.1.3" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."get-stdin-8.0.0" - sources."get-stream-6.0.1" - sources."glob-10.3.3" - sources."glob-parent-5.1.2" - (sources."global-dirs-3.0.1" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) - sources."globby-11.1.0" - sources."got-12.6.1" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-unicode-2.0.1" - sources."has-yarn-3.0.0" - sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."ignore-5.2.4" - sources."ignore-walk-6.0.3" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-4.1.1" - sources."ip-2.0.0" - sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-lambda-1.0.1" - sources."is-npm-6.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."jju-1.4.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.2.3" - sources."jsonlines-0.1.1" - sources."jsonparse-1.3.1" - sources."keyv-4.5.3" - sources."kleur-4.1.5" - sources."latest-version-7.0.0" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lowercase-keys-3.0.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-response-4.0.0" - sources."minimatch-9.0.3" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - sources."rimraf-3.0.2" - ]; - }) - sources."nopt-6.0.0" - (sources."normalize-package-data-5.0.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."normalize-url-8.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - (sources."npm-package-arg-10.1.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npmlog-6.0.2" - sources."once-1.4.0" - sources."p-cancelable-3.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" - sources."package-json-8.1.1" - sources."pacote-15.2.0" - sources."parse-github-url-1.0.2" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."proc-log-3.0.0" - sources."progress-2.0.3" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."prompts-ncu-3.0.0" - sources."proto-list-1.2.4" - sources."pupa-3.1.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."rc-config-loader-4.1.3" - sources."read-package-json-6.0.4" - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."remote-git-tags-3.0.0" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-5.0.1" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."semver-diff-4.0.0" - sources."semver-utils-1.1.4" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."sigstore-1.9.0" - sources."sisteransi-1.0.5" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spawn-please-2.0.2" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-5.0.1" - (sources."tar-6.1.15" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."to-regex-range-5.0.1" - sources."tuf-js-1.1.7" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."unique-string-3.0.0" - sources."untildify-4.0.0" - sources."update-notifier-6.0.2" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."which-2.0.2" - sources."wide-align-1.1.5" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) - sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Find newer versions of dependencies than what your package.json allows"; - homepage = "https://github.com/raineorshine/npm-check-updates"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-merge-driver = nodeEnv.buildNodePackage { name = "npm-merge-driver"; packageName = "npm-merge-driver"; @@ -109754,32 +109190,6 @@ in bypassCache = true; reconstructLock = true; }; - rtlcss = nodeEnv.buildNodePackage { - name = "rtlcss"; - packageName = "rtlcss"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.0.tgz"; - sha512 = "W+N4hh0nVqVrrn3mRkHakxpB+c9cQ4CRT67O39kgA+1DjyhrdsqyCqIuHXyvWaXn4/835n+oX3fYJCi4+G/06A=="; - }; - dependencies = [ - sources."escalade-3.1.1" - sources."nanoid-3.3.6" - sources."picocolors-1.0.0" - sources."postcss-8.4.28" - sources."source-map-js-1.0.2" - sources."strip-json-comments-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Framework for transforming cascading style sheets (CSS) from left-to-right (LTR) to right-to-left (RTL)"; - homepage = "https://rtlcss.com/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix index 7184ef49bc1e..c2109b49af1b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix @@ -9,7 +9,6 @@ , logs , lwt , macaddr -, mirage-profile , mirage-time , alcotest , mirage-clock-unix @@ -23,15 +22,14 @@ buildDunePackage rec { pname = "arp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-g/aEhpufQcyS/vCtKk0Z1sYaYNRmQFaZ9rTp9F4nq54="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; nativeBuildInputs = [ bisect_ppx @@ -45,7 +43,6 @@ buildDunePackage rec { logs lwt macaddr - mirage-profile mirage-time ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix index 8f84a973bf0f..fd409b51091d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix @@ -29,6 +29,8 @@ buildDunePackage rec { sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm"; }; + patches = [ ./janestreet-0.16.patch ]; + propagatedBuildInputs = [ base64 bos diff --git a/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch new file mode 100644 index 000000000000..bf3b41eb4ac8 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch @@ -0,0 +1,205 @@ +diff --git a/lib/engine/scheduler.ml b/lib/engine/scheduler.ml +index e32bd0f..93b566b 100644 +--- a/lib/engine/scheduler.ml ++++ b/lib/engine/scheduler.ml +@@ -601,7 +601,7 @@ module Make(Backend : Backend) = struct + ) + ) + | Trywith tw -> ( +- match Table.find sched.traces (Workflow.id tw.w) with ++ match Hashtbl.find sched.traces (Workflow.id tw.w) with + | Some eventual_trace -> ( + eventual_trace >>= function + | Ok (Run r) -> +@@ -667,10 +667,10 @@ module Make(Backend : Backend) = struct + let register_build sched ~id ~build_trace = + let open Eval_thread.Infix in + ( +- match Table.find sched.traces id with ++ match Hashtbl.find sched.traces id with + | None -> + let trace = build_trace () in +- Table.set sched.traces ~key:id ~data:trace ; ++ Hashtbl.set sched.traces ~key:id ~data:trace ; + trace + | Some trace -> trace + ) >>= fun trace -> +@@ -854,7 +854,7 @@ module Make(Backend : Backend) = struct + Eval_thread.join l.elts ~f:(build ?target sched) + | Trywith tw -> ( + build sched ?target tw.w >> fun w_result -> +- match Table.find sched.traces (Workflow.id tw.w) with ++ match Hashtbl.find sched.traces (Workflow.id tw.w) with + | Some eventual_trace -> ( + eventual_trace >> function + | Ok (Run r) when run_trywith_recovery r.details -> +diff --git a/lib/multinode/bistro_multinode.ml b/lib/multinode/bistro_multinode.ml +index 01dc5ac..3fc6b0e 100644 +--- a/lib/multinode/bistro_multinode.ml ++++ b/lib/multinode/bistro_multinode.ml +@@ -130,7 +130,7 @@ module Server = struct + let search (type s) (table : s String.Table.t) ~f = + let module M = struct exception Found of string * s end in + try +- String.Table.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; ++ Hashtbl.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; + None + with M.Found (k, v) -> Some (k, v) + +@@ -145,7 +145,7 @@ module Server = struct + match allocation_attempt with + | None -> Some elt + | Some (worker_id, (Resource curr)) -> +- String.Table.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; ++ Hashtbl.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; + Lwt.wakeup u (worker_id, Resource { np ; mem }) ; + None + ) +@@ -163,12 +163,12 @@ module Server = struct + t + + let add_worker pool (Worker { id ; np ; mem ; _ }) = +- match String.Table.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with ++ match Hashtbl.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with + | `Ok -> allocation_pass pool + | `Duplicate -> failwith "A worker has been added twice" + + let release pool worker_id (Allocator.Resource { np ; mem }) = +- String.Table.update pool.available worker_id ~f:(function ++ Hashtbl.update pool.available worker_id ~f:(function + | None -> failwith "Tried to release resources of inexistent worker" + | Some (Resource r) -> Resource { np = r.np + np ; mem = r.mem + mem } + ) +@@ -235,13 +235,13 @@ module Server = struct + | Subscript { np ; mem } -> + let id = new_id () in + let w = create_worker ~np ~mem id in +- String.Table.set state.workers ~key:id ~data:w ; ++ Hashtbl.set state.workers ~key:id ~data:w ; + Worker_allocator.add_worker state.alloc w ; + log (Logger.Debug (sprintf "new worker %s" id)) ; + Lwt.return (Client_id id) + + | Get_job { client_id } -> ( +- match String.Table.find state.workers client_id with ++ match Hashtbl.find state.workers client_id with + | None -> Lwt.return None + | Some (Worker worker) -> + Lwt.choose [ +@@ -250,22 +250,22 @@ module Server = struct + ] >>= function + | `Job wp -> + let workflow_id = workflow_id_of_job_waiter wp in +- String.Table.set worker.running_jobs ~key:workflow_id ~data:wp ; ++ Hashtbl.set worker.running_jobs ~key:workflow_id ~data:wp ; + Lwt.return (Some (job_of_job_waiter wp)) + | `Stop -> Lwt.return None + ) + + | Plugin_result r -> +- let Worker worker = String.Table.find_exn state.workers r.client_id in ++ let Worker worker = Hashtbl.find_exn state.workers r.client_id in + Lwt.return ( +- match String.Table.find_exn worker.running_jobs r.workflow_id with ++ match Hashtbl.find_exn worker.running_jobs r.workflow_id with + | Waiting_plugin wp -> Lwt.wakeup wp.waiter r.result + | Waiting_shell_command _ -> assert false (* should never happen *) + ) + | Shell_command_result r -> +- let Worker worker = String.Table.find_exn state.workers r.client_id in ++ let Worker worker = Hashtbl.find_exn state.workers r.client_id in + Lwt.return ( +- match String.Table.find_exn worker.running_jobs r.workflow_id with ++ match Hashtbl.find_exn worker.running_jobs r.workflow_id with + | Waiting_plugin _ -> assert false (* should never happen *) + | Waiting_shell_command wp -> Lwt.wakeup wp.waiter r.result + ) +@@ -307,7 +307,7 @@ module Server = struct + + let request_resource backend req = + Worker_allocator.request backend.state.alloc req >|= fun (worker_id, resource) -> +- String.Table.find_exn backend.state.workers worker_id, resource ++ Hashtbl.find_exn backend.state.workers worker_id, resource + + let release_resource backend worker_id res = + Worker_allocator.release backend.state.alloc worker_id res +@@ -334,7 +334,7 @@ module Server = struct + * loop () *) + + let eval backend { worker_id ; workflow_id } f x = +- let Worker worker = String.Table.find_exn backend.state.workers worker_id in ++ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in + let f () = f x in + let t, u = Lwt.wait () in + let job_waiter = Waiting_plugin { waiter = u ; f ; workflow_id } in +@@ -342,7 +342,7 @@ module Server = struct + t + + let run_shell_command backend { worker_id ; workflow_id } cmd = +- let Worker worker = String.Table.find_exn backend.state.workers worker_id in ++ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in + let t, u = Lwt.wait () in + let job = Waiting_shell_command { waiter = u ; cmd ; workflow_id } in + Lwt_queue.push worker.pending_jobs job ; +diff --git a/lib/utils/dot_output.ml b/lib/utils/dot_output.ml +index 90c299f..d13fceb 100644 +--- a/lib/utils/dot_output.ml ++++ b/lib/utils/dot_output.ml +@@ -24,7 +24,7 @@ module G = struct + (* let successors g u = fold_succ (fun h t -> h :: t) g u [] *) + + let rec of_workflow_aux seen acc u = +- if S.mem seen u then (seen, acc) ++ if Set.mem seen u then (seen, acc) + else ( + let deps = W.Any.deps u in + let seen, acc = +@@ -34,7 +34,7 @@ module G = struct + in + let acc = add_vertex acc u in + let acc = List.fold deps ~init:acc ~f:(fun acc v -> add_edge acc u v) in +- let seen = S.add seen u in ++ let seen = Set.add seen u in + seen, acc + ) + +@@ -109,7 +109,7 @@ let dot_output ?db oc g ~needed = + ] + in + let vertex_attributes u = +- let needed = (match db with None -> true | Some _ -> false) || S.mem needed u in ++ let needed = (match db with None -> true | Some _ -> false) || Set.mem needed u in + let color = if needed then black else light_gray in + let shape = `Shape (shape u) in + let W.Any w = u in +@@ -141,7 +141,7 @@ let dot_output ?db oc g ~needed = + | _ -> [] + in + let color = +- if (match db with None -> true | Some _ -> false) || (S.mem needed u && not (already_done u)) ++ if (match db with None -> true | Some _ -> false) || (Set.mem needed u && not (already_done u)) + then black else light_gray in + style @ [ `Color color ] + in +diff --git a/lib/utils/repo.ml b/lib/utils/repo.ml +index 06abcd5..206a99e 100644 +--- a/lib/utils/repo.ml ++++ b/lib/utils/repo.ml +@@ -160,7 +160,7 @@ let protected_set repo = + | Select s -> fold_path_workflow acc (W.Any s.dir) + | Input _ -> acc + | Shell _ +- | Plugin _ -> String.Set.add acc (W.id w) ++ | Plugin _ -> Set.add acc (W.id w) + | Trywith tw -> + fold_path_workflow (fold_path_workflow acc (W.Any tw.w)) (W.Any tw.failsafe) + | Ifelse ie -> +@@ -187,7 +187,7 @@ let cache_clip_fold ~bistro_dir repo ~f ~init = + let protected = protected_set repo in + let db = Db.init_exn bistro_dir in + Db.fold_cache db ~init ~f:(fun acc id -> +- f db acc (if String.Set.mem protected id then `Protected id else `Unprotected id) ++ f db acc (if Set.mem protected id then `Protected id else `Unprotected id) + ) + + let cache_clip_dry_run ~bistro_dir repo = diff --git a/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix index bff1de9bc865..8f3d4fd54175 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "bwd"; - version = "2.1.0"; + version = "2.2.0"; minimalOCamlVersion = "4.12"; duneVersion = "3"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "RedPRL"; repo = "ocaml-bwd"; rev = version; - hash = "sha256-ucXOBjD1behL2h8CZv64xtRjCPkajZic7G1oxxDmEXY="; + hash = "sha256-4DttkEPI9yJtMsqzTNSnoDajcvMQPIiJAHk0kJl540Y="; }; doCheck = true; @@ -19,7 +19,8 @@ buildDunePackage rec { meta = { description = "Backward Lists"; - inherit (src.meta) homepage; + homepage = "https://github.com/RedPRL/ocaml-bwd"; + changelog = "https://github.com/RedPRL/ocaml-bwd/blob/${version}/CHANGELOG.markdown"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix index 22e78c1aeeb2..af721b63a8f9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; - patches = [ ./git_commit.patch ]; + patches = [ ./git_commit.patch ./janestreet-0.16.patch ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch new file mode 100644 index 000000000000..afc665f30426 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch @@ -0,0 +1,36 @@ +diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml +index 25c0e5a..94da2e3 100644 +--- a/lib/CFStream_stream.ml ++++ b/lib/CFStream_stream.ml +@@ -287,7 +287,7 @@ let group_aux xs map eq = + ;; + + let group xs ~f = group_aux xs f Poly.( = ) +-let group_by xs ~eq = group_aux xs ident eq ++let group_by xs ~eq = group_aux xs Fn.id eq + + let chunk2 xs = + from (fun _ -> +@@ -615,11 +615,11 @@ let to_hashtbl xs = + let of_map t = of_list (Map.to_alist t) + + let to_map xs = +- fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.Poly.set accu ~key ~data) ++ fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.set accu ~key ~data) + ;; + + let of_set t = of_list (Set.to_list t) +-let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.Poly.add accu e) ++let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.add accu e) + + module Infix = struct + let ( -- ) x y = range x ~until:y +@@ -660,7 +660,7 @@ module Result = struct + | M.E e -> Result.Error e + ;; + +- let all xs ~f = all_gen ident xs ~f ++ let all xs ~f = all_gen Fn.id xs ~f + let all' xs ~f = all_gen (fun x -> Ok x) xs ~f + let to_exn = result_to_exn + diff --git a/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix b/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix new file mode 100644 index 000000000000..5846d068ae54 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitLab, buildDunePackage }: + +buildDunePackage rec { + pname = "domain_shims"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "gasche"; + repo = "domain-shims"; + rev = version; + hash = "sha256-/5Cw+M0A1rnT7gFqzryd4Z0tylN0kZgSBXtn9jr8u1c="; + }; + + minimalOCamlVersion = "4.12"; + + meta = { + homepage = "https://gitlab.com/gasche/domain-shims/"; + description = "A non-parallel implementation of Domains compatible with OCaml 4"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix index 8a36285fe697..096ba5434996 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix @@ -1,26 +1,28 @@ { lib , fetchurl , buildDunePackage -, lockfree +, saturn +, domain-local-await +, kcas , mirage-clock-unix +, qcheck-stm }: buildDunePackage rec { pname = "domainslib"; - version = "0.5.0"; + version = "0.5.1"; - duneVersion = "3"; minimalOCamlVersion = "5.0"; src = fetchurl { - url = "https://github.com/ocaml-multicore/domainslib/releases/download/v${version}/domainslib-${version}.tbz"; - hash = "sha256-rty+9DUhTUEcN7BPl8G6Q/G/MJ6z/UAn0RPkG8hACwA="; + url = "https://github.com/ocaml-multicore/domainslib/releases/download/${version}/domainslib-${version}.tbz"; + hash = "sha256-KMJd+6XZmUSXNsXW/KXgvnFtgY9vODeW3vhL77mDXQE="; }; - propagatedBuildInputs = [ lockfree ]; + propagatedBuildInputs = [ domain-local-await saturn ]; doCheck = true; - checkInputs = [ mirage-clock-unix ]; + checkInputs = [ kcas mirage-clock-unix qcheck-stm ]; meta = { homepage = "https://github.com/ocaml-multicore/domainslib"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix b/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix index 209bf30d2a61..9803a20368c3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,30 +1,38 @@ { lib, fetchFromGitHub, ocaml, buildDunePackage , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson +, ppx_optcomp , gitUpdater }: -if lib.versionAtLeast ocaml.version "4.13" -then throw "earlybird is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "earlybird"; - version = "1.1.0"; - - duneVersion = "3"; + version = "1.2.1"; - minimalOCamlVersion = "4.11"; + minimalOCamlVersion = "4.12"; src = fetchFromGitHub { owner = "hackwaly"; repo = "ocamlearlybird"; rev = version; - hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU="; + hash = "sha256-p29uTdx8+mZKXUL+ng/FzpKuhnykEe8Sy968Wa/KUn4="; }; nativeBuildInputs = [ menhir ]; - buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ]; + buildInputs = [ + cmdliner + dap + fmt + iter + logs + lru + lwt_ppx + lwt_react + menhirLib + path_glob + ppx_deriving_yojson + ppx_optcomp + ]; passthru.updateScript = gitUpdater { }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix index d474d365a113..1f9e18e887e0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix @@ -18,14 +18,14 @@ buildDunePackage rec { pname = "eio"; - version = "0.11"; + version = "0.12"; minimalOCamlVersion = "5.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "DDN0IHRWJjFneIb0/koC+Wcs7JQpf/hcLthU21uqcao="; + sha256 = "2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 4467ce3de8cd..0e0adcb0be87 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -8,11 +8,15 @@ , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.17.0" else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: +let p5 = camlp5; in +let camlp5 = p5.override { legacy = true; }; in + let fetched = coqPackages.metaFetch ({ + release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; @@ -31,7 +35,7 @@ buildDunePackage rec { pname = "elpi"; inherit (fetched) version src; - patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev") + patches = lib.optional (version == "1.16.5") ./atd_2_10.patch; minimalOCamlVersion = "4.04"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix index a27a91d9d8e9..c16534744d06 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix @@ -6,32 +6,23 @@ , lwt , macaddr , mirage-net -, mirage-profile -, ppx_cstruct }: buildDunePackage rec { pname = "ethernet"; - version = "3.0.0"; + version = "3.2.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - hash = "sha256:0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-TB2nAhQiHZ1Dk6n/3i49s9HKNH92yNUl3xl94hByrAk="; }; - buildInputs = [ - ppx_cstruct - ]; - propagatedBuildInputs = [ cstruct mirage-net macaddr - mirage-profile lwt logs ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix new file mode 100644 index 000000000000..2df4c08e7d58 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -0,0 +1,1245 @@ +{ self +, bash +, fetchpatch +, fzf +, lib +, openssl +, zstd +, krb5 +}: + +with self; + +{ + + abstract_algebra = janePackage { + pname = "abstract_algebra"; + hash = "sha256-hAZzc2ypbGE/8mxxk4GZqr17JlIYv71gZJMQ4plsK38="; + meta.description = "A small library describing abstract algebra concepts"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + accessor = janePackage { + pname = "accessor"; + hash = "sha256-yClfUXqwVoipF4WqbqC6VBVYc6t8MZYVoHGjchH7XQA="; + meta.description = "A library that makes it nicer to work with nested functional data structures"; + propagatedBuildInputs = [ higher_kinded ]; + }; + + accessor_async = janePackage { + pname = "accessor_async"; + hash = "sha256-kGT7aFNOgU8/2ez9L/lefb2LN7I87+WthZHnb+dY9PE="; + meta.description = "Accessors for Async types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_core async_kernel ]; + }; + + accessor_base = janePackage { + pname = "accessor_base"; + hash = "sha256-idnSNP6kfoV3I8QAMJ2YoUrewBpyte+0/C371aMTIxo="; + meta.description = "Accessors for Base types, for use with the Accessor library"; + propagatedBuildInputs = [ ppx_accessor ]; + }; + + accessor_core = janePackage { + pname = "accessor_core"; + hash = "sha256-f4s/I+xDi/aca1WgaE+P3CD4e80jenS0WHg4T1Stcbg="; + meta.description = "Accessors for Core types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_base core_kernel ]; + }; + + async = janePackage { + pname = "async"; + hash = "sha256-TpsC9sn8noiNI0aYbMalUUv3xlC2LMERsv6Gr928Vzc="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + doCheck = false; # we don't have netkit_sockets + }; + + async_durable = janePackage { + pname = "async_durable"; + hash = "sha256-PImYpM9xNFUWeWRld4jFwWBRowUP1iXzdxkK/fP/rHE="; + meta.description = "Durable connections for use with async"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel core core_kernel ppx_jane ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "sha256-Y+gTlJuKmwvEEPuMPu7v0iYeNQtlzP8QiS0PSgoYrrI="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "sha256-PG6BJx9tfP+zcDaG+7WdHiv4jUqsUH2TvHV6UXdzPAg="; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + async_inotify = janePackage { + pname = "async_inotify"; + hash = "sha256-seFbs06w3T+B49sw3nOjpXpoJbJ+IJ3qN5LnufrsE48="; + meta.description = "Async wrapper for inotify"; + propagatedBuildInputs = [ async_find inotify ]; + }; + + async_interactive = janePackage { + pname = "async_interactive"; + hash = "sha256-xZKVT8L2rOLBeg7wK0tD6twhkDfwQp5ZKy4DPp1UWq8="; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + + async_js = janePackage { + pname = "async_js"; + hash = "sha256-JyF1busOv9JWxp55oaxBozIQyCKlmAY3csBA4/98qy0="; + meta.description = "A small library that provide Async support for JavaScript platforms"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "sha256-EDgdZc6GRyiiFtnElNE9jGPEjPIUniP9uB/JoySkZz8="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "sha256-OccFMfhTRSQwx1LJcN8OkDpA62KabsyWn2hox84jqow="; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_rpc_websocket = janePackage { + pname = "async_rpc_websocket"; + hash = "sha256-S3xIw/mew9YhtenWfp8ZD82WtOQSzJHtreT1+kRivus="; + meta.description = "Library to serve and dispatch Async RPCs over websockets"; + propagatedBuildInputs = [ async_rpc_kernel async_websocket cohttp_async_websocket ]; + }; + + async_sendfile = janePackage { + pname = "async_sendfile"; + hash = "sha256-ykl87/De56gz6JRQfTIeWrU823PT2fnFJr08GxuDYic="; + meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files"; + propagatedBuildInputs = [ async_unix ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "sha256-DjIbadCjPymnkDsnonmxKumCWf5P9XO3ZaAwOaYRnbk="; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + async_smtp = janePackage { + pname = "async_smtp"; + hash = "sha256-X0eegZMMU9EnC9Oi+6DjtwNmyzQYr3EKi1duNzEAfkk="; + meta.description = "SMTP client and server"; + propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "sha256-dT+yJC73sxS4NPR/GC/FyVLbWtYpM9DqKykVk8PEEWU="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core_unix ]; + }; + + async_websocket = janePackage { + pname = "async_websocket"; + hash = "sha256-Qy+A8ee6u5Vr05FNeaH/6Sdp9bcq3cnaDYO9OU06VW0="; + meta.description = "A library that implements the websocket protocol on top of Async"; + propagatedBuildInputs = [ async cryptokit ]; + }; + + babel = janePackage { + pname = "babel"; + hash = "sha256-nnMliU0d6vtHTYEy9uMi8nMaHvAsEXKN6uNByqZ28+c="; + meta.description = "A library for defining Rpcs that can evolve over time without breaking backward compatibility"; + propagatedBuildInputs = [ async_rpc_kernel core ppx_jane streamable tilde_f ]; + }; + + base = janePackage { + pname = "base"; + version = "0.16.2"; + hash = "sha256-8OvZe+aiWipJ6busBufx3OqERmqxBva55UOLjL8KoPc="; + meta.description = "Full standard library replacement for OCaml"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ sexplib0 ]; + checkInputs = [ alcotest ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "sha256-gQbzdr05DEowzd0k9JBTF0gGMwlaVwTVJuoKZ0u9voU="; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ int_repr ppx_jane ]; + }; + + base_trie = janePackage { + pname = "base_trie"; + hash = "sha256-KV/k3B0h/4rE+MY6f4qDnlaObMmewUS+NAN2M7sb+yw="; + meta.description = "Trie data structure library"; + propagatedBuildInputs = [ base core expect_test_helpers_core ppx_jane ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "sha256-9Flg8vAoT6f+3lw9wETQhsaA1fSsQiqKeEhzo0qtDu4="; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ]; + }; + + bidirectional_map = janePackage { + pname = "bidirectional_map"; + hash = "sha256-YEzOdzanBJaskI2/xN9E3ozWnBXDyxJvY3g/qEE73yI="; + meta.description = "A library for bidirectional maps and multimaps"; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "sha256-PmvqGImF1Nrr6swx5q3+9mCfSbieC3RvWuz8oCTkSgg="; + propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "sha256-qFkM6TrTLnnFKmzQHktBb68HpBTMYhiURvnRKEoAevk="; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_stable_witness ppx_variants_conv ]; + }; + + bonsai = janePackage { + pname = "bonsai"; + hash = "sha256-YJ+qkVG5PLBmioa1gP7y6jwn82smyyYDIwHwhDqNeWM="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ ppx_pattern_bind ]; + nativeBuildInputs = [ ppx_css js_of_ocaml-compiler ocaml-embed-file ]; + propagatedBuildInputs = [ + async + async_durable + async_extra + async_rpc_websocket + babel + cohttp-async + core_bench + fuzzy_match + incr_dom + indentation_buffer + js_of_ocaml-ppx + ordinal_abbreviation + patdiff + polling_state_rpc + ppx_css + ppx_typed_fields + profunctor + sexp_grammar + textutils + ]; + }; + + cinaps = janePackage { + pname = "cinaps"; + version = "0.15.1"; + hash = "sha256-LycruanldSP251uYJjQqIfI76W0UQ6o5i5u8XjszBT0="; + meta.description = "Trivial metaprogramming tool"; + minimalOCamlVersion = "4.04"; + propagatedBuildInputs = [ re ]; + doCheck = false; # fails because ppx_base doesn't include ppx_js_style + }; + + cohttp_async_websocket = janePackage { + pname = "cohttp_async_websocket"; + hash = "sha256-OBtyKMyvfz0KNG4SWmvoTMVPnVTpO12N38q+kEbegJE="; + meta.description = "Websocket library for use with cohttp and async"; + propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + }; + + cohttp_static_handler = janePackage { + pname = "cohttp_static_handler"; + hash = "sha256-7NCnJVArudBEvWARQUGlJuEq3kSCjpn5YtsLsL04bf4="; + meta.description = "A library for easily creating a cohttp handler for static files"; + propagatedBuildInputs = [ cohttp-async ]; + }; + + content_security_policy = janePackage { + pname = "content_security_policy"; + hash = "sha256-q/J+ZzeC6txyuRQzR8Hmu7cYJCQbxaMlVEmK8fj0hus="; + meta.description = "A library for building content-security policies"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + core = janePackage { + pname = "core"; + version = "0.16.1"; + hash = "sha256-cKJi67VLIsbLEgIZyFiVz00z/QEvJhNBb8+M+bR4iHU="; + meta.description = "Industrial strength alternative to OCaml's standard library"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; + doCheck = false; # circular dependency with core_kernel + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "sha256-ASdu3ZUk+nkdNX9UbBQxKRdXBa073mWMDRW+Ceu3/t4="; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "sha256-hcjmFDdVKCHK8u6D4Qn2a/HYTEZOvkXHcB6BTpbjF/s="; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core_unix record_builder ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + hash = "sha256-YB3WMNLePrOKu+mmVedNo0pWN9x5fIaBxJsby56TFJU="; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring core int_repr sexplib ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + core_unix = janePackage { + pname = "core_unix"; + hash = "sha256-mePpxjbUumMemHDKhRgACilchgS6QHZEV1ghYtT3flg="; + meta.description = "Unix-specific portions of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; + postPatch = '' + patchShebangs unix_pseudo_terminal/src/discover.sh + ''; + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "sha256-FEkjRmLeqNvauBlrY2xtLZfxVfnFWU8w8noEArPUieo="; + propagatedBuildInputs = [ core num ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + dedent = janePackage { + pname = "dedent"; + hash = "sha256-fzytLr3tVr2vPmykUBzNFMxnyMcIeeo8S9BydsTKnQw="; + propagatedBuildInputs = [ base ppx_jane stdio ]; + meta.description = "A library for improving redability of multi-line string constants in code"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "sha256-XyO3hzPz48i1cnMTJvZfarM6HC7qdHqdftp9SnCjPEU="; + propagatedBuildInputs = [ async core_extended ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + + diffable = janePackage { + pname = "diffable"; + hash = "sha256-ascQUbxzvRR8XrroaupyFZ2YNQMvlXn4PemumYTwRF4="; + propagatedBuildInputs = [ core ppx_jane stored_reversed streamable ]; + meta.description = "An interface for diffs"; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "sha256-VS7eTTD85ci3mJIXd2pG1Y/ygT9dCIvfzU2HtOufW6U="; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + email_message = janePackage { + pname = "email_message"; + hash = "sha256-eso68owbAspjaVgj/wGFQ7VQYlAwyYV3oNitLQWiRPA="; + meta.description = "E-mail message parser"; + propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ]; + }; + + env_config = janePackage { + pname = "env_config"; + hash = "sha256-CvvpKI7F40DVC7iByrzCqW1ilPiIhdDPYaJrDoUZVSs="; + meta.description = "Helper library for retrieving configuration from an environment variable"; + propagatedBuildInputs = [ async core core_unix ppx_jane ]; + }; + + expect_test_helpers_async = janePackage { + pname = "expect_test_helpers_async"; + hash = "sha256-dEvOMb1aCEt05XtkKIC9jWoIQ/2zM0Gj+K/ZN3bFjeI="; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + expect_test_helpers_core = janePackage { + pname = "expect_test_helpers_core"; + hash = "sha256-8DsMwk9WhQQ7iMNYSFBglfbcgvE5dySt4J4qjzJ3dJk="; + meta.description = "Helpers for writing expectation tests"; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "sha256-dwkO65sBsPfTF0F2FKrnttEjhAY2OMbJetSgOfUXk3A="; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + file_path = janePackage { + pname = "file_path"; + hash = "sha256-EEpDZNgUgyeqivRhZgQWWlerl+7OOcvAbjjQ3e1NYOQ="; + meta.description = + "A library for typed manipulation of UNIX-style file paths"; + propagatedBuildInputs = [ + async + core + core_kernel + core_unix + expect_test_helpers_async + expect_test_helpers_core + ppx_jane + ]; + }; + + fuzzy_match = janePackage { + pname = "fuzzy_match"; + hash = "sha256-M3yOqP0/OZFbqZZpgDdhJ/FZU3MhKwIXbWjwuMlxe2Q="; + meta.description = "A library for fuzzy string matching"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + fzf = janePackage { + pname = "fzf"; + hash = "sha256-IQ2wze34LlOutecDOrPhj3U7MFVJTSjQW+If3QyHoes="; + meta.description = "A library for running the fzf command line tool"; + propagatedBuildInputs = [ async core_kernel ppx_jane ]; + postPatch = '' + substituteInPlace src/fzf.ml --replace /usr/bin/fzf ${fzf}/bin/fzf + ''; + }; + + hex_encode = janePackage { + pname = "hex_encode"; + hash = "sha256-jnsf5T1D1++AUdrato/NO3gTVXu14klXozHFIG9HH/o="; + meta.description = "Hexadecimal encoding library"; + propagatedBuildInputs = [ core ppx_jane ounit ]; + }; + + higher_kinded = janePackage { + pname = "higher_kinded"; + hash = "sha256-aCpYc7f4mrPsGp038YabEyw72cA6GbCKsok+5Hej5P0="; + meta.description = "A library with an encoding of higher kinded types in OCaml"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + incr_dom = janePackage { + pname = "incr_dom"; + hash = "sha256-fnD/YnaGK6MIy/fL6bDwcoGDJhHo2+1l8dCXxwN28kg="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + }; + + incr_map = janePackage { + pname = "incr_map"; + hash = "sha256-D3ZD0C4YfZOfXw+3CtqL8DKcz+b06UL8AF7Rf9x+hps="; + meta.description = "Helpers for incremental operations on map like data structures"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ abstract_algebra bignum diffable incremental streamable ]; + }; + + incr_select = janePackage { + pname = "incr_select"; + hash = "sha256-gRUF0QsDaZfHU7Mexl5nR8xCN+65v28/r/ciueR5NdE="; + meta.description = "Handling of large set of incremental outputs from a single input"; + propagatedBuildInputs = [ incremental ]; + }; + + incremental = janePackage { + pname = "incremental"; + hash = "sha256-PXGY0M2xeVWDLeS3SrqXy1dqsyeKgndGT6NpuiyNQQQ="; + meta.description = "Library for incremental computations"; + propagatedBuildInputs = [ core_kernel lru_cache ]; + }; + + indentation_buffer = janePackage { + pname = "indentation_buffer"; + hash = "sha256-5ayWs7yUnuxh5S3Dp0GbYTkGXttDMomfZak4MHePFbk="; + meta.description = "A library for building strings with indentation"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + int_repr = janePackage { + pname = "int_repr"; + hash = "sha256-lghu2U1JwZaR4dkd9PcJEW3pZSPoaFhUluIDwFAYFK0="; + meta.description = "Integers of various widths"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + janestreet_cpuid = janePackage { + pname = "janestreet_cpuid"; + hash = "sha256-lN8+8uhcVn3AoApWzqeCe/It1G6f0VgZzFcwFEckejk="; + meta.description = "A library for parsing CPU capabilities out of the `cpuid` instruction"; + propagatedBuildInputs = [ core core_kernel ppx_jane ]; + }; + + janestreet_csv = janePackage { + pname = "janestreet_csv"; + hash = "sha256-XLyHxVlgBvMIBrG2wzOudbKqy+N12Boheb3K+6o9y1o="; + propagatedBuildInputs = [ async bignum core_kernel core_unix csvfields delimited_parsing fieldslib numeric_string ppx_jane re2 textutils tyxml ocaml_pcre ]; + meta.description = "Tools for working with CSVs on the command line"; + }; + + jane_rope = janePackage { + pname = "jane_rope"; + hash = "sha256-MpjbwV+VS3qRuW8kxhjGzsITEdrPeWyr0V+LiKR6U8U="; + meta.description = "String representation with cheap concatenation"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "sha256-vS6tPg8LJolte/zI5KHFYCtNuZjn//cmd94Wls3bLCU="; + meta.description = "Jane Street C header files"; + }; + + js_of_ocaml_patches = janePackage { + pname = "js_of_ocaml_patches"; + hash = "sha256-Uj+X/0XUP5Za8NKfHGo9OZnqzKCiuurYJyluD6b0wOQ="; + meta.description = "Additions to js_of_ocaml's standard library that are required by Jane Street libraries"; + propagatedBuildInputs = [ js_of_ocaml js_of_ocaml-ppx ]; + }; + + jsonaf = janePackage { + pname = "jsonaf"; + hash = "sha256-Gn54NUg4YOyrXY5kXCZhHFz24CfUT9c55cJ2sOsNVw8="; + meta.description = "A library for parsing, manipulating, and serializing data structured as JSON"; + propagatedBuildInputs = [ base ppx_jane angstrom faraday ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "sha256-GviY+zYza7UNYOlAnfAz0aH4LH2B5xA+7iELLuZLgQQ="; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ dune-configurator ppx_assert stdio ]; + }; + + krb = janePackage { + pname = "krb"; + hash = "sha256-+XwYKwpl668fZ23YEbL1wW9PlaIIjbP/hHwNanf3dAY="; + meta.description = "A library for using Kerberos for both Rpc and Tcp communication"; + propagatedBuildInputs = [ async base core env_config hex_encode ppx_jane protocol_version_header username_kernel dune-configurator krb5 ]; + }; + + lru_cache = janePackage { + pname = "lru_cache"; + hash = "sha256-FqOBC4kBL9IuFIL4JrVU7iF1AUu+1R/CchR52eyEsa8="; + meta.description = "An LRU Cache implementation"; + propagatedBuildInputs = [ core_kernel ppx_jane ]; + }; + + man_in_the_middle_debugger = janePackage { + pname = "man_in_the_middle_debugger"; + hash = "sha256-b2A/ITf9gx3thSdEY2n7jxKrMOVDpzx4JkSMB3aTyE4="; + meta.description = "Man-in-the-middle debugging library"; + propagatedBuildInputs = [ async core ppx_jane angstrom angstrom-async ]; + }; + + n_ary = janePackage { + pname = "n_ary"; + hash = "sha256-ofstQs5R25NTP4EtBIzDE/Mzg9ZzAJKfAF838uu0zuE="; + meta.description = "A library for N-ary datatypes and operations"; + propagatedBuildInputs = [ base expect_test_helpers_core ppx_compare ppx_enumerate ppx_hash ppx_jane ppx_sexp_conv ppx_sexp_message ]; + }; + + numeric_string = janePackage { + pname = "numeric_string"; + hash = "sha256-MzRPXMR4Pi07mfJQgOV6R1Z22y2tvQTCq22+00aY1ik="; + meta.description = "A comparison function for strings that sorts numeric fragments of strings according to their numeric value"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.4"; + hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; + minimalOCamlVersion = "4.04.1"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + ocaml-embed-file = janePackage { + pname = "ocaml-embed-file"; + hash = "sha256-rs+68VATumUgZQ9QrG+By5yNc8cy7avL0BDeqwix0co="; + propagatedBuildInputs = [ async ppx_jane ]; + meta.description = "Files contents as module constants"; + }; + + ocaml_intrinsics = janePackage { + pname = "ocaml_intrinsics"; + hash = "sha256-fbFXTakzxQEeCONSXRXh8FX3HD6h49LZHVsH62Zu3PA="; + meta.description = "Intrinsics"; + buildInputs = [ dune-configurator ]; + doCheck = false; # test rules broken + }; + + of_json = janePackage { + pname = "of_json"; + hash = "sha256-qh9mX03Fk9Jb8yox7mZ/CGbWecszK15oaygKbJVDqa0="; + meta.description = "A friendly applicative interface for Jsonaf"; + buildInputs = [ core core_extended jsonaf ppx_jane ]; + }; + + ordinal_abbreviation = janePackage { + pname = "ordinal_abbreviation"; + hash = "sha256-bGlzFcM6Yw8fcuovrv11WNtAB4mVYv4BjuMlkhsHomQ="; + meta.description = "A minimal library for generating ordinal names of integers"; + buildInputs = [ base ppx_jane ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "sha256-oc2ASDtUyRBB68tjAoblryAcXF+u3XP1mkQPO5hNbKo="; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + patdiff = janePackage { + pname = "patdiff"; + hash = "sha256-iVRYKgVBBJws3ZlUwnZt52bIydMtzV7a2R5mjksQAps="; + + # Used by patdiff-git-wrapper. Providing it here also causes the shebang + # line to be automatically patched. + buildInputs = [ bash ]; + propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "sha256-JZd99bwLUNhFHng55d77yXSw9u50ahugepesXVdUl04="; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + polling_state_rpc = janePackage { + pname = "polling_state_rpc"; + hash = "sha256-l7SMFI+U2rde2OSUNOXPb9NBsvjPrBcxStNooxMgVB8="; + meta.description = "An RPC which tracks state on the client and server so it only needs to send diffs across the wire"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel core core_kernel diffable ppx_jane ]; + }; + + posixat = janePackage { + pname = "posixat"; + hash = "sha256-Nhp5jiK/TTwQXY5Bm4TTeH+xDTdXtvkSq5CS/Sr1UgA="; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + ppx_accessor = janePackage { + pname = "ppx_accessor"; + hash = "sha256-o70q8eSbPeuGkIcCnKoK0BpaqPhy/NS7x2YYR6wfki8="; + meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; + propagatedBuildInputs = [ accessor ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "sha256-LrpKE0BlFC3QseSXf5WhI71blshUzhH8yo2nXjAtiB8="; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "sha256-Ak+7+33qEGYwZWbES032SdkFOsae0+tWtR/DV+xrB10="; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_globalize ppx_hash ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "sha256-NZlzEMruf89NsI4jfQJLSPhjk/PN47hLbJzGEN8GPl8="; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "sha256-ktfa4umCnLd9oY2WWX/5R7vPB/g7DJX8x3nF9fYLNCQ="; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "sha256-boP07qHPbzf4ntLdV18oyID09ZUOfkIn9ZdQ0DvtrUA="; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "sha256-4bZdhyfnzTjH4E303O6GO2jW968ftuXwoE4/x854JOo="; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib base ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "sha256-V30ijRgcma/rwysPxNAFnuJIb7XFrfi7mfjJxN+rSak="; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + ppx_css = janePackage { + pname = "ppx_css"; + hash = "sha256-spT/dJW8YJtG4pOku9r6VVlBAMwGakTrr1euiABeqsU="; + meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; + propagatedBuildInputs = [ async async_unix core_kernel core_unix ppxlib js_of_ocaml js_of_ocaml-ppx sedlex virtual_dom ]; + }; + + ppx_demo = janePackage { + pname = "ppx_demo"; + hash = "sha256-t/jz94YpwmorhWlcuflIZe0l85cESE62L9I7NMASVWM="; + meta.description = "PPX that exposes the source code string of an expression/module structure"; + propagatedBuildInputs = [ core dedent ppx_jane ppxlib ]; + }; + + ppx_derive_at_runtime = janePackage { + pname = "ppx_derive_at_runtime"; + hash = "sha256-UESWOkyWTHJlsE6KZkty9P+iHI3oY1rLve3raRAqMbk="; + meta.description = "Define a new ppx deriver by naming a runtime module"; + propagatedBuildInputs = [ base expect_test_helpers_core ppx_jane ppxlib ]; + }; + + ppx_disable_unused_warnings = janePackage { + pname = "ppx_disable_unused_warnings"; + hash = "sha256-jVNXmAy/Ti7MZmbdBjFuDwbmIILJB57flmmB6MoyCtY="; + meta.description = "Expands [@disable_unused_warnings] into [@warning \"-20-26-32-33-34-35-36-37-38-39-60-66-67\"]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "sha256-v5JPu+qEXoZ1+mu/yTZW2sfCzU0K60/sInG/Ox1D35s="; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "sha256-H5ybRHufycdyCxKu370+QZAMUPQsHVD+6nD93tzvLn8="; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; + doCheck = false; # test build rules broken + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "sha256-kl0JZocMWo2KNciCWkT4nIbJZbh56ijZmlZWbxV8Qj0="; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + ppx_fixed_literal = janePackage { + pname = "ppx_fixed_literal"; + hash = "sha256-vS2KcCO0fVCmiIBkUBgK6qnqdjREj57QCujHERcJTyo="; + meta.description = "Simpler notation for fixed point literals"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_globalize = janePackage { + pname = "ppx_globalize"; + hash = "sha256-SG7710YPwWmhRVl7wN3ZQz3ZMTw3cpoywVSeVQAI3Zc="; + meta.description = "A ppx rewriter that generates functions to copy local values to the global heap"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "sha256-ZmdW+q7fak8iG42jRQgZ6chmjHHwrDSy9wg7pq/6zwk="; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "sha256-ULEom0pTusxf2k2hduv+5NVp7pW5doA/e3QGQNJfGoM="; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + doCheck = false; # test build rules broken + }; + + ppx_ignore_instrumentation = janePackage { + pname = "ppx_ignore_instrumentation"; + hash = "sha256-rAdxCgAKz0jNR8ppRJO4oAEvgXbcU4J4mpreAyeGe6k="; + meta.description = "Ignore Jane Street specific instrumentation extensions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "sha256-Ql0/80KitKvW3xffeCapYREmZvlg+QWCb2JM2T4Rjlc="; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib time_now ]; + doCheck = false; # test build rules broken + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "sha256-v+/wdEGaXdMWDBa0eJO0uR18G/pDwHjsjaskoEuLusA="; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_disable_unused_warnings ppx_expect ppx_fixed_literal ppx_ignore_instrumentation ppx_log ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_tydi ppx_typerep_conv ppx_variants_conv ]; + }; + + ppx_jsonaf_conv = janePackage { + pname = "ppx_jsonaf_conv"; + hash = "sha256-GWDhSLtr2+VG3XFIbHgWUcLJFniC7/z90ndiE919CBo="; + meta.description = + "[@@deriving] plugin to generate Jsonaf conversion functions"; + propagatedBuildInputs = [ base jsonaf ppx_jane ppxlib ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "sha256-q5CLyeu+5qjegLrJkQVMnId3HMvZ8j3c0PqEa2vTBtU="; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "sha256-/kEkYXFZ5OyTM4i/WWViaxKvigpoKKoiWtUWuEMkgBE="; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ppx_here ]; + }; + + ppx_log = janePackage { + pname = "ppx_log"; + hash = "sha256-/HwoxBWKuVqTDYe4u0cYNGqg2Lj0h49U2VrFa4cpE2g="; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ base ppx_here ppx_sexp_conv ppx_sexp_message sexplib ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "sha256-AfG+ZnacrR6p7MOvtktVKVLrMBpNMkX9b2+eqNZNRF4="; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "sha256-TONxBQq/b0kc89f3+jItHd9SnerNx8xa2AjO7HOW+xQ="; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "sha256-1GpKEEH1Ul+W0k4/8Mra/qYlyFpeMfZ3xrmB3X7uve0="; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pattern_bind = janePackage { + pname = "ppx_pattern_bind"; + hash = "sha256-ShR8N71a7sz5XaKDyybsy+K0Uu7sYMgvpMADVxmrI/g="; + meta.description = "A ppx for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "sha256-gSS+vfsYw3FFOFZ8/iRnP3rxokKAU7EPa1wXq7SbJBk="; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_python = janePackage { + pname = "ppx_python"; + hash = "sha256-lpc6F+Scc5ECdOXPWowKSWRnFSzKbmE8oHs7zCjq3j8="; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "sha256-eCQfYAxZZmfNTbPrFW0sqrj63kIdIQ1MAlImCaMop68="; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib sexplib0 base ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "sha256-4g3Fjrjqhw+XNkCyxrXkgZDEa3e+ytPsEtQA2xSv+jA="; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "sha256-LsP+deeFYxB38xXw7LLB3gOMGZiUOFRYklGVY7DMmvE="; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "sha256-DFCBJY+Q8LjXSF9vHwPpUJLNyMoAXdDwQZrvhl+9g0U="; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_stable_witness = janePackage { + pname = "ppx_stable_witness"; + hash = "sha256-W1CN4xspM8NJiXfi7OsngfzWnLEUmBs+IRLwHfxX9d4="; + meta.description = "Ppx extension for deriving a witness that a type is intended to be stable"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_string = janePackage { + pname = "ppx_string"; + hash = "sha256-GQlgiaES8wc6Y7rTgmPrf9UfMfu125VoNGEbdc7kFsk="; + meta.description = "Ppx extension for string interpolation"; + propagatedBuildInputs = [ ppx_base ppxlib stdio ]; + }; + + ppx_tydi = janePackage { + pname = "ppx_tydi"; + hash = "sha256-neu2Z7TgQdBzf8UtYDRhnGp3Iggfd90Fr+gQuwVTMOo="; + meta.description = "Let expressions, inferring pattern type from expression"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_typed_fields = janePackage { + pname = "ppx_typed_fields"; + hash = "sha256-l4lCQ4n5FLPS82sb3FgW+HF2OEY/kY10sNfr+aQF8x8="; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ core ppx_jane ppxlib ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "sha256-DxjgwZee0jOea7qyPfEhRrdcKWQb2jtjrowiJszS+Fs="; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "sha256-Q/CCcMrD+XN5YRMzKvXuiQHfcwXwI773s8x150/eMzs="; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + pythonlib = janePackage { + pname = "pythonlib"; + version = "0.16"; + hash = "sha256-HrsdtwPSDSaMB9CDIR9P5iaAmLihUrReuNAPIYa+s3Y="; + meta.description = "A library to help writing wrappers around ocaml code for python"; + propagatedBuildInputs = [ base core expect_test_helpers_core ppx_compare ppx_expect ppx_here ppx_let ppx_python ppx_string stdio typerep pyml ]; + meta.broken = lib.versionAtLeast ocaml.version "4.14"; + }; + + profunctor = janePackage { + pname = "profunctor"; + hash = "sha256-CFHMtCuBnrlr+B2cdJm2Tamt0A/e+f3SnjEavvE31xQ="; + meta.description = "A library providing a signature for simple profunctors and traversal of a record"; + propagatedBuildInputs = [ base ppx_jane record_builder ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "sha256-GVjnwne6ksjY9ptLOpbsgG0La6eiCJf1w4teYEtgJrA="; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "sha256-ZRJ7ooXtatEEh0sPL8M9OZ+6s7xNdTuw0Ot6txiG16I="; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel jane_rope regex_parser_intf ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + re2_stable = janePackage { + pname = "re2_stable"; + version = "0.14.0"; + hash = "sha256-gyet2Pzn7ZIqQ+UP2J51pRmwaESY2LSGTqCMZZwDTE4="; + meta.description = "Re2_stable adds an incomplete but stable serialization of Re2"; + propagatedBuildInputs = [ core re2 ]; + }; + + record_builder = janePackage { + pname = "record_builder"; + hash = "sha256-46zGgN9RlDjoSbi8RimuQVrMhy65Gpic0YPZpHOeoo0="; + meta.description = "A library which provides traversal of records with an applicative"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + redis-async = janePackage { + pname = "redis-async"; + hash = "sha256-5msIS2m8nkaprR8NEBfKFWZBWaDJiUtjHbfPelg9/os="; + meta.description = "Redis client for Async applications"; + propagatedBuildInputs = [ async bignum core core_kernel ppx_jane ]; + }; + + regex_parser_intf = janePackage { + pname = "regex_parser_intf"; + hash = "sha256-huzHtUIIVRd5pE7VU1oUjN20S55L6+WCvoLlQ0FCD7A="; + meta.description = "Interface shared by Re_parser and Re2.Parser"; + propagatedBuildInputs = [ base ]; + }; + + resource_cache = janePackage { + pname = "resource_cache"; + hash = "sha256-dN4skSHswgRYLZqN/tqhFFTfgoN8H/LgTgoe+5ZI5zE="; + meta.description = "General resource cache"; + propagatedBuildInputs = [ async_rpc_kernel ]; + }; + + semantic_version = janePackage { + pname = "semantic_version"; + hash = "sha256-KJanaDUW56ndvnTlnPeQgh0C7zsRqXJ328gcEiVDrmc="; + meta.description = "Semantic versioning"; + propagatedBuildInputs = [ core ppx_jane re ]; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "sha256-JWRYi5lX9UOKg+RGvW6FO61t2HlnJKXhzctOHXe0bCM="; + propagatedBuildInputs = [ + async + core + csvfields + jsonaf + re2 + sexp_diff + sexp_macro + sexp_pretty + sexp_select + shell + ]; + meta.description = "S-expression swiss knife"; + }; + + sexp_grammar = janePackage { + pname = "sexp_grammar"; + hash = "sha256-Y/abRingL4+3qvaKgW9jH46E9uq7jYE2+kgr8ERKqfI="; + propagatedBuildInputs = [ core ppx_bin_prot ppx_compare ppx_hash ppx_let ppx_sexp_conv ppx_sexp_message zarith ]; + meta.description = "Helpers for manipulating [Sexplib.Sexp_grammar] values"; + }; + + sexp_diff = janePackage { + pname = "sexp_diff"; + hash = "sha256-2dMBKf7eUbKZtvV7Ol2mPMzYJOCDHuOm9xFZ8vkmp/0="; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "sha256-x9WsFFrV7wUqgPUw8KkfyzOxLrS5h5++OSK8QljeQqg="; + propagatedBuildInputs = [ async sexplib ]; + meta.description = "Sexp macros"; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "sha256-tcWdYZ717LkGowRSRoEcUNY7VCMX64uhCaY3bXhWxKM="; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "sha256-HEzZowojeK9yDOoTY/l01fYLUdolzQGlMO9u3phV8so="; + propagatedBuildInputs = [ base ppx_jane ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "sha256-wRr1M243Bqu/XLSsr5IVPH5RTVWeVgZjxkKOrm+PW5E="; + minimalOCamlVersion = "4.08.0"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "sha256-6MwggpjHo4FmKF88fP56LN9OHi2uIJc13TvKx4T7gEI="; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "sha256-pK434+ToeYURQHRV+gK57rC7BFvznWEvIu5NAib2ZTU="; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ textutils ]; + checkInputs = [ ounit ]; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "sha256-npIcrxMOcIgsecdUEx5XHYp0KVrXiMzMLi8jskAp4vo="; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + spawn = janePackage { + pname = "spawn"; + minimalOCamlVersion = "4.02.3"; + version = "0.15.0"; + hash = "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + splay_tree = janePackage { + pname = "splay_tree"; + hash = "sha256-Ag6yqTofEZ3v0qF+Z7xpXQOh7+HWtvRLlY+iAYqcReg="; + meta.description = "A splay tree implementation"; + propagatedBuildInputs = [ core_kernel ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "sha256-wMmLuzhKmnS2iTYVTPUx5Rv2LhL/ygmWmb9t2pUjz+E="; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "sha256-+QgxqSMqO4VGoMWWJ3QoXdtJKcVpxlSQ/OI7dmcNqjw="; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + stored_reversed = janePackage { + pname = "stored_reversed"; + hash = "sha256-ef11f0qifEvxKChM49Hnfk6J6hL+b0tMlm0iDLd5Y0Q="; + meta.description = "A library for representing a list temporarily stored in reverse order"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + streamable = janePackage { + pname = "streamable"; + hash = "sha256-3djrUW2tPKaEmoOIpdjN6ok7U9i07yreqbi1kP+6pnY="; + meta.description = "A collection of types suitable for incremental serialization"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel base core core_kernel ppx_jane ppxlib ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "sha256-2qy99MUMpkuNCvCYlk36k4kN6cPjrEILbwEUv4DyNYw="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core_unix textutils_kernel ]; + }; + + textutils_kernel = janePackage { + pname = "textutils_kernel"; + hash = "sha256-DiXemANj5ONmvMzp+tly3AJud5u9i7HdaHmn8aVQS48="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ppx_jane uutf ]; + }; + + tilde_f = janePackage { + pname = "tilde_f"; + hash = "sha256-qLjM9liJfMIh2fqRPBdnmtUf4xhzk2MY8dFNdON3Aew="; + meta.description = "Provides a let-syntax for continuation-passing style"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "sha256-DjSrx/HgwCYS0Xzm2gFvWUVLD7a1KuFVIyVrJjBi8Tc="; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + timezone = janePackage { + pname = "timezone"; + hash = "sha256-pmXUMvLfgAwP6TV/aP9wMlOs0KfwEWtaJfdjUFLbOu0="; + meta.description = "Time-zone handling"; + propagatedBuildInputs = [ core_kernel ]; + }; + + topological_sort = janePackage { + pname = "topological_sort"; + hash = "sha256-um5++60mR++iHAruKqoQfd4EbQ1kb3L+cPOWhs9sIHI="; + meta.description = "Topological sort algorithm"; + propagatedBuildInputs = [ ppx_jane stdio ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "sha256-iJnIjWZYCTaH29x7nFviCrbnTmHRChZkkj6E5sgi4mU="; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + username_kernel = janePackage { + pname = "username_kernel"; + hash = "sha256-UvFL/M9OsD+SOs9MYMKiKzZilLJHzriop6SPA4bOhZQ="; + meta.description = "An identifier for a user"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "sha256-8NoNkyIP7iEEiei+Q1zrPoJjnWwhCsLsY1vgua22gnw="; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + vcaml = janePackage { + pname = "vcaml"; + hash = "sha256-pmEKi24+22T76SzI3RpBmQF7ZrQwlngrpFYLoBdLwe0="; + meta.description = "OCaml bindings for the Neovim API"; + propagatedBuildInputs = [ angstrom-async async_extra expect_test_helpers_async faraday jsonaf man_in_the_middle_debugger semantic_version ]; + }; + + virtual_dom = janePackage { + pname = "virtual_dom"; + hash = "sha256-nXW9cDHQVugriR0+GkayuV4S3HKothQAoNJef02iALM="; + meta.description = "OCaml bindings for the virtual-dom library"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ base64 core_kernel gen_js_api js_of_ocaml js_of_ocaml_patches lambdasoup tyxml uri ]; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "sha256-oKD+JE08Mgvk5l8XFHSZ7xqiWPaOvKC87+zHLaQ/7q0="; + meta.description = "Javascripts stubs for the Zarith library"; + }; + + zstandard = janePackage { + pname = "zstandard"; + hash = "sha256-QcYqlOpCAr0owmO6sLDJhki8lUnNvtkaxldKb5I5AF0="; + meta.description = "OCaml bindings to Zstandard"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core_kernel ctypes zstd ]; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix new file mode 100644 index 000000000000..061fed447466 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16" }: + +{ pname +, version ? defaultVersion +, hash +, minimalOCamlVersion ? "4.14" +, doCheck ? true +, buildInputs ? [] +, ...}@args: + +buildDunePackage (args // { + duneVersion = "3"; + inherit version buildInputs; + + inherit minimalOCamlVersion; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + inherit doCheck; + + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; +}) diff --git a/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix index 5d65bb95101c..2e23a3715dac 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lame"; - version = "0.3.6"; + version = "0.3.7"; minimalOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-lame"; rev = "v${version}"; - sha256 = "sha256-oRxP1OM0pGdz8CB+ou7kbbrNaB1x9z9KTfciLsivFnI="; + sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix deleted file mode 100644 index c3400d4583e0..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchurl, buildDunePackage -, dscheck -, qcheck, qcheck-alcotest -}: - -buildDunePackage rec { - pname = "lockfree"; - version = "0.3.0"; - - minimalOCamlVersion = "5.0"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/ocaml-multicore/lockfree/releases/download/${version}/lockfree-${version}.tbz"; - hash = "sha256-XdJR5ojFsA7bJ4aZ5rh10NjopE0NjfqQ9KitOLMh3Jo="; - }; - - propagatedBuildInputs = [ dscheck ]; - - doCheck = true; - checkInputs = [ qcheck qcheck-alcotest ]; - - meta = { - description = "Lock-free data structures for multicore OCaml"; - homepage = "https://github.com/ocaml-multicore/lockfree"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix index fea1e712abd2..f0a89f37f418 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -6,15 +6,13 @@ buildDunePackage rec { pname = "mirage-nat"; - version = "3.0.1"; + version = "3.0.2"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-wReySOMulGkrPD60XxpgMrUoHzY9hQ7TZzYQyJ3eiik="; + hash = "sha256-Z1g3qb26x/S6asYv6roTW77r41SHy7OGN7MoZJ/E8Is="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix deleted file mode 100644 index 94a65548531f..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildDunePackage, fetchurl, tcpip }: - -buildDunePackage rec { - pname = "mirage-stack"; - version = "4.0.0"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - hash = "sha256-q70zGQvT5KTqvL37bZjSD8Su0P72KCUesyfWJcI8zPw="; - }; - - propagatedBuildInputs = [ tcpip ]; - - meta = { - description = "MirageOS signatures for network stacks"; - homepage = "https://github.com/mirage/mirage-stack"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} - diff --git a/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index 3fddb162d465..e95d3b182a52 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchurl -, mirage-stack , mirage-time , h2 , tls-mirage @@ -32,10 +31,8 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ - mirage-stack mirage-time h2 tls-mirage diff --git a/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix b/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix new file mode 100644 index 000000000000..855935aff672 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage, ocaml +, saturn_lockfree +, dscheck +, qcheck, qcheck-alcotest, qcheck-stm +}: + +buildDunePackage rec { + pname = "saturn"; + + inherit (saturn_lockfree) src version; + + propagatedBuildInputs = [ saturn_lockfree ]; + + doCheck = lib.versionAtLeast ocaml.version "5.0"; + checkInputs = [ dscheck qcheck qcheck-alcotest qcheck-stm ]; + + meta = saturn_lockfree.meta // { + description = "Parallelism-safe data structures for multicore OCaml"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix b/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix new file mode 100644 index 000000000000..42858626e58d --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, domain_shims +}: + +buildDunePackage rec { + pname = "saturn_lockfree"; + version = "0.4.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/saturn/releases/download/${version}/saturn-${version}.tbz"; + hash = "sha256-fHvslaJwVbQaqDVA/MHGqHybetYbxRGlMrhgXqM3iPs="; + }; + + propagatedBuildInputs = [ domain_shims ]; + + meta = { + description = "Lock-free data structures for multicore OCaml"; + homepage = "https://github.com/ocaml-multicore/lockfree"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix index 30710bfae265..1f86d7ef5bfb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,8 +1,8 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, pkg-config +, pkg-config , cstruct, cstruct-lwt, mirage-net, mirage-clock , mirage-random, mirage-time -, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt +, macaddr, macaddr-cstruct, fmt , lwt, lwt-dllist, logs, duration, randomconv, ethernet , alcotest, mirage-flow, mirage-vnetif, pcap-format , mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test @@ -13,13 +13,11 @@ buildDunePackage rec { pname = "tcpip"; - version = "7.1.2"; - - duneVersion = "3"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-lraur6NfFD9yddG+y21jlHKt82gLgYBBbedltlgcRm0="; + hash = "sha256-NrTBVr4WcCukxteBotqLoUYrIjcNFVcOERYFbL8CUjM="; }; nativeBuildInputs = [ @@ -27,17 +25,15 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - ppx_cstruct cstruct cstruct-lwt mirage-net mirage-clock mirage-random mirage-time - ipaddr + ipaddr-cstruct macaddr macaddr-cstruct - mirage-profile fmt lwt lwt-dllist @@ -61,7 +57,6 @@ buildDunePackage rec { mirage-vnetif pcap-format mirage-clock-unix - ipaddr-cstruct ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix index 002af344db9c..5e861592cd7b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix @@ -5,8 +5,12 @@ buildDunePackage rec { inherit (tls) src meta version; - minimalOCamlVersion = "4.11"; - duneVersion = "3"; + minimalOCamlVersion = "4.13"; + + patches = [ + # Remove when TLS gets updated to v0.17.1. + ./janestreet-0.16.patch + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch new file mode 100644 index 000000000000..7d36ad227fa0 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch @@ -0,0 +1,23 @@ +diff --git a/async/tls_async.mli b/async/tls_async.mli +index b4894b8..101f27f 100644 +--- a/async/tls_async.mli ++++ b/async/tls_async.mli +@@ -55,4 +55,4 @@ val connect + -> 'addr Tcp.Where_to_connect.t + -> host:[ `host ] Domain_name.t option + -> (Session.t * Reader.t * Writer.t) Deferred.Or_error.t) +- Tcp.with_connect_options ++ Tcp.Aliases.with_connect_options +diff --git a/async/x509_async.ml b/async/x509_async.ml +index d4fad8c..4ee466a 100644 +--- a/async/x509_async.ml ++++ b/async/x509_async.ml +@@ -9,7 +9,7 @@ let file_contents file = + let load_all_in_directory ~directory ~f = + let open Deferred.Or_error.Let_syntax in + let%bind files = Deferred.Or_error.try_with (fun () -> Sys.ls_dir directory) in +- Deferred.Or_error.List.map files ~f:(fun file -> ++ Deferred.Or_error.List.map ~how:`Sequential files ~f:(fun file -> + let%bind contents = file_contents (directory ^/ file) in + f ~contents) + ;; diff --git a/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix b/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix index 208a879b1d1c..a27a61d4baf1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix @@ -2,19 +2,19 @@ buildDunePackage rec { pname = "trace"; - version = "0.2"; + version = "0.3"; - minimalOCamlVersion = "4.05"; + minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz"; - hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ="; + url = "https://github.com/c-cube/ocaml-trace/releases/download/${version}/trace-${version}.tbz"; + hash = "sha256-Krq6qYO7tKJktTRjFrdmONPHfjrd81Ighsb9nmG9ZQU="; }; meta = { description = "Common interface for tracing/instrumentation libraries in OCaml"; license = lib.licenses.mit; - homepage = "https://c-cube.github.io/trace/"; + homepage = "https://c-cube.github.io/ocaml-trace/"; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix index 2922a57244b9..882dfb23996e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix @@ -5,8 +5,8 @@ let if lib.versionAtLeast ocaml.version "4.08" then { - version = "3.2.0"; - sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; + version = "3.2.3"; + sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8="; propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; } else @@ -40,7 +40,8 @@ buildDunePackage rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/zed"; + changelog = "https://github.com/ocaml-community/zed/blob/${version}/CHANGES.md"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.gal_bolle diff --git a/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix new file mode 100644 index 000000000000..dda00a883d33 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPecl, fetchFromGitHub }: + +let + version = "1.0.0beta6"; +in buildPecl { + inherit version; + pname = "opentelemetry"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-php-instrumentation"; + rev = version; + hash = "sha256-dbyFb+Wh4thbnwASgPuQ4ceeke6NDMFLvNXjp66hLCM="; + }; + + doCheck = true; + + meta = with lib; { + changelog = "https://github.com/open-telemetry/opentelemetry-php-instrumentation/releases/tag/${version}"; + description = "OpenTelemetry PHP auto-instrumentation extension"; + homepage = "https://opentelemetry.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ gaelreyrol ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/adax/default.nix b/nixpkgs/pkgs/development/python-modules/adax/default.nix index e4240028638b..fd2cb0f29f59 100644 --- a/nixpkgs/pkgs/development/python-modules/adax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adax/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "adax"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; - rev = version; - hash = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; + rev = "refs/tags/${version}"; + hash = "sha256-y4c1RBy/UxmKP7+mHXi86XJ2/RXGrqkj94I2Q699EJU="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "adax" ]; + pythonImportsCheck = [ + "adax" + ]; meta = with lib; { description = "Python module to communicate with Adax"; homepage = "https://github.com/Danielhiversen/pyAdax"; + changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix b/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix index b0af50573ad9..785c011c6d66 100644 --- a/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; + hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/nixpkgs/pkgs/development/python-modules/afdko/default.nix index dc14fdf51ac6..214a85f8c915 100644 --- a/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -23,6 +23,7 @@ , setuptools-scm , scikit-build , cmake +, ninja , antlr4_9 , libxml2 , pytestCheckHook @@ -47,6 +48,7 @@ buildPythonPackage rec { setuptools-scm scikit-build cmake + ninja ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 837842477d28..2cde5dda3ae9 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Bli+zrxMbRY2dzAx25ap3DhROIFTlk+TGpAfrHiMxPc="; + hash = "sha256-5F6mSdYkeDS/n4Quu6UrBK3alfieop6Go3muGlmr/84="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix index 15d3d7ae5617..812417a38a76 100644 --- a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2023.04.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,9 +25,23 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ar2UGSlVukMD5EZsEn7TFfIOovaI+B3Ym+UeGo95oks="; + hash = "sha256-Y8I4iPvxcK98Olb3JURNK37MKggdhcweKvNBa0ZtG6I="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aioambient/pull/295 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aioambient/commit/fa21a2e82678a231a73c8a1153032980926f4c35.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'websockets = ">=11.0.1"' 'websockets = "*"' @@ -43,6 +58,8 @@ buildPythonPackage rec { websockets ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix index 9cebf5f1eb13..2b48f96ae2b5 100644 --- a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "2.2"; + version = "3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3FMNIhIZrstPKTfHVmN+K28UR2G26HZ5S/JtXmaFk1c="; + hash = "sha256-MiFjd9HYaTugjP66O24Tgk92bC91GQHggvy1sdQIu+0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix b/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix index d6d69c6ee466..beea7e05a750 100644 --- a/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix @@ -4,11 +4,12 @@ , fetchFromGitHub , pythonOlder , setuptools +, pyjwt }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.0.2"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; + rev = "refs/tags/v${version}"; + hash = "sha256-bjPl0yrRaTIEEuPV8NbWu2hx/es5bcu2tDBZV+95fUc="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pyjwt ]; # Module has no tests @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; + changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix b/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix index e92fa59d920a..9bdd4f9eb420 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiobafi6"; - version = "0.8.2"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jfroy"; repo = "aiobafi6"; rev = "refs/tags/${version}"; - hash = "sha256-ng+WpLhAfsouFA9biomc0V+L9XQHDthJeJLv8ttnYBc="; + hash = "sha256-QxjrspvNrcMcGChjj1B4QF/SnWCsGmPxnI2bWAL6BiI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix b/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix index b64c7e103a7e..757c9c1915d5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI="; + hash = "sha256-YvPWvdA4BslkOLt3IkzSgUgex8h1CjCOVZC6oxNf3ZA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index f6b87c401cee..cc34f91fde9d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.1"; + version = "16.0.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DxEfkM//WvGqS/iWb6RIvE2raIYb/I0bcwrLqLBjCmw="; + hash = "sha256-x4kH8riHZbVibgwR2DmWB4tsswpub4m2LwnypVVUgqM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/nixpkgs/pkgs/development/python-modules/aiogram/default.nix index ab5499f7ae96..ceb3f9603ede 100644 --- a/nixpkgs/pkgs/development/python-modules/aiogram/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -53,6 +53,12 @@ buildPythonPackage rec { redis ]; + # requires network + disabledTests = [ + "test_download_file_404" + "test_download_404" + ]; + pythonImportsCheck = [ "aiogram" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix index e4dcbda3a02e..aa0dbd64be80 100644 --- a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; + hash = "sha256-/UNSAfAkOXPJQDWBZIe/AYIhx83kPCjGzZjn4oh+gfY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index 5bc3597a6752..ed3823af9bef 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.16"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2QnM5WJ0UyuRyL6NiXz22SLUMvyNfbdNIutJSNjS+G8="; + hash = "sha256-TyVmvricfaS+i96DGwh0IKhMm56U1DyebAmRb+OFCh4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix index 461590b0cc49..618c0e0d9023 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.5"; + version = "0.4.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-df3FQdOa3C8eQfgFi+sh7+/GBpE+4B5gOI+3XDQLHEs="; + hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix b/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix index 26745f8d5561..d08eeaec6c0e 100644 --- a/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2fu78mp9ztm229N+zhvY7FuWl3xZlqSYVk/Okp2RNJI="; + hash = "sha256-YGVQsw7UhRWXtfn2MQa3GHNlgXR4LJlFnaeLCGjmWfQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioquic/default.nix b/nixpkgs/pkgs/development/python-modules/aioquic/default.nix index 753ce73fb2dc..9aeb06a1382d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioquic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioquic/default.nix @@ -1,52 +1,43 @@ { lib -, fetchPypi -, fetchpatch , buildPythonPackage +, certifi +, fetchPypi , openssl , pylsqpack -, certifi -, pytestCheckHook , pyopenssl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioquic"; - version = "0.9.20"; + version = "0.9.21"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; + hash = "sha256-ecfsBjGOeFYnZlyk6HI63zR7ciW30AbjMtJXWh9RbvU="; }; - patches = [ - # This patch is here because it's required by the next patch. - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch"; - hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag="; - }) - # https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22 - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch"; - hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY="; - }) - # AssertionError: 'self-signed certificate' != 'self signed certificate' - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/cfcd3ce12fb27f5b26deb011a82f66b5d68d521a.patch"; - hash = "sha256-bCW817Z7jCxYySfUukNR4cibURH3qZWEQjeeyvRIqZY="; - }) - ]; - propagatedBuildInputs = [ certifi pylsqpack pyopenssl ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "aioquic" ]; + pythonImportsCheck = [ + "aioquic" + ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix index 5ea482278944..2c944600ef91 100644 --- a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , async-timeout , typing-extensions @@ -11,14 +12,25 @@ buildPythonPackage rec { pname = "aioredis"; version = "2.0.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"; + hash = "sha256-6qUar5k/LXH1S3BSfEQEN7plNAWIr+t4bNh8Vcic2Y4="; }; + patches = [ + # https://github.com/aio-libs-abandoned/aioredis-py/pull/1490 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/aio-libs-abandoned/aioredis-py/commit/1b951502dc8f149fa66beafeea40c782f1c5c1d3.patch"; + hash = "sha256-EqkiYktxISg0Rv4ShXOksGvuUyljPxjJsfNOVaaax2o="; + includes = [ "aioredis/exceptions.py" ]; + }) + ]; + propagatedBuildInputs = [ async-timeout typing-extensions @@ -29,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio (PEP 3156) Redis client library"; - homepage = "https://github.com/aio-libs/aioredis"; + homepage = "https://github.com/aio-libs-abandoned/aioredis-py"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix b/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix index 1ef9300eaf35..150486cf4aea 100644 --- a/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.07.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8EPELXxSq+B9o9eMFeM5ZPVYTa1+kT/S6cO7hKtD18s="; + hash = "sha256-AreQC5LOthnOEj0HnEww4zLob394XwCvqZBwjsT2Lcg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix index 72fdd22f6696..e993813081a8 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.16"; + version = "0.0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-GwnlaPy+pIJOL3szOebH0a0ytVMOeUI4dM8D629RuEU="; + hash = "sha256-HJbLsl1NHZxfH17mIi0T6h5ZSfKaw4VYbNgN6vmN7l4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index b2b6a866992e..09b177a61bf7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "52"; + version = "55"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mghAUZrRBKHM+mIeUGnbJqWD+NhZyikdGsIhf1uohiM="; + hash = "sha256-JvuP1Rhq01Y9KbfAJpawUQNWfxvlf9LY82RvXok4tgw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix b/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix index dde165c5bf87..fd5da5c330d5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; + hash = "sha256-/ulDImbLOTcoA4iH8e65A01aqqnCLn+01DWuM/4H4p4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index c3bf5066385d..eec4830837f0 100644 --- a/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.6-2"; + version = "0.5.6-4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xxKZI6yb8h1eqtfTpa8SqL/hnIWhFtuBP7RXQvI/Z/4="; + hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 55fe186c90e1..815d283a58ee 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-atVmXsgMIRpmOXgNoatWkk9ID14f9rMJMT6+CWmvbY4="; + hash = "sha256-l/O+7M9f2HtIcXNd49+zr2Z0Cx/3mbXgZvqOyPlvJbk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index c18343d46f1c..479ff401a425 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "4.1.5"; + version = "4.1.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WXyDahhMETH+62sOI82iNsQf7N7mRCc3Unj7aSD9LnQ="; + hash = "sha256-9YE19dEj4I/bfhGEm4KUXhkA+MiZughZ1LQbJcdsqVU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix index 5eb60419fcf7..cfe8d7e1e1fa 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-spaGux6dYvtUtpOdU6oN7SEn8IgBof2NpQSPvr+Zplg="; }; + # remove after https://github.com/ansible/pylibssh/pull/502 is merged + postPatch = '' + sed -i "/setuptools_scm_git_archive/d" pyproject.toml + ''; + nativeBuildInputs = [ cython wheel diff --git a/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 9da23d3fc09b..f7c41aa12ba2 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.2.0"; + version = "8.3.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-k1ppIf+wNKoY5lB7SeQBZ2zRUkPW+qXgXiIQCL9yXJc="; + hash = "sha256-XlgAHX1twz5dFWyjQ4g7YT7JiPaTZLCkP3Ek/ktb4vI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index a7bbb6fb2bd6..911361f82b8a 100644 --- a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , anyio , distro @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.8"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,17 +25,9 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-rNLKIZKX9AI0IKGicozllh+XGU4Ll91EfRaAfJYJtJE="; + hash = "sha256-OmT8a588eprCTUnnhLF5+XSOtetiUMouaWz1hrTl1ao="; }; - patches = [ - (fetchpatch { - name = "support-pytest-asyncio-0.21.0.patch"; - url = "https://github.com/anthropics/anthropic-sdk-python/commit/1e199aa9b38970c5b5b4492907494ac653a7f756.patch"; - hash = "sha256-f9KldnvXuRKVgT7Xb/xdhInKOeXvi4g5OxVRD0PMhgQ="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; @@ -70,6 +61,5 @@ buildPythonPackage rec { changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; - broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/anytree/default.nix b/nixpkgs/pkgs/development/python-modules/anytree/default.nix index d49b22349639..a83d8748d477 100644 --- a/nixpkgs/pkgs/development/python-modules/anytree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anytree/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fontconfig +, graphviz +, poetry-core +, pytestCheckHook , pythonOlder -, substituteAll , six +, substituteAll , withGraphviz ? true -, graphviz -, fontconfig -# Tests -, pytestCheckHook -, nose }: buildPythonPackage rec { pname = "anytree"; - version = "2.8.0"; + version = "2.9.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"; + src = fetchFromGitHub { + owner = "c0fec0de"; + repo = "anytree"; + rev = "refs/tags/${version}"; + hash = "sha256-e7mmOOvrZuMCcyUg74YLLXGzkb5nCtuYmhNzAbY65gg="; }; patches = lib.optionals withGraphviz [ @@ -28,30 +32,35 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ six ]; - # tests print “Fontconfig error: Cannot load default config file” + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Tests print “Fontconfig error: Cannot load default config file” preCheck = lib.optionalString withGraphviz '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf ''; - # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree + # Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - nativeCheckInputs = [ pytestCheckHook nose ]; - - pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ - # Use enums, which aren't available pre-python3.4 - "--ignore=tests/test_resolver.py" - "--ignore=tests/test_search.py" + pythonImportsCheck = [ + "anytree" ]; meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure"; homepage = "https://github.com/c0fec0de/anytree"; + changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maitnainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/anywidget/default.nix b/nixpkgs/pkgs/development/python-modules/anywidget/default.nix index d993af0654f8..f96ef47e7332 100644 --- a/nixpkgs/pkgs/development/python-modules/anywidget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anywidget/default.nix @@ -7,7 +7,6 @@ , hatchling , importlib-metadata , ipywidgets -, jupyterlab , psygnal , typing-extensions , watchfiles @@ -25,10 +24,17 @@ buildPythonPackage rec { hash = "sha256-OUKxmYceEKURJeQTVI7oLT4SdZM90V7BoZf0UykkEV4="; }; + # We do not need the jupyterlab build dependency, because we do not need to + # build any JS components; these are present already in the PyPI artifact. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*"' "" + ''; + nativeBuildInputs = [ hatch-jupyter-builder hatchling - jupyterlab ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/apischema/default.nix b/nixpkgs/pkgs/development/python-modules/apischema/default.nix new file mode 100644 index 000000000000..a60b97d1d951 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/apischema/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "apischema"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wyfo"; + repo = "apischema"; + rev = "refs/tags/v${version}"; + hash = "sha256-DBFFCLi8cpASyGPNqZvYe3OTLSbNZ8QzaxjQkOiHxFc="; + }; + + passthru.optional-dependencies = { + graphql = [ + graphql-core + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "apischema" + ]; + + meta = with lib; { + description = "JSON (de)serialization, GraphQL and JSON schema generation using typing"; + homepage = "https://github.com/wyfo/apischema"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/apkit/default.nix b/nixpkgs/pkgs/development/python-modules/apkit/default.nix new file mode 100644 index 000000000000..7e2c45ca8bc7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/apkit/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +}: + +buildPythonPackage { + pname = "apkit"; + version = "unstable-2022-08-23"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "hwp"; + repo = "apkit"; + rev = "40561738c3f585c590c3f0584bf2e3354eefbd48"; + hash = "sha256-/pwoEKB6BD+wWy7QwPwwzSxGn+TAOaMzduOXyuoXC8g="; + }; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + pythonImportsCheck = [ "apkit" ]; + + # This package has no tests + doCheck = false; + + meta = with lib; { + description = "Audio processing toolkit"; + homepage = "https://github.com/hwp/apkit"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/app-model/default.nix b/nixpkgs/pkgs/development/python-modules/app-model/default.nix index c906b316d46e..29f19979ff53 100644 --- a/nixpkgs/pkgs/development/python-modules/app-model/default.nix +++ b/nixpkgs/pkgs/development/python-modules/app-model/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4I0lDL6B+8f/lj09zT14lvbGATuHIfjKwwABXi6OIvE="; + hash = "sha256-1LldqihVCCgFdnsod751zWAAqkaaIH2qMpfsPYjWzgs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 3cdc55f63499..0e0944dd32e6 100644 --- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.4.5"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t8ZlE8VFZpCimO2IfJAW3tQvFeNl0WFC5yi3T3z/7oI="; + hash = "sha256-PFgRQQd6EBeQ7eDKsW+ig60DKpsvl9xtNWX7LZGBP9c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index f55ca7e29670..03e0d9527522 100644 --- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -1,36 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# propagates , allpairspy , approval-utilities , beautifulsoup4 +, buildPythonPackage , empty-files +, fetchFromGitHub +, mock , mrjob +, numpy , pyperclip , pytest -, typing-extensions - -# tests -, numpy , pytestCheckHook +, pythonOlder +, testfixtures +, typing-extensions }: buildPythonPackage rec { - version = "8.3.1"; pname = "approvaltests"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-FyYT+w4CX+CdUg0uGwyjw98H8Z+HMVecgMBW/ytrtFU="; + hash = "sha256-tyUPXeMdFuzlBY/HrGHLDEwYngzBELayaVVfEh92lbE="; }; propagatedBuildInputs = [ @@ -41,16 +38,18 @@ buildPythonPackage rec { mrjob pyperclip pytest + testfixtures typing-extensions ]; nativeCheckInputs = [ + mock numpy pytestCheckHook ]; disabledTests = [ - # tests expects paths below ApprovalTests.Python directory + # Tests expects paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" ]; @@ -63,7 +62,8 @@ buildPythonPackage rec { meta = with lib; { description = "Assertion/verification library to aid testing"; homepage = "https://github.com/approvals/ApprovalTests.Python"; + changelog = "https://github.com/approvals/ApprovalTests.Python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 0a2dd009f6a4..92c58450cee4 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.2.0"; + version = "5.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-OtaoyqYRsZVoWezrTAy3zROyNeRLbZmCT+z7YCwf9Ow="; + hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/nixpkgs/pkgs/development/python-modules/apptools/default.nix index 0905100a2bae..faaf6bec0796 100644 --- a/nixpkgs/pkgs/development/python-modules/apptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apptools/default.nix @@ -1,12 +1,10 @@ { lib , buildPythonPackage , configobj -, fetchpatch , fetchPypi , importlib-resources , pandas , pytestCheckHook -, pythonAtLeast , pythonOlder , tables , traits @@ -15,34 +13,16 @@ buildPythonPackage rec { pname = "apptools"; - version = "5.1.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh"; + hash = "sha256-xiaPXfzzCIvK92oAA+ULd3TQG1JY1xmbQQtIUv8iRuM="; }; - patches = [ - # python310: Fix tests - # https://github.com/enthought/apptools/issues/303 - (fetchpatch { - url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch"; - hash = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY="; - name = "fix_python310_tests.patch"; - }) - - # python39: importlib_resources -> importlib.resources. This patch will be included - # in the next release after 5.1.0. - (fetchpatch { - url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch"; - sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw"; - name = "fix_importlib-resources_naming.patch"; - }) - ]; - propagatedBuildInputs = [ configobj traits @@ -68,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications"; homepage = "https://github.com/enthought/apptools"; + changelog = "https://github.com/enthought/apptools/releases/tag/${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index e34c8a31a9d0..73e371ed0aab 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g+inF8eswHNLV6bBVRpyLf6H8PjmPduv7I2svAVEG5U="; + hash = "sha256-l9AakU68ACb02NGKWbkmUp14/lC21PJeGuzexYPTaNg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/nixpkgs/pkgs/development/python-modules/argilla/default.nix index 24b9668d12b0..4ef9c171d2b2 100644 --- a/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.13.2"; + version = "1.15.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FCPlEbgViWZEyXpdtaa6pJxpgbSXmcfJX/1RUFF7Zs4="; + hash = "sha256-CEB2Q+8JJmYWeqKS1QuOysedCSuPWXcljlmaclwZzmY="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/nixpkgs/pkgs/development/python-modules/astroid/default.nix index 5e5f9e22fb40..5fd0a5281b2c 100644 --- a/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -5,8 +5,10 @@ , isPyPy , lazy-object-proxy , setuptools +, wheel , typing-extensions , typed-ast +, pip , pylint , pytestCheckHook , wrapt @@ -28,6 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pip pytestCheckHook typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index a3ca61f98620..7f6130414488 100644 --- a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.34.1"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-Ktl6YVYd8QpC6eaz3Xe6YyJZhB92ZLL9/XG4WSc2qS8="; + hash = "sha256-U1PkOu257ppSsoPQr4oYdNKkUrm1WKAPuuMy1pjLx8A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 71e20a6d5f79..9e43c0494d14 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.27.0"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cgmG2aRwXdikD98XIDb1rnhyJQNqfrRucExFqo9iwFQ="; + hash = "sha256-clLNw6yy9S/qo2ZCgNO814pGvWwQv9aBrP/++hEg4ng="; }; # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 diff --git a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix index fcfa15fcb1de..5ffe2e769cc9 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.3.5"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag="; + hash = "sha256-nKXZXOpwVN8Xe1vwwPGPucvyffiIQ8I4D+0A3qGco5w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index 507a6101a168..c17bae7c80f1 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, pyopenssl , pytest-asyncio , pytest-mock , pytestCheckHook @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-fSXhW/Ik96HVecwOFWM+VftSzWGX6O4PzPT7JuaYXy0="; + hash = "sha256-gAyvo+VJPdS/UpXN/h8LqbIRyx84fifSUsW2GUzLgfo="; fetchSubmodules = true; }; @@ -42,12 +43,13 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - aiosqlite aiofiles - pytz + aiosqlite + cryptography + pyopenssl python-dateutil + pytz sortedcontainers - cryptography typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/attrs/default.nix b/nixpkgs/pkgs/development/python-modules/attrs/default.nix index 855b4bf86982..a298dc36f507 100644 --- a/nixpkgs/pkgs/development/python-modules/attrs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/attrs/default.nix @@ -3,22 +3,31 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools +, hatchling }: buildPythonPackage rec { pname = "attrs"; - version = "22.2.0"; - disabled = pythonOlder "3.6"; + version = "23.1.0"; + disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ySJ7/C8BmTwD9o2zfR0VyWkBiDI8BnxkHxo1ylgYX5k="; + hash = "sha256-YnmDbVgVE6JvG/I1+azTM7yRFWg/FPfo+uRsmPxQ4BU="; }; + patches = [ + # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs + ./remove-hatch-plugins.patch + ]; + + postPatch = '' + substituteAllInPlace pyproject.toml + ''; + nativeBuildInputs = [ - setuptools + hatchling ]; outputs = [ @@ -47,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python attributes without boilerplate"; homepage = "https://github.com/python-attrs/attrs"; + changelog = "https://github.com/python-attrs/attrs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch b/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch new file mode 100644 index 000000000000..7d7b83a366e0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch @@ -0,0 +1,74 @@ +diff --git a/pyproject.toml b/pyproject.toml +index fb8fae3..998211f 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: MIT + + [build-system] +-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"] ++requires = ["hatchling"] + build-backend = "hatchling.build" + + +@@ -26,7 +26,8 @@ classifiers = [ + "Typing :: Typed", + ] + dependencies = ["importlib_metadata;python_version<'3.8'"] +-dynamic = ["version", "readme"] ++dynamic = ["readme"] ++version = "@version@" + + [project.optional-dependencies] + tests-no-zope = [ +@@ -67,50 +68,9 @@ Changelog = "https://www.attrs.org/en/stable/changelog.html" + Funding = "https://github.com/sponsors/hynek" + Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi" + +- +-[tool.hatch.version] +-source = "vcs" +-raw-options = { local_scheme = "no-local-version" } +- + [tool.hatch.build.targets.wheel] + packages = ["src/attr", "src/attrs"] + +-[tool.hatch.metadata.hooks.fancy-pypi-readme] +-content-type = "text/markdown" +- +-# PyPI doesn't support the <picture> tag. +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """<p align="center"> +- <a href="https://www.attrs.org/"> +- <img src="https://raw.githubusercontent.com/python-attrs/attrs/main/docs/_static/attrs_logo.svg" width="35%" alt="attrs" /> +- </a> +-</p> +-""" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "README.md" +-start-after = "<!-- teaser-begin -->" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """ +- +-## Release Information +- +-""" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "CHANGELOG.md" +-pattern = "\n(###.+?\n)## " +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """ +- +---- +- +-[Full changelog](https://www.attrs.org/en/stable/changelog.html) +-""" +- +- + # Make coverage play nicely with pytest-xdist. + [tool.hatch.build.targets.wheel.hooks.autorun] + dependencies = ["hatch-autorun"] diff --git a/nixpkgs/pkgs/development/python-modules/autarco/default.nix b/nixpkgs/pkgs/development/python-modules/autarco/default.nix index 37625fdb1bd2..b5a8715f6ced 100644 --- a/nixpkgs/pkgs/development/python-modules/autarco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autarco/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytestCheckHook @@ -24,6 +25,22 @@ buildPythonPackage rec { hash = "sha256-3f6N4b6WZPAUUQTuGeb20q0f7ZqDR+O24QRze5RpRlw="; }; + patches = [ + # https://github.com/klaasnicolaas/python-autarco/pull/265 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/klaasnicolaas/python-autarco/commit/bf40e8a4f64cd9c9cf72930260895537ea5b2adc.patch"; + hash = "sha256-Fgijy7sd67LUIqh3qjQjyothnjdW7Zcil/bQSuVsBR8="; + }) + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -33,19 +50,14 @@ buildPythonPackage rec { yarl ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "autarco" ]; diff --git a/nixpkgs/pkgs/development/python-modules/awacs/default.nix b/nixpkgs/pkgs/development/python-modules/awacs/default.nix index 54e7b32825fe..f59eaccd1b9a 100644 --- a/nixpkgs/pkgs/development/python-modules/awacs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awacs/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "awacs"; - version = "2.3.0"; + version = "2.4.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0tizZWcHe1qbLxpXS/IngExaFFUHZyXXlksWcNL/vEw="; + hash = "sha256-iflg6tjqFl1gWOzlJhQwGHhAQ/pKm9n8GVvUz6fSboM="; }; propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index a32ff89555ce..a8107fac2b84 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , cmake +, ninja , numpy , pybind11 , scikit-build-core @@ -11,18 +12,19 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "21"; + version = "22"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4="; + hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8="; }; nativeBuildInputs = [ cmake + ninja pybind11 scikit-build-core ] ++ scikit-build-core.optional-dependencies.pyproject; diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index 536a67b48372..c716a56dfb24 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.34.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-MjX0im9GX0mdWkumUoJUIBjPZl/Ok5+sR6Dgq6vVGKM="; + hash = "sha256-cHpeNY0WY4yai/yWw2Oy1QLLjlj8PFNdB3BMbkP31Ds="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=read_version()," 'version="${version}",' + ''; + propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 227c0f608df8..2a2915afcd75 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "1.73.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aws"; @@ -28,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-rj+q/06gIvPYTJP/EH9ZrP0Sp4J3K1aCRyNkgpphWP4="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" + ''; + propagatedBuildInputs = [ boto3 jsonschema @@ -35,12 +40,6 @@ buildPythonPackage rec { typing-extensions ]; - preCheck = '' - sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini - substituteInPlace pytest.ini \ - --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" - ''; - nativeCheckInputs = [ parameterized pytest-env @@ -54,6 +53,10 @@ buildPythonPackage rec { "samtranslator" ]; + preCheck = '' + sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini + ''; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/aws/serverless-application-model"; diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 2c85cbfcf79c..dc9ddfeceb70 100644 --- a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.16.10"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQFJm0ebgvBAP2Fb9SDB+LlQaBjSdePiit4lzGvNuSs="; + hash = "sha256-Q5DA+lraOebUYgjFDj11XUPZY1X8qD/1dwgeMoL2SZ0="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 82390e389bd9..a2cdf1f929c3 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-yTHCcwH/qGsHtNz1dOKdpz4966mrXR/k9EW7ajEX4mA="; + hash = "sha256-ckQXmfjFyJv+IQJpZeJmZyp8XQUMLGURnviZ3VNi4rE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index b9e3a2e4a053..624c9735b6ac 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -4,32 +4,36 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, msrestazure +, isodate +, typing-extensions }: buildPythonPackage rec { - version = "2.0.0"; pname = "azure-mgmt-appcontainers"; + version = "3.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; - extension = "zip"; + hash = "sha256-oqKPEOnZaIU7IMzDqT552IBJr9RtWt3vFO3SlG8igs0="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.mgmt.appcontainers" ]; + pythonImportsCheck = [ + "azure.mgmt.appcontainers" + ]; meta = with lib; { description = "Microsoft Azure Appcontainers Management Client Library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index e3ec3ee71b95..4707f8bc2ae9 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -1,32 +1,32 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core , azure-mgmt-nspkg +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "25.0.0"; + version = "26.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; + hash = "sha256-BpvnSqee5wodtMXPxo/pHCBk8Yy4yPnEdK164d9ILuM="; }; propagatedBuildInputs = [ - msrest - msrestazure azure-common azure-mgmt-core + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # has no tests diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 91fb01f95473..e4d0ae9b288f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -1,31 +1,31 @@ { lib +, azure-common +, azure-mgmt-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, msrest -, msrestazure -, azure-common -, azure-mgmt-core +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "6.0.1"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-j+LrnLsfvRNlolKYf72ZUXxg5lb33R7PfxveBSyxHDI="; + hash = "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; pythonNamespaces = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index b0bdd1c086bb..6d8e08964807 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -1,31 +1,31 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-mgmt-core -, msrest -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "24.0.0"; pname = "azure-mgmt-network"; + version = "25.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-LtahQ2PnJC2jlD3pHp+IBLaUaNXTamZqdFdE/iJ4840="; + hash = "sha256-rZPbkUQJFIeNSSPWHTK79INWeRX5+GJ7o7mEMLhyJ9E="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 37d74abc72ee..385d55248ecd 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -1,37 +1,41 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core -, isPy27 +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "1.2.0"; pname = "azure-mgmt-redhatopenshift"; - disabled = isPy27; # don't feel like fixing namespace issues on python2 + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; + hash = "sha256-LOJldUyWdVShpN8lD8zGdFeYFiKSmODk3WNOP1fJfcs="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; pythonNamespaces = "azure.mgmt"; - # no included + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.redhatopenshift" ]; + pythonImportsCheck = [ + "azure.mgmt.redhatopenshift" + ]; meta = with lib; { description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix index ff3a52809946..b09a029f307c 100644 --- a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix @@ -68,7 +68,7 @@ }: let - version = "1.1.3"; + version = "1.1.4"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -104,7 +104,7 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "v${version}"; - hash = "sha256-RJDFjFxTO7UhGZQB8flXug0xCpFdJqLlCZUu0O5W1YE="; + hash = "sha256-aGSw40haVGo4UpUItStsFxfgjAnY4Rhiat4qDUIINWU="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index a40b51498eb2..baa4ddacfec5 100644 --- a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.10"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-IylA73N3bZOs5HjQGbT6xqokb73iO3bdg5M2KCTX3p4="; + hash = "sha256-cx22otbBCSFRTfr+wY1+k5kyX6h9mTQfRBfPw3rplzY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix index 0bd3562e6025..f93ef838751f 100644 --- a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.1.4"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-hr3HD8UiI+bKiHcXGnyomJMzP+/GVXLgSUxeH2U6l/4="; + hash = "sha256-cLSI6wa3gHE0QkSVVWMNpb5fyQy0TLDNSqOuGlDJGJc="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/blebox/blebox_uniapi/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/blebox/blebox_uniapi/blob/v${version}/HISTORY.rst"; description = "Python API for accessing BleBox smart home devices"; homepage = "https://github.com/blebox/blebox_uniapi"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix b/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix new file mode 100644 index 000000000000..043384e80bf0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "blockfrost-python"; + version = "0.5.3"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "blockfrost"; + repo = "blockfrost-python"; + rev = "${version}"; + hash = "sha256-mQ8avjyLARJONYn18neCyuHEuv3ySyCNMe+P4+Dlxck="; + }; + + propagatedBuildInputs = [ + requests + setuptools + ]; + + pythonImportsCheck = [ "blockfrost" ]; + + meta = with lib; { + description = "Python SDK for the Blockfrost.io API"; + homepage = "https://github.com/blockfrost/blockfrost-python"; + license = licenses.asl20; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index a68f8c8da430..3a4f1f567e90 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.7.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EmZPiZKm/80nJpPnJWhI9i4I6MhgQMifLOEUBFLqbSw="; + hash = "sha256-DLB2mBjHPVT2Fg2Kr0WUDuu5nqBCbdu525wAD3ERKV8="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix new file mode 100644 index 000000000000..639d2e3292cb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, python +, build +, flit-core +, installer +, packaging +, pyproject-hooks +, tomli +}: +let + buildBootstrapPythonModule = basePackage: attrs: stdenv.mkDerivation ({ + pname = "${python.libPrefix}-bootstrap-${basePackage.pname}"; + inherit (basePackage) version src meta; + + buildPhase = '' + runHook preBuild + + PYTHONPATH="${flit-core}/${python.sitePackages}" \ + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + PYTHONPATH="${installer}/${python.sitePackages}" \ + ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/*.whl + + runHook postInstall + ''; + } // attrs); + + bootstrap-packaging = buildBootstrapPythonModule packaging {}; + + bootstrap-pyproject-hooks = buildBootstrapPythonModule pyproject-hooks {}; + + bootstrap-tomli = buildBootstrapPythonModule tomli {}; +in +buildBootstrapPythonModule build { + propagatedBuildInputs = [ + bootstrap-packaging + bootstrap-pyproject-hooks + ] ++ lib.optionals (python.pythonOlder "3.11") [ + bootstrap-tomli + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix new file mode 100644 index 000000000000..ab9e52538d34 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, python +, flit-core +}: + +stdenv.mkDerivation { + pname = "${python.libPrefix}-bootstrap-${flit-core.pname}"; + inherit (flit-core) version src patches meta; + + sourceRoot = "source/flit_core"; + + buildPhase = '' + runHook preBuild + + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${python.interpreter} bootstrap_install.py dist/flit_core-*.whl \ + --install-root "$out" --installdir "/${python.sitePackages}" + + runHook postInstall + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix new file mode 100644 index 000000000000..b569e7fa6dc8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, python +, flit-core +, installer +}: + +stdenv.mkDerivation { + pname = "${python.libPrefix}-bootstrap-${installer.pname}"; + inherit (installer) version src meta; + + buildPhase = '' + runHook preBuild + + PYTHONPATH="${flit-core}/${python.sitePackages}" \ + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + PYTHONPATH=src ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/installer-*.whl + + runHook postInstall + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix new file mode 100644 index 000000000000..be8514f08acd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +, types-awscrt +, typing-extensions +}: + +buildPythonPackage rec { + pname = "botocore-stubs"; + version = "1.31.39"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "botocore_stubs"; + inherit version; + hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + types-awscrt + typing-extensions + ]; + + pythonImportsCheck = [ + "botocore-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for botocore"; + homepage = "https://pypi.org/project/botocore-stubs/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boxx/default.nix b/nixpkgs/pkgs/development/python-modules/boxx/default.nix index 925aa2b2568b..a2a71ad0c986 100644 --- a/nixpkgs/pkgs/development/python-modules/boxx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.9"; + version = "0.10.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fWOGKDk7eJVlE9LMau3DZF8nFLUrmHpunAXdqLxHFHk="; + hash = "sha256-7A5qFpISrjVrqQfKk6BPb7RhDWd9f90eF3bku+LsCcc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/nixpkgs/pkgs/development/python-modules/bpycv/default.nix index 09c3b4f8283d..a6d385e97781 100644 --- a/nixpkgs/pkgs/development/python-modules/bpycv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bpycv/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "bpycv"; - version = "0.3.6"; + version = "0.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4="; + hash = "sha256-qqNGemDB0aagCXjrECuh6kLksf+KujPejpnXVqFG8GY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bqplot/default.nix b/nixpkgs/pkgs/development/python-modules/bqplot/default.nix index 074c75fffb7a..5695be669bbc 100644 --- a/nixpkgs/pkgs/development/python-modules/bqplot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bqplot/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , jupyter-packaging +, jupyterlab , bqscales , ipywidgets , numpy @@ -23,8 +24,17 @@ buildPythonPackage rec { hash = "sha256-FNjeb5pNGUW76mwTIOpNHJMlb3JoN3T24AINzFefPdI="; }; + # upstream seems in flux for 0.13 release. they seem to want to migrate from + # jupyter_packaging to hatch, so let's patch instead of fixing upstream + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "jupyter_packaging~=" "jupyter_packaging>=" \ + --replace "jupyterlab~=" "jupyterlab>=" + ''; + nativeBuildInputs = [ jupyter-packaging + jupyterlab ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bqscales/default.nix b/nixpkgs/pkgs/development/python-modules/bqscales/default.nix index 3bd015a58f67..8b0ebb610ad9 100644 --- a/nixpkgs/pkgs/development/python-modules/bqscales/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bqscales/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "bqscales"; version = "0.3.1"; - format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,6 +21,19 @@ buildPythonPackage rec { hash = "sha256-C+/GLpqYpePngbn5W0MwvpdmVgFZF7aGHyKMgO5XM90="; }; + # We relax dependencies here instead of pulling in a patch because upstream + # has released a new version using hatch-jupyter-builder, but it is not yet + # trivial to upgrade to that. + # + # Per https://github.com/bqplot/bqscales/issues/76, jupyterlab is not needed + # as a build dependency right now. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*",' "" \ + --replace 'jupyter_packaging~=' 'jupyter_packaging>=' + ''; + nativeBuildInputs = [ hatchling jupyter-packaging diff --git a/nixpkgs/pkgs/development/python-modules/build/default.nix b/nixpkgs/pkgs/development/python-modules/build/default.nix index 0eaad47c44f0..f86f47e2bd85 100644 --- a/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, build , buildPythonPackage , fetchFromGitHub , flit-core @@ -41,36 +42,52 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ - filelock - pytest-mock - pytest-rerunfailures - pytest-xdist - pytestCheckHook - setuptools - toml - ]; + # We need to disable tests because this package is part of the bootstrap chain + # and its test dependencies cannot be built yet when this is being built. + doCheck = false; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - ]; + passthru.tests = { + pytest = buildPythonPackage { + pname = "${pname}-pytest"; + inherit version; + format = "other"; - __darwinAllowLocalNetworking = true; + dontBuild = true; + dontInstall = true; - disabledTests = [ - # Tests often fail with StopIteration - "test_isolat" - "test_default_pip_is_never_too_old" - "test_build" - "test_with_get_requires" - "test_init" - "test_output" - "test_wheel_metadata" - ] ++ lib.optionals stdenv.isDarwin [ - # Expects Apple's Python and its quirks - "test_can_get_venv_paths_with_conflicting_default_scheme" - ]; + nativeCheckInputs = [ + build + filelock + pytest-mock + pytest-rerunfailures + pytest-xdist + pytestCheckHook + setuptools + toml + ]; + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + __darwinAllowLocalNetworking = true; + + disabledTests = [ + # Tests often fail with StopIteration + "test_isolat" + "test_default_pip_is_never_too_old" + "test_build" + "test_with_get_requires" + "test_init" + "test_output" + "test_wheel_metadata" + ] ++ lib.optionals stdenv.isDarwin [ + # Expects Apple's Python and its quirks + "test_can_get_venv_paths_with_conflicting_default_scheme" + ]; + }; + }; pythonImportsCheck = [ "build" diff --git a/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix b/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix deleted file mode 100644 index d183b607b31a..000000000000 --- a/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, cachetools -, ecdsa -, eth-hash -, fastecdsa -, fetchzip -, frozendict -, gmp -, lark -, marshmallow -, marshmallow-dataclass -, marshmallow-enum -, marshmallow-oneofschema -, mpmath -, numpy -, pipdeptree -, prometheus-client -, pytest -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, setuptools -, sympy -, typeguard -, web3 -}: - -buildPythonPackage rec { - pname = "cairo-lang"; - version = "0.10.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchzip { - url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip"; - hash = "sha256-MNbzDqqNhij9JizozLp9hhQjbRGzWxECOErS3TOPlAA="; - }; - - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - - buildInputs = [ - gmp - ]; - - propagatedBuildInputs = [ - aiohttp - cachetools - setuptools - ecdsa - fastecdsa - sympy - mpmath - numpy - typeguard - frozendict - prometheus-client - marshmallow - marshmallow-enum - marshmallow-dataclass - marshmallow-oneofschema - pipdeptree - lark - web3 - eth-hash - pyyaml - ] ++ eth-hash.optional-dependencies.pycryptodome; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; - - pythonRelaxDeps = [ - "frozendict" - ]; - - pythonRemoveDeps = [ - # TODO: pytest and pytest-asyncio must be removed as they are check inputs - "pytest" - "pytest-asyncio" - ]; - - postFixup = '' - chmod +x $out/bin/* - ''; - - # There seems to be no test included in the ZIP release… - # Cloning from GitHub is harder because they use a custom CMake setup - # TODO(raitobezarius): upstream was pinged out of band about it. - doCheck = false; - - meta = with lib; { - description = "Tooling for Cairo language"; - homepage = "https://github.com/starkware/cairo-lang"; - license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index ff79eacf99b8..fb0a81e202d9 100644 --- a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -11,25 +11,24 @@ , pytestCheckHook , cairo , cffi +, flit-core , numpy , withXcffib ? false , xcffib , glib , gdk-pixbuf -, setuptools }: buildPythonPackage rec { pname = "cairocffi"; - version = "1.5.1"; + version = "1.6.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { inherit pname version; - hash = "sha256-Bxq3ty41MzALC/1VpSBWtP/cHtbmVneeKs7Ztwm4opU="; + hash = "sha256-eOa75HNXZAxFPQvpKfpJzQXM4uEobz0qHKnL2n79uLc="; }; patches = [ @@ -45,11 +44,9 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools + flit-core ]; - propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; @@ -59,6 +56,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "cairocffi" + ]; + meta = with lib; { changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; diff --git a/nixpkgs/pkgs/development/python-modules/canals/default.nix b/nixpkgs/pkgs/development/python-modules/canals/default.nix index 6832a3626132..ae4d8615c757 100644 --- a/nixpkgs/pkgs/development/python-modules/canals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canals/default.nix @@ -1,44 +1,31 @@ { lib , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchFromGitHub -# native build inputs , hatchling -# build input -, networkx -# check inputs -, pytestCheckHook -# optional dependencies -, pygraphviz -, requests , mkdocs-material , mkdocs-mermaid2-plugin , mkdocstrings +, networkx +, pygraphviz +, pytestCheckHook +, pythonOlder +, requests }: -let + +buildPythonPackage rec { pname = "canals"; - version = "0.2.2"; - optional-dependencies = { - graphviz = [ pygraphviz ]; - mermaid = [ requests ]; - docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ]; - }; -in -buildPythonPackage { - inherit version pname; + version = "0.6.0"; format = "pyproject"; - # Pypi source package doesn't contain tests + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "deepset-ai"; repo = pname; - rev = "v${version}"; - hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc="; + rev = "refs/tags/v${version}"; + hash = "sha256-s4nKPywfRn2hNhn/coWGqShv7D+MCEHblVzfweQJlnM="; }; - disabled = pythonOlder "3.8"; - nativeBuildInputs = [ hatchling ]; @@ -47,18 +34,37 @@ buildPythonPackage { networkx ]; - passthru = { inherit optional-dependencies; }; + passthru.optional-dependencies = { + graphviz = [ + pygraphviz + ]; + mermaid = [ + requests + ]; + docs = [ + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + ]; + }; nativeCheckInputs = [ pytestCheckHook - ] ++ optional-dependencies.mermaid; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ - # requires internet connection to mermaid.ink + # Test requires internet connection to mermaid.ink "test/pipelines/integration" ]; - pythonImportsCheck = [ "canals" ]; + disabledTests = [ + # Path issue + "test_draw_pygraphviz" + ]; + + pythonImportsCheck = [ + "canals" + ]; meta = with lib; { description = "A component orchestration engine"; diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index ce337cb8de3c..9507cad79502 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.23.1"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-jL02G4Z2Lhy/02Lb7aSUDEKg2h34UXJbwMFaDSPgc+U="; + hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery-types/default.nix b/nixpkgs/pkgs/development/python-modules/celery-types/default.nix index 753d7fcc677b..6379d041f160 100644 --- a/nixpkgs/pkgs/development/python-modules/celery-types/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery-types/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , poetry-core , pythonOlder @@ -18,10 +19,15 @@ buildPythonPackage rec { hash = "sha256-1OLUJxsuxG/sCKDxKiU4i7o5HyaJdIW8rPo8UofMI28="; }; - patchPhase = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # remove extraneous build dependencies: + # https://github.com/sbdchd/celery-types/pull/138 + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/sbdchd/celery-types/commit/ff83f06a0302084e1a690e2a5a8b25f2c0dfc6e7.patch"; + hash = "sha256-c68SMugg6Qk88FC842/czoxLpk0uVAVSlWsvo4NI9uo="; + }) + ]; propagatedBuildInputs = [ typing-extensions diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 1864b58d92d3..9a198ab21fc6 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.1"; + version = "5.3.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA="; + hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E="; }; propagatedBuildInputs = [ @@ -95,6 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; + changelog = "https://github.com/celery/celery/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cemm/default.nix b/nixpkgs/pkgs/development/python-modules/cemm/default.nix index 3036393344c9..9f9ae3b16be5 100644 --- a/nixpkgs/pkgs/development/python-modules/cemm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cemm/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytestCheckHook @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-BorgGHxoEeIGyJKqe9mFRDpcGHhi6/8IV7ubEI8yQE4="; }; + patches = [ + # https://github.com/klaasnicolaas/python-cemm/pull/360 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/klaasnicolaas/python-cemm/commit/1e373dac078f18563264e6733baf6a93962cac4b.patch"; + hash = "sha256-DVNn4BZwi8yNpKFmzt7YSYhzzB4vaAyrd/My8TtYzj0="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace '"0.0.0"' '"${version}"' \ @@ -39,6 +49,8 @@ buildPythonPackage rec { yarl ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 70601478b1bd..150a8e36747a 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.4"; + version = "2.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gCq01lfAoKoS74C8gjj84mZpXDMtdNVaRLwhlEXwiPI="; + hash = "sha256-D25deUPMWc6KRlwytSfZqoPeJGmTV304slUP9gCyrUw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 02998caec37c..8b5ff73d1faa 100644 --- a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.4.1"; + version = "0.4.2"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-JDkTSJi7QltKAdgkM+aJ33DP2emOAviyCqI/jeapUB8="; + hash = "sha256-RBXEumw5A/XzB/LazUcvq8JM/Ahvcy9lCTYKpGcY7go="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix index ffc02aa60480..8f6fdc18509f 100644 --- a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "9.5.2"; + version = "9.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-utils"; rev = "refs/tags/${version}"; - hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo="; + hash = "sha256-/zgHgD2kf3ZG7Mu9AEBfOwqpcD0Ye0LVrFxLeuGurCM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 8ebadc186df2..d71fc9266d2d 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/Ou2Kl7Fw5QpzoibNOKJPnAwRsR3EDtYypCrOQc7yjI="; + hash = "sha256-CDFZ6CN3pqNpwigYVHyKxwpa9iPfl4m/XDAo1YSRir8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index cfca0e49e379..a8aa9cbfbc60 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.65"; + version = "9.2.66"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-reJRy2KNk4YrkPkVH7eitMVS7V9MPTZNjo9+Wmgx5vQ="; + hash = "sha256-/LDVpw1Ej2YuzwA2qUoZv/ajQZPL9dDvvawj9r5bGbo="; }; nativeBuildInputs = [ @@ -74,6 +74,8 @@ buildPythonPackage rec { "test_plt_full_relro" # Test fails "test_tls_pe_incorrect_tls_data_start" + "test_x86" + "test_x86_64" # The required parts is not present on Nix "test_remote_file_map" ]; diff --git a/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix b/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix new file mode 100644 index 000000000000..b0ddaef004b9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, click-odoo +, fetchPypi +, importlib-resources +, lib +, manifestoo-core +, nix-update-script +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "click-odoo-contrib"; + version = "1.16.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VFoS/lOw/jbJNj9xfgZHKzR6JDTwnlCAItq4mZ3RA6I="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click-odoo + manifestoo-core + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + pythonImportsCheck = [ "click_odoo_contrib" ]; + + meta = with lib; { + description = "Collection of community-maintained scripts for Odoo maintenance"; + homepage = "https://github.com/acsone/click-odoo-contrib"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix b/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix new file mode 100644 index 000000000000..a618359735f1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, click +, fetchPypi +, lib +, nix-update-script +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "click-odoo"; + version = "1.6.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zyfgsHzIoz4lnqANe63b2oqgD/oxBbTbJYEedfSHWQ8="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Odoo scripting helper library"; + homepage = "https://github.com/acsone/click-odoo"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/nixpkgs/pkgs/development/python-modules/clintermission/default.nix index c84fd16f823c..9b439fa16084 100644 --- a/nixpkgs/pkgs/development/python-modules/clintermission/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clintermission/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "clintermission"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sebageek"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HPeO9K91a0MacSUN0SR0lPEWRTQgP/cF1FZaNvZLxAg="; + hash = "sha256-e7C9IDr+mhVSfU8lMywjX1BYwFo/qegPNzabak7UPcY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index 042091634481..f11a1cff485e 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1p0Lrx4uirgyhE8cdhrSOJLBSN11f6X5WqdWtVutDzQ="; + hash = "sha256-Bw1RhYFTz1bw+4APZKTyWP/G+LWB3R9WI/QEduEgWTQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/nixpkgs/pkgs/development/python-modules/cloup/default.nix index d5502d9a9fa2..d23b27833bfc 100644 --- a/nixpkgs/pkgs/development/python-modules/cloup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloup/default.nix @@ -5,18 +5,19 @@ , click , setuptools-scm , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "cloup"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ur1L3P0nT4Z3nW0845ueoPbMWrPU7+NbpoQebW0DeJM="; + hash = "sha256-4ItMwje7mlvY/4G6btSUmOIgDaw5InsWSOlXiCAo6ZM="; }; nativeBuildInputs = [ @@ -25,6 +26,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ click + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix b/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix index 213a57ff0621..c0122a0d3d9d 100644 --- a/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix @@ -12,11 +12,11 @@ let pname = "clr-loader"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { pname = "clr_loader"; inherit version; - hash = "sha256-gu1ftlRynRT9iCludLtrhOss+5dv9LfUnU5En9eKIms="; + hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4="; }; # This buildDotnetModule is used only to get nuget sources, the actual diff --git a/nixpkgs/pkgs/development/python-modules/cmake/default.nix b/nixpkgs/pkgs/development/python-modules/cmake/default.nix new file mode 100644 index 000000000000..c9ee7d11c8fb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmake/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, flit-core +, cmake +}: + +buildPythonPackage rec { + pname = "cmake"; + inherit (cmake) version; + format = "pyproject"; + + src = ./stub; + + postUnpack = '' + substituteInPlace "$sourceRoot/pyproject.toml" \ + --subst-var version + + substituteInPlace "$sourceRoot/cmake/__init__.py" \ + --subst-var version \ + --subst-var-by CMAKE_BIN_DIR "${cmake}/bin" + ''; + + inherit (cmake) setupHooks; + + nativeBuildInputs = [ + flit-core + ]; + + pythonImportsCheck = [ + "cmake" + ]; + + meta = with lib; { + description = "CMake is an open-source, cross-platform family of tools designed to build, test and package software"; + longDescription = '' + This is a stub of the cmake package on PyPI that uses the cmake program + provided by nixpkgs instead of downloading cmake from the web. + ''; + homepage = "https://github.com/scikit-build/cmake-python-distributions"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py b/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py new file mode 100644 index 000000000000..512a13f3d94a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py @@ -0,0 +1,19 @@ +import os +import subprocess +import sys + +__version__ = '@version@' + +CMAKE_BIN_DIR = '@CMAKE_BIN_DIR@' + +def _program(name, args): + return subprocess.call([os.path.join(CMAKE_BIN_DIR, name)] + args, close_fds=False) + +def cmake(): + raise SystemExit(_program('cmake', sys.argv[1:])) + +def cpack(): + raise SystemExit(_program('cpack', sys.argv[1:])) + +def ctest(): + raise SystemExit(_program('ctest', sys.argv[1:])) diff --git a/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml b/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml new file mode 100644 index 000000000000..f5c0502a3b7f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml @@ -0,0 +1,13 @@ +[build-system] +requires = ["flit_core"] +build-backend = "flit_core.buildapi" + +[project] +name = "cmake" +version = "@version@" +description = "CMake is an open-source, cross-platform family oftools designed to build, test and package software" + +[project.scripts] +cmake = "cmake:cmake" +cpack = "cmake:cpack" +ctest = "cmake:ctest" diff --git a/nixpkgs/pkgs/development/python-modules/cobs/default.nix b/nixpkgs/pkgs/development/python-modules/cobs/default.nix new file mode 100644 index 000000000000..4ea171d94291 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cobs/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "cobs"; + version = "1.2.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2TsQtTcNyIaJYK77cK2x9zpOYQexaRgwekru79PtuPY="; + }; + + checkPhase = '' + runHook preCheck + + python -m cobs.cobs.test + python -m cobs.cobsr.test + + runHook postCheck + ''; + + pythonImportsCheck = [ + "cobs" + "cobs.cobs" + "cobs.cobsr" + ]; + + meta = with lib; { + description = "Python functions for encoding and decoding COBS"; + longDescription = '' + COBS is a method of encoding a packet of bytes into a form that contains no bytes with value zero (0x00). The input packet of bytes can contain bytes in the full range of 0x00 to 0xFF. The COBS encoded packet is guaranteed to generate packets with bytes only in the range 0x01 to 0xFF. Thus, in a communication protocol, packet boundaries can be reliably delimited with 0x00 bytes. + ''; + homepage = "https://github.com/cmcqueen/cobs-python/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/nixpkgs/pkgs/development/python-modules/coconut/default.nix index 06fe43806354..07e070d0493e 100644 --- a/nixpkgs/pkgs/development/python-modules/coconut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.2.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; + hash = "sha256-u1tcIu0U1VZrUx2hVdtRDv1N4jVf176kQSw47/7lOXY="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; diff --git a/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 34df37e4db9f..29ec01f23823 100644 --- a/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , poetry-core , pythonOlder @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-9hFDj0Cd/F1aChU6WFNJ9agLFpxxArWZTZmZ7PhECGY="; }; + patches = [ + # https://github.com/cohere-ai/cohere-python/pull/289 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/cohere-ai/cohere-python/commit/e86480336331c0cf6f67e26b0825467dfca5b277.patch"; + hash = "sha256-P1Ioq5ypzT3tx6cxrI3ep34Fi4cUx88YkfJ5ErN3VHk="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index ca1dd48a9df5..b426de499aa0 100644 --- a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.10.19"; + version = "2023.8.24.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-sXWcnl6E2Aw78Y4JPpTQlRmhRP6egl6eo81N2PIhi34="; + hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index b5400b185f31..98c6492194c2 100644 --- a/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , click , fetchPypi -, intbitset , pytest-xdist , pytestCheckHook , pythonAtLeast @@ -14,26 +13,20 @@ , saneyaml , setuptools-scm , text-unidecode -, typing }: buildPythonPackage rec { pname = "commoncode"; - version = "31.0.2"; + version = "31.0.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UWd8fTHVEC5ywETfMIWjfXm4xiNaMrVpwkQ/woeXc0k="; + hash = "sha256-ura55/m/iesqN6kSYmdHB1sbthSHXaFWiQ76wVmyl0E="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "intbitset >= 2.3.0, < 3.0" "intbitset >= 2.3.0" - ''; - dontConfigure = true; nativeBuildInputs = [ @@ -44,12 +37,9 @@ buildPythonPackage rec { attrs beautifulsoup4 click - intbitset requests saneyaml text-unidecode - ] ++ lib.optionals (pythonOlder "3.7") [ - typing ]; nativeCheckInputs = [ @@ -83,7 +73,8 @@ buildPythonPackage rec { meta = with lib; { description = "A set of common utilities, originally split from ScanCode"; homepage = "https://github.com/nexB/commoncode"; + changelog = "https://github.com/nexB/commoncode/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cookies/default.nix b/nixpkgs/pkgs/development/python-modules/cookies/default.nix index a4e35dac346a..3f0d64c0c22d 100644 --- a/nixpkgs/pkgs/development/python-modules/cookies/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cookies/default.nix @@ -1,15 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "cookies"; version = "2.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + hash = "sha256-1raYeIyuTPpOYu+GQ6nKMyt5vZbLMUKUuGSujX6z7o4="; }; - doCheck = false; + patches = [ + (fetchpatch { + name = "fix-deprecations.patch"; + url = "https://gitlab.com/sashahart/cookies/-/commit/22543d970568d577effe120c5a34636a38aa397b.patch"; + hash = "sha256-8e3haOnbSXlL/ZY4uv6P4+ABBKrsCjbEpsLHaulbIUk="; + }) + ]; + + nativeBuildInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://gitlab.com/sashahart/cookies/-/issues/6 + "test_encoding_assumptions" + ]; meta = with lib; { description = "Friendlier RFC 6265-compliant cookie parser/renderer"; diff --git a/nixpkgs/pkgs/development/python-modules/coredis/default.nix b/nixpkgs/pkgs/development/python-modules/coredis/default.nix index 13fbe5ab123d..9185fe48bb9d 100644 --- a/nixpkgs/pkgs/development/python-modules/coredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.15.1"; + version = "4.16.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9nojHufUt53Ovoos4gaR7qh1xN8D1+gJOEyFsOndXJU="; + hash = "sha256-7qpoNc5/z8/EKtGWULrPPwfH9swYe9TqqUL+zxrFQSk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cose/default.nix b/nixpkgs/pkgs/development/python-modules/cose/default.nix new file mode 100644 index 000000000000..c591677b5316 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cose/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, attrs +, cbor2 +, certvalidator +, cryptography +, ecdsa +, setuptools +}: + +buildPythonPackage rec { + pname = "cose"; + version = "1.0.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "TimothyClaeys"; + repo = "pycose"; + rev = "v${version}"; + hash = "sha256-8d6HebWlSKgx7dmOnT7ZZ5mrMfg6mNWhz1hHPv75XF4="; + }; + + propagatedBuildInputs = [ + attrs + cbor2 + certvalidator + cryptography + ecdsa + setuptools + ]; + + pythonImportsCheck = [ "pycose" ]; + + meta = with lib; { + description = "A Python implementation of the COSE specification"; + homepage = "https://github.com/TimothyClaeys/pycose"; + license = licenses.bsd3; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix index ac36041deb2b..4a17769e18e8 100644 --- a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix +++ b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "curtsies"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YtEPNJxVOEUwZVan8mY86WsJjYxbvEDa7Hpu7d4WIrA="; + hash = "sha256-br4zIVvXyShRpQYEnHIMykz1wZLBZlwdepigTEcCdg4="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Curses-like terminal wrapper, with colored strings!"; homepage = "https://github.com/bpython/curtsies"; + changelog = "https://github.com/bpython/curtsies/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; broken = stdenv.isDarwin; diff --git a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index b6bbf7b2dfc6..d13bef9f0bd1 100644 --- a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.0.1"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GCY7M0XnVsGyuADSq/EzOy9fged5frj+hRDLhs2Uq8I="; + hash = "sha256-pRYjpmHhsw03b87YjS8YMmkQNwfcihp/bk56LFn55AU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index bc8a5df2ed17..70cd89afdcad 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -37,11 +37,12 @@ buildPythonPackage rec { export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" # install "." instead of "*.whl" - ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache + pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache ''; nativeBuildInputs = [ pari + python.pythonForBuild.pkgs.pip ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index d9b16bcc069a..8b8ca7a7208b 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c="; + hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix index 446fdaf07b31..a971509ca823 100644 --- a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "datadiff"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE="; + hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws="; }; # Tests are not part of the PyPI releases diff --git a/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix b/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix index af221199c910..539c3324204e 100644 --- a/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix @@ -1,39 +1,55 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, loguru , mbstrdecoder -, typepy , pytestCheckHook +, pythonOlder +, tcolorpy , termcolor +, typepy }: buildPythonPackage rec { pname = "dataproperty"; - version = "0.55.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44="; + rev = "refs/tags/v${version}"; + hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8="; }; - propagatedBuildInputs = [ mbstrdecoder typepy ]; + propagatedBuildInputs = [ + mbstrdecoder + typepy + tcolorpy + ] ++ typepy.optional-dependencies.datetime; + + passthru.optional-dependencies = { + logging = [ + loguru + ]; + }; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ termcolor ]; + nativeCheckInputs = [ + pytestCheckHook + termcolor + ]; - # Tests fail, even on non-nixos - pytestFlagsArray = [ - "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal" + pythonImportsCheck = [ + "dataproperty" ]; meta = with lib; { + description = "Library for extracting properties from data"; homepage = "https://github.com/thombashi/dataproperty"; - description = "A library for extracting properties from data"; - maintainers = with maintainers; [ genericnerdyusername ]; + changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/nixpkgs/pkgs/development/python-modules/datasets/default.nix index 6e02e4abe3a1..eae7b663dd99 100644 --- a/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -21,23 +21,18 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.12.0"; + version = "2.14.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-o/LUzRmpM4tjiCh31KoQXzU1Z/p/91uamh7G4SGnxQM="; + hash = "sha256-2XC5k546JvqUV4xeL1SRQOHDzItL1CE3bJQMjva3IkY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "responses<0.19" "responses" - ''; - propagatedBuildInputs = [ aiohttp dill @@ -56,10 +51,10 @@ buildPythonPackage rec { importlib-metadata ]; - # Tests require pervasive internet access. + # Tests require pervasive internet access doCheck = false; - # Module import will attempt to create a cache directory. + # Module import will attempt to create a cache directory postFixup = "export HF_MODULES_CACHE=$TMPDIR"; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index 73d41944702b..e927665bdc85 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { "click" "mashumaro" "networkx" + "logbook" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index c65d1b032f44..28c4df0a62a2 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.93.0"; + version = "1.94.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+L9V9Uk5VRucp3r9zrywXzJOfY/9aeWMep6MTiwngVI="; + hash = "sha256-Ttz6AX/NH6/NNLgU2cMSb5e1jV/cq0LGW3ENARRP7H4="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/nixpkgs/pkgs/development/python-modules/debianbts/default.nix b/nixpkgs/pkgs/development/python-modules/debianbts/default.nix new file mode 100644 index 000000000000..b2c2b271d61d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/debianbts/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pysimplesoap +, pytest , pytest-xdist +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "python-debianbts"; + version = "4.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0817d593ccdfb58a5f37b8cb3873bd0b2268b434f2798dc75b206d7550fdf04"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ pysimplesoap ]; + checkInputs = [ + pytest + pytest-xdist + ]; + + meta = with lib; { + description = "Python interface to Debian's Bug Tracking System"; + homepage = "https://github.com/venthur/python-debianbts"; + downloadPage = "https://pypi.org/project/python-debianbts/"; + changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.nicoo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index eff66b360715..2a937c9f41a2 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -5,6 +5,7 @@ , pythonAtLeast , fetchFromGitHub , substituteAll +, fetchpatch , gdb , django , flask @@ -49,6 +50,13 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + + # Support disabling process timeouts when set to 0 + # See https://github.com/microsoft/debugpy/pull/1286 + (fetchpatch { + url = "https://github.com/microsoft/debugpy/commit/1569cc8319350afcc5ba8630660f599d514ac3bb.patch"; + hash = "sha256-v4GKLb2M20F1egAGtix9cTkSzBnvSgSSphSQST5p63w="; + }) ] ++ lib.optionals stdenv.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { @@ -91,11 +99,8 @@ buildPythonPackage rec { ]; preCheck = '' - # Scale default timeouts by a factor of 4 to avoid flaky builds - # https://github.com/microsoft/debugpy/pull/1286 if merged would - # allow us to disable the timeouts altogether - export DEBUGPY_PROCESS_SPAWN_TIMEOUT=60 - export DEBUGPY_PROCESS_EXIT_TIMEOUT=20 + export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 + export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 6fea3e2c28d2..fc52b3b9fc5b 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.8.0"; + version = "2023.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,11 +34,12 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FvNh7gfxUR1iIUY3kMolhzcbWupQL39E9JXWip8bdrQ="; + hash = "sha256-HJyqDi5MqxEjAWWv8ZqNGAzeFn5rZGPwiDz5KaCm6Xk="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace "versioneer[toml]==" "versioneer[toml]>=" \ --replace 'dynamic = ["version"]' 'version = "${version}"' ''; @@ -46,7 +47,7 @@ buildPythonPackage rec { setuptools setuptools-scm versioneer - ]; + ] ++ versioneer.optional-dependencies.toml; propagatedBuildInputs = [ click diff --git a/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix index 2c0b399e3c52..6ac924227f1a 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dj-database-url"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o1qfD0N3XKb5DYGdxFYjPve8x2tHN31dkIt1x+syBiQ="; + hash = "sha256-8gQs7+EIblOcnaOfrVrX9hFzv3lmXmm/fk3lX6iLE18="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix b/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix index e8561e69df52..795a86d34bf2 100644 --- a/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.7"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Onk9T+QKsl8y68eJ2ikrUEeMc9ljzzvSw7cjjP4D3sE="; + hash = "sha256-VV7mb3501aZVuXUqzVqQYUttvkYa4pAECYWn7HksOmI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix b/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix index 536d851a4099..d4eab102d719 100644 --- a/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix @@ -27,8 +27,10 @@ buildPythonPackage rec { hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig="; }; + # remove this when upstream releases a new version > 0.19.0 postPatch = '' substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core>=1.5.2" \ --replace "poetry.masonry.api" "poetry.core.masonry.api" ''; diff --git a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix index 5fd29de16107..b77af5e47491 100644 --- a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,26 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub - -# native , setuptools-scm - -# propagated , django - -# tests , python +, pythonOlder }: buildPythonPackage rec { pname = "django-widget-tweaks"; - version = "1.4.12"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { # package from Pypi missing runtests.py + src = fetchFromGitHub { owner = "jazzband"; repo = pname; - rev = version; - sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; + rev = "refs/tags/${version}"; + hash = "sha256-/3UIsg75X3R9YGv9cEcoPw3IN2vkhUb+HCy68813d2E="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,11 +36,10 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Tweak the form field rendering in templates, not in python-level form definitions."; + description = "Tweak the form field rendering in templates, not in python-level form definitions"; homepage = "https://github.com/jazzband/django-widget-tweaks"; + changelog = "https://github.com/jazzband/django-widget-tweaks/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ - maxxk - ]; + maintainers = with maintainers; [ maxxk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index 04ea80c1a83c..b1b088c44c07 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; rev = "refs/tags/v${version}"; - hash = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; + hash = "sha256-aUz+f8Q7RwQsoRpjq1AAmNtDzTA6KKxyc+MtBJEfyL8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 8e26e9c6e4ef..cb5c3478d910 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cryptography , django , djangorestframework , fetchPypi @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.2.2"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - hash = "sha256-0n1LysLGOU9njeqLTQ1RHG4Yp/Lriq7rin3mAa63fEI="; + hash = "sha256-jkxd/KjRHAuKZt/YpOP8HGqn6hiNEJB/+RyUL0tS7WY="; }; nativeBuildInputs = [ @@ -30,9 +31,17 @@ buildPythonPackage rec { django djangorestframework pyjwt - python-jose ]; + passthru.optional-dependencies = { + python-jose = [ + python-jose + ]; + crypto = [ + cryptography + ]; + }; + # Test raises django.core.exceptions.ImproperlyConfigured doCheck = false; @@ -43,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Web Token authentication plugin for Django REST Framework"; homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; + changelog = "https://github.com/jazzband/djangorestframework-simplejwt/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ arnoldfarkas ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index 2a12ca816f45..8c6692d7c8f4 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.5"; + version = "1.21.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI="; + hash = "sha256-TDuTBos9/KaWmrERFV5N1vey1oC5h3jej9Rgt4N72w0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/drms/default.nix b/nixpkgs/pkgs/development/python-modules/drms/default.nix index 739cf1bf505b..913e069f4fbe 100644 --- a/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -5,10 +5,12 @@ , pandas , six , astropy +, oldest-supported-numpy , pytestCheckHook , pytest-doctestplus , pythonOlder , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -23,7 +25,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + numpy + oldest-supported-numpy setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix b/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix index 6f38f7264e68..6a4afe7a577a 100644 --- a/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -2,19 +2,24 @@ , fetchFromGitHub , lib , setuptools -, requests +, aiofiles , click +, h2 +, httpx +, lxml +, requests +, socksio }: buildPythonPackage rec { pname = "duckduckgo-search"; - version = "2.8.5"; + version = "3.8.5"; src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; rev = "v${version}"; - hash = "sha256-UXh3+kBfkylt5CIXbYTa/vniEETUvh4steUrUg5MqYU="; + hash = "sha256-FOGMqvr5+O3+UTdM0m1nJBAcemP6hpAOXv0elvnCUHU="; }; format = "pyproject"; @@ -22,9 +27,16 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - requests + aiofiles click - ]; + h2 + httpx + lxml + requests + socksio + ] ++ httpx.optional-dependencies.brotli + ++ httpx.optional-dependencies.http2 + ++ httpx.optional-dependencies.socks; pythonImportsCheck = [ "duckduckgo_search" ]; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 2c6687f9bbc0..60f7c588eaa3 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.16.0"; + version = "3.17.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LbSmyNgRFejDGHurzDJvJxuhjPuRPDJ1t6T6p3f6UQk="; + hash = "sha256-MFwmER2BmSKqisgLvnLY3aFoRuzeObE7lr5JOesJdXE="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index a732f24fabbe..7f07a851fe38 100644 --- a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.15.2"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Z1e6CrpVjQoR/OIqqxbbC75SZtOqi4Rrbld2doenOMA="; + hash = "sha256-VxZXZhbKtym1ow/dU3G4yu4X1GwCsXzcau/YocertzY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix b/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix index 24abd9d47a95..0cb49cd6486e 100644 --- a/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, wheel , aiohttp }: @@ -17,8 +18,15 @@ buildPythonPackage rec { hash = "sha256-RFfS0xzRXoM6ETXmviiMPxffPzspjTqpkvHOlTJXN9g="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools~=65.6" "setuptools" \ + --replace "wheel~=0.37.1" "wheel" + ''; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/events/default.nix b/nixpkgs/pkgs/development/python-modules/events/default.nix index 6fe355d9c4d8..f4e9dcd250f0 100644 --- a/nixpkgs/pkgs/development/python-modules/events/default.nix +++ b/nixpkgs/pkgs/development/python-modules/events/default.nix @@ -1,17 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "Events"; - version = "0.4"; + pname = "events"; + version = "0.5"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyeve"; + repo = "events"; + rev = "refs/tags/v${version}"; + hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "events" + ]; + + pytestFlagsArray = [ + "events/tests/tests.py" + ]; + meta = with lib; { - homepage = "https://events.readthedocs.org"; description = "Bringing the elegance of C# EventHanlder to Python"; + homepage = "https://events.readthedocs.org"; + changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 470d17deeba1..b7d4cda7df7c 100644 --- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.0.3"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oQ09/CvHIA4PAVqK6DeY3slHvQ1aPRqCC6ZuhubTN94="; + hash = "sha256-WKQgfmEbil55WO3tWVq4n9wiJNw0Op/jbI7xt5vtKpA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix b/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix index b3ecf7a3fce2..dea302fb8f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix +++ b/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix @@ -6,25 +6,37 @@ , igraph , pygments , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE="; + sha256 = "sha256-0U5n7e/utmgOTBuTypkBMeHZR7lji6lFimSjbC7hVRM="; }; nativeBuildInputs = [ antlr4 + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # antlr output is rebuilt in postPatch step. + "antlr4-python3-runtime" + # igraph > 0.10.4 was marked as incompatible by upstream + # due to regression introduced in 0.10.5, which was fixed + # in igraph 0.10.6. + # + # https://github.com/igraph/python-igraph/issues/693 + "igraph" ]; postPatch = '' - sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 ''; diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index 71c700bdfe0a..bdee002b5aad 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.12.1"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-sDHqBGRJQuAj2zB7hcIy3u5iNCxBHO1ub0eHxfgd7kI="; + hash = "sha256-t1C9fS0LU46J7y+rp2pTCVma09aFqzuBtslrlU+MS1E="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 48a4c483c9c3..c0c4b36d3439 100644 --- a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.95.1"; + version = "0.95.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-y6mP2w2d2oabM9bLtWRO/AdRA46LNhVrMB/0qxGxH7I="; + hash = "sha256-wD39CqUZOgwpG/NEGz/pXgQsadzUoM/elxfEXthOlHo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 593d677ca2f3..05cb76f1dd48 100644 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -3,8 +3,9 @@ , fetchFromGitHub , python , cython +, oldest-supported-numpy , setuptools -, substituteAll +, setuptools-scm , numpy , pandas , cramjam @@ -14,6 +15,7 @@ , pytestCheckHook , pythonOlder , packaging +, wheel }: buildPythonPackage rec { @@ -30,24 +32,23 @@ buildPythonPackage rec { hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ cython + oldest-supported-numpy setuptools - ]; - - patches = [ - (substituteAll { - src = ./version.patch; - inherit version; - }) + setuptools-scm + wheel ]; postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "oldest-supported-numpy" "numpy" + substituteInPlace pyproject.toml \ + --replace '"pytest-runner"' "" - sed -i '/"git", "status"/d' setup.py + sed -i \ + -e "/pytest-runner/d" \ + -e '/"git", "status"/d' setup.py ''; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch b/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch deleted file mode 100644 index 86d80e2a411b..000000000000 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/fastparquet/_version.py b/fastparquet/_version.py -new file mode 100644 -index 0000000..eb2c9c9 ---- /dev/null -+++ b/fastparquet/_version.py -@@ -0,0 +1 @@ -+__version__ = "@version@" diff --git a/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix index 32a6a1d60ca1..df494068c444 100644 --- a/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , re2 }: @@ -13,6 +14,16 @@ buildPythonPackage rec { sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf"; }; + patches = [ + # Bump stdlib to c++17 to fix build with recent re2 + # https://github.com/facebook/pyre2/issues/24 + # https://github.com/facebook/pyre2/pull/25 + (fetchpatch { + url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch"; + hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0="; + }) + ]; + buildInputs = [ re2 ]; # no tests in PyPI tarball diff --git a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix index c1bc4d5f2a42..819c7cc34df6 100644 --- a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix @@ -7,22 +7,24 @@ , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { pname = "fe25519"; - version = "1.4.2"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VwCw/sS8Pzhscoa6yCRGbB9X+CtRVn8xyBEpKfGyhhY="; + hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/filedepot/default.nix b/nixpkgs/pkgs/development/python-modules/filedepot/default.nix index a73c282c160f..b347a1a6bd19 100644 --- a/nixpkgs/pkgs/development/python-modules/filedepot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filedepot/default.nix @@ -2,10 +2,10 @@ , anyascii , buildPythonPackage , fetchFromGitHub +, fetchpatch , flaky , google-cloud-storage , mock -, paste , pillow , pymongo , pytestCheckHook @@ -28,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8="; }; + patches = [ + # Add support for Pillow 10, https://github.com/amol-/depot/pull/84 + (fetchpatch { + name = "support-pillow-10.patch"; + url = "https://github.com/amol-/depot/commit/bdb73d1b3898279068b421bc061ecc18c5108fa4.patch"; + hash = "sha256-7+VGrdJstkiy0bYAqA9FjF1NftZiurgyPd8Wlz6GUy8="; + }) + ]; + propagatedBuildInputs = [ anyascii google-cloud-storage @@ -36,7 +45,6 @@ buildPythonPackage rec { nativeCheckInputs = [ flaky mock - paste pillow pymongo pytestCheckHook @@ -45,6 +53,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # ModuleNotFoundError: No module named 'depot._pillow_compat' + "tests/test_fields_sqlalchemy.py" # The examples have tests "examples" # Missing dependencies (TurboGears2 and ming) diff --git a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index 18e483292885..6d079b66f149 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , flask , werkzeug }: @@ -9,6 +8,7 @@ buildPythonPackage rec { pname = "flask-reverse-proxy-fix"; version = "0.2.1"; + format = "setuptools"; # master fixes flask import syntax and has no major changes # new release requested: https://github.com/sublee/flask-silk/pull/6 @@ -16,15 +16,17 @@ buildPythonPackage rec { owner = "antarctica"; repo = "flask-reverse-proxy-fix"; rev = "v${version}"; - sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5"; + hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck="; }; - disabled = !isPy3k; - postPatch = '' sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py ''; + # This is needed so that setup.py does not add "devNone" to the version, + # after which setuptools throws an error for an invalid version. + env.CI_COMMIT_TAG = "v${version}"; + propagatedBuildInputs = [ flask werkzeug diff --git a/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix index 743cc2902b97..e18cc8579ba9 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -57,6 +57,11 @@ buildPythonPackage rec { hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; }; + postPatch = '' + # This should be removed after updating to version 5.3.0. + sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini + ''; + propagatedBuildInputs = [ blinker email-validator diff --git a/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix b/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix index 2be3f227baf7..7fe9ba92b638 100644 --- a/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; rev = "v${version}"; - hash = "sha256-4JhzrRnpb9+FYXd0S2XcBelaHuRksm8RC29rxZqtlpw="; + hash = "sha256-vKv3Hfla+U1teYVB+w8ONj0Ur996noanbg6aaJ6S6+I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/formulae/default.nix b/nixpkgs/pkgs/development/python-modules/formulae/default.nix index 9755fed90238..ab13f86dc18b 100644 --- a/nixpkgs/pkgs/development/python-modules/formulae/default.nix +++ b/nixpkgs/pkgs/development/python-modules/formulae/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook , numpy , pandas @@ -10,16 +11,20 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.3.4"; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bambinos"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-6IGTn3griooslN6+qRYLJiWaJhvsxa1xj1+1kQ57yN0="; + rev = "refs/tags/${version}"; + hash = "sha256-WDWpyrHXGBfheE0m5I9K+Dk1urXRMY6yoenN3OaZogM="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy pandas @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bambinos.github.io/formulae"; description = "Formulas for mixed-effects models in Python"; + changelog = "https://github.com/bambinos/formulae/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/fountains/default.nix b/nixpkgs/pkgs/development/python-modules/fountains/default.nix index 2f6b7cc94156..d6efde228fbd 100644 --- a/nixpkgs/pkgs/development/python-modules/fountains/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fountains/default.nix @@ -2,24 +2,26 @@ , buildPythonPackage , fetchPypi , setuptools +, wheel , bitlist , pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gYVguXMVrXxra/xy+R4RXVk9yDGKiKE8u3qWUk8sjt4="; + hash = "sha256-MhOQ4pemxmjfp7Uy5hLA8i8BBI5QbvD4EjEcKMM/u3I="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/funsor/default.nix b/nixpkgs/pkgs/development/python-modules/funsor/default.nix index a5250afff471..a08e2a6e4ebc 100644 --- a/nixpkgs/pkgs/development/python-modules/funsor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funsor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "funsor"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pyro-ppl"; repo = "funsor"; rev = "refs/tags/${version}"; - hash = "sha256-3JxnRlJN/kYstcIKt8cvDmqnp8oyoA4jkMBDVuAMa5Q="; + hash = "sha256-Prj1saT0yoPAP8rDE0ipBEpR3QMk4PS12VSJlxc22p8="; }; # Disable the tests that rely on downloading assets from the internet as well as the linting checks. diff --git a/nixpkgs/pkgs/development/python-modules/ge25519/default.nix b/nixpkgs/pkgs/development/python-modules/ge25519/default.nix index 689901ca4241..60bc2b5dbba1 100644 --- a/nixpkgs/pkgs/development/python-modules/ge25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ge25519/default.nix @@ -8,22 +8,24 @@ , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { pname = "ge25519"; - version = "1.4.3"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oOvrfRSpvwfCcmpV7FOxcBOW8Ex89d2+otjORrzX4o0="; + hash = "sha256-VKDPiSdufWwrNcZSRTByFU4YGoJrm48TDm1nt4VyclA="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/nixpkgs/pkgs/development/python-modules/geopy/default.nix index 1ca084d999cd..3a25b434c301 100644 --- a/nixpkgs/pkgs/development/python-modules/geopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800="; + hash = "sha256-3Sq76DcnoG0Uv/KPF/B3oep0MO96vemKiANjgR7/k/I="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/getjump/default.nix b/nixpkgs/pkgs/development/python-modules/getjump/default.nix index a3c4c4ffa6ec..b1a1b7005c09 100644 --- a/nixpkgs/pkgs/development/python-modules/getjump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/getjump/default.nix @@ -4,6 +4,7 @@ , fetchPypi , pillow , poetry-core +, pythonRelaxDepsHook , requests , rich }: @@ -20,6 +21,12 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # remove after https://github.com/eggplants/getjump/pull/123 is released + "pillow" ]; propagatedBuildInputs = [ @@ -33,6 +40,9 @@ buildPythonPackage rec { "getjump" ]; + # all the tests talk to the internet + doCheck = false; + meta = with lib; { description = "Get and save images from jump web viewer"; homepage = "https://github.com/eggplants/getjump"; diff --git a/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/nixpkgs/pkgs/development/python-modules/gevent/default.nix index 690c0b73e6ea..b21e40c7a600 100644 --- a/nixpkgs/pkgs/development/python-modules/gevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gevent/default.nix @@ -4,8 +4,11 @@ , isPyPy , python , libev +, cffi +, cython_3 , greenlet , setuptools +, wheel , zope_event , zope_interface , pythonOlder @@ -24,7 +27,11 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + cython_3 setuptools + wheel + ] ++ lib.optionals (!isPyPy) [ + cffi ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 110dddeb47b0..e96d6dff8e42 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.26.0"; + version = "3.27.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-L3YwBFpeGDPIixjvU7OLf8kpeYkqcSmLqMzGcSjtMtE="; + hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index e62472f6bb2a..7a2f0de78b21 100644 --- a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "2.2.5"; + version = "3.0.2"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-UMP4FMyS8nAZmN7oKBZhMbqTgi4bSR/JmIeyWaZRZis="; + hash = "sha256-NNHkcOCoG5Xagc0jTR50uHMA5mMgsh3BIzVJ77OEEjk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-re2/default.nix b/nixpkgs/pkgs/development/python-modules/google-re2/default.nix index e93b7251a25c..1528cb1a59e1 100644 --- a/nixpkgs/pkgs/development/python-modules/google-re2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-re2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.0"; + version = "1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IcitwpY2DeH/QmuqOMcS6tpiLChY0ZXrSH5BXZQZTpE="; + hash = "sha256-06lGfuUrRqx3ypKPbQy+rM/ZLwPKDw9lud9qlRhPOhw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix b/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix index 74d85d801f69..1fea3699d9f5 100644 --- a/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix @@ -3,6 +3,9 @@ , fetchFromGitHub , linear_operator , scikit-learn +, setuptools +, setuptools-scm +, wheel , torch , pytestCheckHook }: @@ -19,10 +22,13 @@ buildPythonPackage rec { hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'find_version("gpytorch", "version.py")' \"$version\" - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; propagatedBuildInputs = [ linear_operator @@ -33,7 +39,9 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "gpytorch" ]; + disabledTests = [ # AssertionError on number of warnings emitted "test_deprecated_methods" diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 3f4d5514f47e..361323ee17b1 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.34.0"; + version = "0.35.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kc+RL5ulV2VfB4ojgv/ZSupPy36kyOqbLBWHPiSpqkk="; + hash = "sha256-Sskz14aAPqUXhQjetPfhjVm8gjG4yrck3sHpgD37DPU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix index 1dadad2238d7..a940aa17de74 100644 --- a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , poetry-core , grpcio @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "grpc-interceptor"; - version = "0.15.2"; + version = "0.15.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +21,17 @@ buildPythonPackage rec { owner = "d5h-foss"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-zulK0SVehzHcrmgIyH0D5sUOiAN53eIg88IoVyF6/DA="; + hash = "sha256-tTi1X1r7584ZXa12eLp2G/Am8G6Dnd18eE5wF/Lp/EY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # https://github.com/d5h-foss/grpc-interceptor/pull/44 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/d5h-foss/grpc-interceptor/commit/916cb394acd8dd7abb4f5edcb4e88aee961a32d0.patch"; + hash = "sha256-W2SF2zyjusTxgvCxBDLpisD03bofzDug1eyd4FLJmKs="; + }) + ]; nativeBuildInputs = [ poetry-core @@ -37,6 +42,8 @@ buildPythonPackage rec { protobuf ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 6ac240e4b61e..9d05bf5e0930 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, flitBuildHook , google-auth , google-auth-oauthlib +, pytest-vcr +, pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "gspread"; - version = "5.9.0"; - format = "setuptools"; + version = "5.10.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NLl4NLvvrM9ySXcCuuJtEvltBoXkmkGK/mqSqbvLnJw="; + src = fetchFromGitHub { + owner = "burnash"; + repo = "gspread"; + rev = "refs/tags/v${version}"; + hash = "sha256-GAlQYQVuwsnkXqZOvG66f9kig+m392CVlrgUTqrTKyA="; }; + nativeBuildInputs = [ + flitBuildHook + ]; + propagatedBuildInputs = [ - requests google-auth google-auth-oauthlib + requests ]; - # No tests included - doCheck = false; + nativeCheckInputs = [ + pytest-vcr + pytestCheckHook + ]; pythonImportsCheck = [ "gspread" diff --git a/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/nixpkgs/pkgs/development/python-modules/gumath/default.nix index 41c0d2352c88..013662314b72 100644 --- a/nixpkgs/pkgs/development/python-modules/gumath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gumath/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , python , numba , ndtypes @@ -13,10 +14,26 @@ buildPythonPackage { pname = "gumath"; + format = "setuptools"; disabled = isPy27; inherit (libgumath) src version meta; + patches = [ + # https://github.com/xnd-project/gumath/pull/42 + (fetchpatch { + name = "remove-np-warnings-call.patch"; + url = "https://github.com/xnd-project/gumath/commit/83ab3aa3b07d55654b4e6e75e5ec6be8190fca97.patch"; + hash = "sha256-7lUXNVH5M+Go1iEu0bud03XI8cyGbdLNdLraMZplDaM="; + }) + (fetchpatch { + name = "remove-np-1.25-bartlett-test-assertion.patch"; + url = "https://github.com/xnd-project/gumath/commit/8741e31f2967ded08c96a7f0631e1e38fe813870.patch"; + hash = "sha256-flltk3RNPHalbcIV0BrkxWuhqqJBrycos7Fyv3P3mWg="; + }) + ]; + nativeCheckInputs = [ numba ]; + propagatedBuildInputs = [ ndtypes xnd ]; postPatch = '' @@ -42,6 +59,5 @@ buildPythonPackage { python test_xndarray.py popd ''; - } diff --git a/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix index 9926b3cfe915..6e9e33913fb7 100644 --- a/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix @@ -10,34 +10,67 @@ , farama-notifications , importlib-metadata , pythonOlder +, ffmpeg +, jax +, jaxlib +, matplotlib +, moviepy +, opencv4 +, pybox2d +, pygame +, pytestCheckHook +, scipy }: buildPythonPackage rec { pname = "gymnasium"; - version = "0.29.0"; + version = "0.29.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "Farama-Foundation"; - repo = pname; + repo = "gymnasium"; rev = "refs/tags/v${version}"; - hash = "sha256-4YaEFEWSOTEdGgO1kSOleZQp7OrcOf+WAT/E0BWeoKI="; + hash = "sha256-L7fn9FaJzXwQhjDKwI9hlFpbPuQdwynU+Xjd8bbjxiw="; }; - format = "pyproject"; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - jax-jumpy cloudpickle - numpy + farama-notifications gym-notices + jax-jumpy + numpy typing-extensions - farama-notifications ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; pythonImportsCheck = [ "gymnasium" ]; + nativeCheckInputs = [ + ffmpeg + jax + jaxlib + matplotlib + moviepy + opencv4 + pybox2d + pygame + pytestCheckHook + scipy + ]; + + disabledTestPaths = [ + # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. + "tests/envs/mujoco/test_mujoco_custom_env.py" + + # Those tests need to write on the filesystem which cause them to fail. + "tests/experimental/wrappers/test_record_video.py" + "tests/utils/test_save_video.py" + "tests/wrappers/test_record_video.py" + "tests/wrappers/test_video_recorder.py" + ]; + meta = with lib; { description = "A standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)"; homepage = "https://github.com/Farama-Foundation/Gymnasium"; diff --git a/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix index ca9a8dc5a2d7..385f28b4615a 100644 --- a/nixpkgs/pkgs/development/python-modules/gyp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix @@ -27,6 +27,12 @@ buildPythonPackage { pythonImportsCheck = [ "gyp" "gyp.generator" ]; + # Make mac_tool.py executable so that patchShebangs hook processes it. This + # file is copied and run by builds using gyp on macOS + preFixup = '' + chmod +x "$out/${python.sitePackages}/gyp/mac_tool.py" + ''; + meta = with lib; { description = "A tool to generate native build files"; homepage = "https://gyp.gsrc.io"; diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index d1bd71fa1c57..9aa76821650b 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.9"; + version = "2023.8.14"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PQ9KxKyTa9xiLa6suqHRem6Rs732djbjzFKKLZDUM/g="; + hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 96297616d7b6..9bc33f5c7e01 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.69.0"; + version = "0.70.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7FO/z5AseP80y74e4ivLXlwB9t5jJf2bCaNp6HfqZ1c="; + hash = "sha256-lELb39N5pAZFeANgzg5TBmC+gmY/wgXbE7wlvdlJe2A="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hdfs/default.nix b/nixpkgs/pkgs/development/python-modules/hdfs/default.nix index c00bd18640b6..45bd4faf4462 100644 --- a/nixpkgs/pkgs/development/python-modules/hdfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdfs/default.nix @@ -11,14 +11,13 @@ buildPythonPackage rec { pname = "hdfs"; - # See https://github.com/mtth/hdfs/issues/176. - version = "2.5.8"; + version = "2.7.2"; src = fetchFromGitHub { owner = "mtth"; repo = pname; - rev = version; - hash = "sha256-94Q3IUoX1Cb+uRqvsfpVZJ1koJSx5cQ3/XpYJ0gkQNU="; + rev = "refs/tags/v${version}"; + hash = "sha256-KXJDQEc4+T9r8sB41SOgcx8Gth3qAOZceoOpsLbJ+ak="; }; propagatedBuildInputs = [ docopt requests six ]; @@ -30,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and command line interface for HDFS"; homepage = "https://github.com/mtth/hdfs"; + changelog = "https://github.com/mtth/hdfs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index bae4dc5a71d9..a0833b20798e 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.2"; + version = "1.10.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zNhqiWYZ3tv6lwYgmi6Yue+mFcgk7Y1dDMbzWlsvVJM="; + hash = "sha256-77RrqmoCftPc48fFtuuFo0KqGX3n+6aDx2RFkwGCNzQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 2f384ab5c078..2cdb4b76df25 100644 --- a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.14"; + version = "1.0.15"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-2tJoIknqcwEvX2mQsrSEEh45pEMpNfeefuXVKSJTwig="; + hash = "sha256-wetkcHtm5O6mxhyU3/E4yrv6UGHAdKUlae2wJdCXtJI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ical/default.nix b/nixpkgs/pkgs/development/python-modules/ical/default.nix index 2f539c87524d..da27462cc50b 100644 --- a/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo="; + hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/nixpkgs/pkgs/development/python-modules/idasen/default.nix index e4792be41690..8ce6928b9057 100644 --- a/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , bleak , pyyaml , voluptuous @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.9.6"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,17 +21,9 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk="; + hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E="; }; - patches = [ - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/newAM/idasen/commit/b9351d5c9def0687e4ae4cb65f38d14ed9ff2df5.patch"; - hash = "sha256-Qi3psPZExJ5tBJ4IIvDC3JnWf4Gym6Z7akGCV8GZUNY="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix index 3e5db5b39678..7c7542252601 100644 --- a/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, chardet +, charset-normalizer +, dsinternals , fetchPypi , flask , ldapdomaindump @@ -14,18 +15,19 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uOsCCiy7RxRmac/jHGS7Ln1kmdBJxJPWQYuXFvXHRYM="; + hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; }; propagatedBuildInputs = [ - chardet + charset-normalizer + dsinternals flask ldapdomaindump pyasn1 @@ -45,8 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "Network protocols Constructors and Dissectors"; homepage = "https://github.com/SecureAuthCorp/impacket"; + changelog = "https://github.com/fortra/impacket/releases/tag/impacket_" + + replaceStrings [ "." ] [ "_" ] version; # Modified Apache Software License, Version 1.1 license = licenses.free; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/installer/default.nix b/nixpkgs/pkgs/development/python-modules/installer/default.nix index 02934550273b..d4f1e33ca606 100644 --- a/nixpkgs/pkgs/development/python-modules/installer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/installer/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , flit-core +, installer , mock }: @@ -21,10 +22,26 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - nativeCheckInputs = [ - pytestCheckHook - mock - ]; + # We need to disable tests because this package is part of the bootstrap chain + # and its test dependencies cannot be built yet when this is being built. + doCheck = false; + + passthru.tests = { + pytest = buildPythonPackage { + pname = "${pname}-pytest"; + inherit version; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + installer + mock + pytestCheckHook + ]; + }; + }; meta = with lib; { description = "A low-level library for installing a Python package from a wheel distribution"; diff --git a/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix index b3c912551d48..1ac7fdd3cf75 100644 --- a/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -1,7 +1,7 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub +, flit-core , pythonOlder , python , py-multiaddr @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "ipfshttpclient"; version = "0.8.0a2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -32,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-multiaddr requests @@ -85,7 +89,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipfshttpclient" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A python client library for the IPFS API"; homepage = "https://github.com/ipfs-shipyard/py-ipfs-http-client"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix b/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix index 05fdb6e85882..85961b450ec1 100644 --- a/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix @@ -20,6 +20,16 @@ buildPythonPackage rec { hash = "sha256-+cOUBoG8ODgzkPjEbqXYRF1uEcbaZITDfYnfWuHawTE="; }; + # We relax dependencies here instead of pulling in a patch because upstream + # has released a new version using hatch-jupyter-builder, but it is not yet + # trivial to upgrade to that. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*",' "" \ + --replace 'jupyter_packaging~=' 'jupyter_packaging>=' + ''; + nativeBuildInputs = [ jupyter-packaging ]; propagatedBuildInputs = [ ipywidgets numpy pillow ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix index a126030d0cb1..2f711f92a087 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix @@ -21,7 +21,18 @@ buildPythonPackage rec { hash = "sha256-kym7949VI6C+62p3IOQ2QIzWnuSBcrmySb83oqUwhjI="; }; - nativeBuildInputs = [ hatchling hatch-jupyter-builder ]; + # We do not need the jupyterlab build dependency, because we do not need to + # build any JS components; these are present already in the PyPI artifact. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*",' "" + ''; + + nativeBuildInputs = [ + hatchling + hatch-jupyter-builder + ]; propagatedBuildInputs = [ ipywidgets jupyter-ui-poll ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index 272a192e3ada..509b70b7fd3a 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -28,6 +28,14 @@ buildPythonPackage rec { hash = "sha256-o5ql75VgFwvw6a/typ/wReG5wYMsSTAzd+3Mkc6p+3c="; }; + # We do not need the jupyterlab build dependency, because we do not need to + # build any JS components; these are present already in the PyPI artifact. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab>=3.0.0,==3.*",' "" + ''; + nativeBuildInputs = [ hatchling ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix b/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix index 6e05a3a36f0a..4aad3219eb52 100644 --- a/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix @@ -27,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc="; }; + # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if + # jupyterlab can be updated upstream. (From commits, it looks like it was + # set to this version on purpose.) In the meantime, the build still works. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0' + ''; + nativeBuildInputs = [ jupyter-packaging jupyterlab diff --git a/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/nixpkgs/pkgs/development/python-modules/jedi/default.nix index d12691c177f0..5f802767c83a 100644 --- a/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub , attrs @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.18.2"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - hash = "sha256-hNRmUFpRzVKJQAtfsSNV4jeTR8vVj1+mGBIPO6tUGto="; + hash = "sha256-Hw0+KQkB9ICWbBJDQQmHyKngzJlJ8e3wlpe4aSrlkvo="; fetchSubmodules = true; }; @@ -43,16 +42,6 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # disabled until 3.11 is added to _SUPPORTED_PYTHONS in jedi/api/environment.py - "test_find_system_environments" - - # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved - "test_interpreter" - "test_scanning_venvs" - "test_create_environment_venv_path" - "test_create_environment_executable" - "test_venv_and_pths" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix b/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix index 65f385db922f..5afe54567cb4 100644 --- a/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -1,20 +1,40 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPy3k , pytest , unicodecsv +, rustPlatform +, libiconv }: buildPythonPackage rec { pname = "jellyfish"; - version = "0.9.0"; + version = "1.0.0"; disabled = !isPy3k; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; + hash = "sha256-iBquNnGZm7B85QwnaW8pyn6ELz4SOswNtlJcmZmIG9Q="; + }; + + nativeBuildInputs = with rustPlatform; [ + maturinBuildHook + cargoSetupHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}-rust-dependencies"; + hash = "sha256-Grk+n4VCPjirafcRWWI51jHw/IFUYkBtbXY739j0MFI="; }; nativeCheckInputs = [ pytest unicodecsv ]; diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 5d8e36519e8c..05f857641b66 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "5.0.3"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-9SrFF1QAEpbS5WWBhOA1p8/YyToSbUb69vINUMQ1cug="; + hash = "sha256-+zrsfyi4I8venFGMKXDMUq+9+f7y6IY59y1/OJDExGs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix b/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix index f6f0ddf77cba..b75020c0e5bf 100644 --- a/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "json-tricks"; - version = "3.17.2"; + version = "3.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mverleg"; repo = "pyjson_tricks"; rev = "refs/tags/v${version}"; - hash = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; + hash = "sha256-xddMc4PvVI+mqB3eeVqECZmdeSKAURsdbOnUAXahqM0="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/json5/default.nix b/nixpkgs/pkgs/development/python-modules/json5/default.nix index d1c3ccb9ea0a..b6a54dccc73d 100644 --- a/nixpkgs/pkgs/development/python-modules/json5/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json5/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.9"; + version = "0.9.14"; src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; rev = "v${version}"; - hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs="; + hash = "sha256-cshP1kraLENqWuQTlm4HPAP/0ywRRLFOJI8mteWcjR4="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix index 383df6e2652e..00205eb1907a 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix @@ -1,21 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonpath"; - version = "0.82"; + version = "0.82.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4"; + hash = "sha256-2H7yvLze1o7pa8NMGAm2lFfs7JsMTdRxZYoSvTkQAtE="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonpath" + ]; + + pytestFlagsArray = [ + "test/test*.py" + ]; + meta = with lib; { description = "An XPath for JSON"; homepage = "https://github.com/json-path/JsonPath"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix index b34bb4435d0c..613d4478af87 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-HhesXzxVjhWJkubiBi6sMoXi/zicqn99dqT5bilycS8="; + hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index a23e3a5b931c..0f3d69b18d8c 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -8,6 +8,7 @@ , importlib-resources , jsonschema-specifications , pkgutil-resolve-name +, pip , pytestCheckHook , pythonOlder , referencing @@ -81,6 +82,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pip pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix index 17ec03145137..de73ea621b47 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -10,6 +10,7 @@ , jupyter-server , jupyter-server-fileid , jupyter-ydoc +, jupyterlab , ypy-websocket , pytest-asyncio , pytest-jupyter @@ -18,16 +19,15 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.0.1"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; - format = "pyproject"; - src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-cf7BpF6WSoHQJQW0IXdpCAGTdkX9RNWZ4JovTHvcPho="; + hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM="; }; postPatch = '' @@ -38,6 +38,7 @@ buildPythonPackage rec { hatch-jupyter-builder hatch-nodejs-version hatchling + jupyterlab pythonRelaxDepsHook ]; @@ -53,14 +54,16 @@ buildPythonPackage rec { ypy-websocket ]; - pythonImportsCheck = [ "jupyter_collaboration" ]; - nativeCheckInputs = [ pytest-asyncio pytest-jupyter pytestCheckHook ]; + pythonImportsCheck = [ + "jupyter_collaboration" + ]; + pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" ]; @@ -69,11 +72,11 @@ buildPythonPackage rec { export HOME=$TEMP ''; - meta = { - changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + meta = with lib; { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; - license = lib.licenses.bsd3; - maintainers = lib.teams.jupyter.members; + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = teams.jupyter.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index 030035f744cf..a3e0eba387f9 100644 --- a/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.15.0"; + version = "1.15.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M4BoST18sf1C1lwhFkp4a0B3fc0VKerwuVEIfwkD7i0="; + hash = "sha256-XGjAPeMtg2Epu85JiqQPyZJVez5Z8uA+E40SFcZM7WY="; }; # Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index ab6959389a9e..f463b18950dd 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, isPy27 -, six - -, pytestCheckHook +, jaraco-classes , keyring +, pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { - pname = "keyrings.alt"; - version = "4.2.0"; + pname = "keyrings-alt"; + version = "5.0.0"; format = "pyproject"; - disabled = isPy27; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; + pname = "keyrings.alt"; + inherit version; + hash = "sha256-nURstHu86pD/ouzD6AA6z0FXP8IBv0S0vxO9DhFISCg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six + jaraco-classes ]; nativeCheckInputs = [ @@ -39,9 +39,10 @@ buildPythonPackage rec { ]; meta = with lib; { - license = licenses.mit; description = "Alternate keyring implementations"; homepage = "https://github.com/jaraco/keyrings.alt"; + changelog = "https://github.com/jaraco/keyrings.alt/blob/v${version}/NEWS.rst"; + license = licenses.mit; maintainers = with maintainers; [ nyarly ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix index a31a5a3c957d..4a640d7b1b7c 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -1,8 +1,7 @@ { lib +, argon2-cffi , buildPythonPackage , fetchPypi -, fetchpatch -, argon2-cffi , keyring , pycryptodome , pytestCheckHook @@ -10,26 +9,22 @@ }: buildPythonPackage rec { - pname = "keyrings.cryptfile"; - # NOTE: newer releases are bugged/incompatible - # https://github.com/frispete/keyrings.cryptfile/issues/15 - version = "1.3.4"; + pname = "keyrings-cryptfile"; + version = "1.3.9"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; - hash = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; + pname = "keyrings.cryptfile"; + inherit version; + hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; }; - patches = [ - # upstream setup.cfg has an option that is not supported - ./fix-testsuite.patch - # change of API in keyrings.testing - (fetchpatch { - url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch"; - hash = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; - }) - ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "-s --cov=keyrings/cryptfile" "" + ''; propagatedBuildInputs = [ argon2-cffi @@ -46,13 +41,14 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_set_properties" - "UncryptedFileKeyringTestCase" + # FileNotFoundError: [Errno 2] No such file or directory: '/build/... + "test_versions" ]; meta = with lib; { description = "Encrypted file keyring backend"; homepage = "https://github.com/frispete/keyrings.cryptfile"; + changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; maintainers = teams.chia.members; }; diff --git a/nixpkgs/pkgs/development/python-modules/klaus/default.nix b/nixpkgs/pkgs/development/python-modules/klaus/default.nix index cede627f9110..0d393d0e8ae5 100644 --- a/nixpkgs/pkgs/development/python-modules/klaus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "klaus"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - hash = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; + hash = "sha256-VAwIdmwdo/Rim2sVlR605Wo5/zkNOMiGkh40qLrENmU="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix index ff8b8f587ce4..47b9fa4d8357 100644 --- a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , setuptools +, wheel }: buildPythonPackage rec { @@ -16,8 +18,18 @@ buildPythonPackage rec { hash = "sha256-MeurZ6731qjeBK6HTwXYLVs6+nXF9Hf1p8/NNwxmae4="; }; + patches = [ + # https://github.com/XKNX/knx-frontend/pull/96 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/XKNX/knx-frontend/commit/72ac6dc42eeeb488992b0709ee58ea4a79287817.patch"; + hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index cdccecf72b09..af8e8ed29be9 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.1"; + version = "5.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+9dXLZLAv3HBEqa0UWMVPepae2pwHsFrVown0P0jcPI="; + hash = "sha256-C6IT9jCiyydycorvVqxog9w6LxNDXhAEj26X1IUG270="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kornia/default.nix b/nixpkgs/pkgs/development/python-modules/kornia/default.nix index c36540714acf..5d98379045ed 100644 --- a/nixpkgs/pkgs/development/python-modules/kornia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kornia/default.nix @@ -2,23 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytestCheckHook , packaging , torch }: buildPythonPackage rec { pname = "kornia"; - version = "0.6.12"; + version = "0.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qLJos1ivEws/jFK4j0Kp1ij9J9ZwCoHFRYXnlYxwPFY="; + hash = "sha256-XcQXKn4F3DIgn+XQcN5ZcGZLehd/IPBgLuGzIkPSxZg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/laszip/default.nix b/nixpkgs/pkgs/development/python-modules/laszip/default.nix index 2c6f4196595f..85187d08f99f 100644 --- a/nixpkgs/pkgs/development/python-modules/laszip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/laszip/default.nix @@ -2,17 +2,18 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , scikit-build-core , pybind11 , cmake , LASzip +, ninja , pythonOlder }: buildPythonPackage rec { pname = "laszip-python"; version = "0.2.3"; - format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,14 +25,25 @@ buildPythonPackage rec { hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw="; }; + patches = [ + # Removes depending on the cmake and ninja PyPI packages, since we can pass + # in the tools directly, and scikit-build-core can use them. + # https://github.com/tmontaigu/laszip-python/pull/9 + (fetchpatch { + name = "remove-cmake-ninja-pypi-dependencies.patch"; + url = "https://github.com/tmontaigu/laszip-python/commit/17e648d04945fa2d095d6d74d58c790a4fcde84a.patch"; + hash = "sha256-k58sS1RqVzT1WPh2OVt/D4Y045ODtj6U3bUjegd44VY="; + }) + ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c++17"; nativeBuildInputs = [ cmake + ninja pybind11 scikit-build-core - scikit-build-core.optional-dependencies.pyproject - ]; + ] ++ scikit-build-core.optional-dependencies.pyproject; dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index ea89a9ac688f..5a39ef7ecba4 100644 --- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.47"; + version = "0.1.48"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xe8ude2JzrdmJqwzqLlxRO697IjcGuQgGG6c3nQ/drg="; + hash = "sha256-LVRNcsTmJOR3zTBhbKV4V0zCQk0sk/Uf6kSmfbAhgfY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 9382ccd36b63..ac07b77bf2b4 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPythonPackage , poetry-core , pytest-rerunfailures @@ -13,25 +12,16 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.22.1"; + version = "0.23.0post0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tz7Pynm/xHx2X3QjXkvFlX6sVlsVKqrsS1CVmqlqfj0="; + hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo="; }; - patches = [ - # https://github.com/tmux-python/libtmux/pull/493 - (fetchpatch { - name = "remove-setuptools.patch"; - url = "https://github.com/tmux-python/libtmux/commit/aa3a1e2015ade73129191ad04146ce52765d478c.patch"; - hash = "sha256-p3KMktd6eG9/lRK+DdBvDtSwhI+sV2RQfBAuElMk8tQ="; - }) - ]; - postPatch = '' sed -i '/addopts/d' setup.cfg ''; diff --git a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index e4c0e6f955cd..bc4dcaee1a19 100644 --- a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.12.1"; + version = "1.13.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0QjgnTxqB50JNjSUAgBrGyhN2XC/TDYiC1tvhw1Bl1M="; + hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/logbook/default.nix b/nixpkgs/pkgs/development/python-modules/logbook/default.nix index e6d155760d51..d8251a40099f 100644 --- a/nixpkgs/pkgs/development/python-modules/logbook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/logbook/default.nix @@ -1,30 +1,87 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }: +{ lib +, brotli +, buildPythonPackage +, cython +, execnet +, fetchFromGitHub +, jinja2 +, pytestCheckHook +, pythonOlder +, pyzmq +, redis +, setuptools +, sqlalchemy +}: buildPythonPackage rec { pname = "logbook"; - version = "1.5.3"; + version = "1.6.0"; + format = "setuptools"; - src = fetchPypi { - pname = "Logbook"; - inherit version; - sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "getlogbook"; + repo = "logbook"; + rev = "refs/tags/${version}"; + hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo="; }; - nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + nativeBuildInputs = [ + cython + setuptools + ]; - propagatedBuildInputs = [ brotli ]; + passthru.optional-dependencies = { + execnet = [ + execnet + ]; + sqlalchemy = [ + sqlalchemy + ]; + redis = [ + redis + ]; + zmq = [ + pyzmq + ]; + compression = [ + brotli + ]; + jinja = [ + jinja2 + ]; + all = [ + brotli + execnet + jinja2 + pyzmq + redis + sqlalchemy + ]; + }; - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { - homepage = "https://pythonhosted.org/Logbook/"; + pythonImportsCheck = [ + "logbook" + ]; + + disabledTests = [ + # Test require Redis instance + "test_redis_handler" + ]; + + meta = with lib; { description = "A logging replacement for Python"; - license = lib.licenses.bsd3; + homepage = "https://logbook.readthedocs.io/"; + changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 7f0231c7d357..1a103d2a8c52 100644 --- a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.18.0"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-wl8L+ZQQgzWb7QUHWHSOT3meCn1baE7Prs1nWAOvnKo="; + hash = "sha256-Kr+L8zHcutpxzqvwQ10iebHiwBIT+sZiiT38G6O/joY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix b/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix index 71d7d3e26d31..329f676ef45b 100644 --- a/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix @@ -95,6 +95,12 @@ buildPythonPackage rec { "test_get" # this test has network access "test_retry_handling" + # Test is time-senstive + "test_timing" + ]; + + pythonImportsCheck = [ + "manifest" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix b/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix new file mode 100644 index 000000000000..3135ded66ebf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage +, typing-extensions +, fetchPypi +, lib +, nix-update-script +, hatch-vcs +, pythonOlder +, importlib-resources +}: + +buildPythonPackage rec { + pname = "manifestoo-core"; + version = "0.11.0"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "manifestoo_core"; + hash = "sha256-ZZAJDOtGcYWm0yS5bMOUdM1Jf+kfurwiLsJwyTYPz/4="; + }; + + nativeBuildInputs = [ + hatch-vcs + ]; + + propagatedBuildInputs = + lib.optionals (pythonOlder "3.7") [ importlib-resources ] + ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A library to reason about Odoo addons manifests"; + homepage = "https://github.com/acsone/manifestoo-core"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix b/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix new file mode 100644 index 000000000000..c9499eb11310 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix @@ -0,0 +1,51 @@ +{ buildPythonPackage +, fetchPypi +, hatch-vcs +, importlib-metadata +, lib +, manifestoo-core +, nix-update-script +, pytestCheckHook +, pythonOlder +, textual +, typer +, typing-extensions +}: + +buildPythonPackage rec { + pname = "manifestoo"; + version = "0.7"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gCGchc+fShBgt6fVJAx80+QnH+vxWo3jsIyePkFwhYE="; + }; + + nativeBuildInputs = [ + hatch-vcs + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + manifestoo-core + textual + typer + ] + ++ typer.passthru.optional-dependencies.all + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A tool to reason about Odoo addons manifests"; + homepage = "https://github.com/acsone/manifestoo"; + license = licenses.mit; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix index 13bee5c38958..97eeb09d7b8a 100644 --- a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.9"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oH44poFVnoM831dJuA9KcHCsuW6gh5B2EHrnKwza6A4="; + hash = "sha256-VDB6313lvKuLJFOnuzEaiiRLUBOvbdjfowgl3nvG8Y0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 2cfd5d21db19..e5df4ea7d4ea 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -8,10 +8,13 @@ # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst # build-system +, certifi +, oldest-supported-numpy , pkg-config , pybind11 , setuptools , setuptools-scm +, wheel # native libraries , ffmpeg-headless @@ -116,11 +119,14 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + certifi + numpy + oldest-supported-numpy # TODO remove after updating to 3.8.0 pkg-config pybind11 setuptools setuptools-scm - numpy + wheel ] ++ lib.optionals enableGtk3 [ gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 5df491ea8575..734045426526 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "1.0.2"; + version = "1.0.4"; format = "flit"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H+wqgcXNrdrZ5aQvZ7XM8YpBpVZM6pFtsANC00UZ0jM="; + hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; buildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "mdformat plugin for MkDocs"; homepage = "https://github.com/KyleKing/mdformat-mkdocs"; +changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 3ac61c1a1888..a25a632f5150 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -47,7 +47,7 @@ let package = buildPythonPackage rec { pname = "mdformat"; - version = "0.7.16"; + version = "0.7.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -55,8 +55,8 @@ let src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = version; - hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + rev = "refs/tags/${version}"; + hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; }; nativeBuildInputs = [ @@ -93,6 +93,7 @@ let meta = with lib; { description = "CommonMark compliant Markdown formatter"; homepage = "https://mdformat.rtfd.io/"; + changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab aldoborrero ]; mainProgram = "mdformat"; diff --git a/nixpkgs/pkgs/development/python-modules/meep/default.nix b/nixpkgs/pkgs/development/python-modules/meep/default.nix index 021121a44ac2..df0dd2cb1bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/meep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meep/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, mpiCheckPhaseHook , gfortran , mpi , blas @@ -108,15 +109,11 @@ buildPythonPackage rec { errors can be caught. */ doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; checkPhase = '' - export PATH=$PATH:${openssh}/bin - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - export OMP_NUM_THREADS=1 + runHook preCheck - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - export OMPI_MCA_rmaps_base_oversubscribe=1 + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" # Generate a python test script cat > test.py << EOF @@ -139,6 +136,8 @@ buildPythonPackage rec { EOF ${mpi}/bin/mpiexec -np 2 python3 test.py + + runHook postCheck ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 00552394c8bb..18b2ae836151 100644 --- a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-szeY3+84xAihGK9nLgMQf9oLRDlKlaPg6+I42TJkfVY="; + hash = "sha256-7mQq0phe920t7aJxvP0cCpVNH9s7F+x1fBdzAVUgtKE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix index fb4f054cd212..6edd37f14dbc 100644 --- a/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-NECGUosjrhRCVGHOFV+YjY8o3heoA7qi9kKsgXpeHh0="; + hash = "sha256-RlnZUI7F1u1rjmuPc2guqVomR25Izf5jejN6LlMZYS8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mip/default.nix b/nixpkgs/pkgs/development/python-modules/mip/default.nix index e7ba8740cbbf..db2786915b56 100644 --- a/nixpkgs/pkgs/development/python-modules/mip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mip/default.nix @@ -8,6 +8,9 @@ , numpy , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm +, wheel , gurobi , gurobipy # Enable support for the commercial Gurobi solver (requires a license) @@ -20,9 +23,9 @@ buildPythonPackage rec { pname = "mip"; version = "1.15.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; src = fetchPypi { inherit pname version; @@ -30,7 +33,14 @@ buildPythonPackage rec { }; nativeCheckInputs = [ matplotlib networkx numpy pytestCheckHook ]; - nativeBuildInputs = [ dos2unix ]; + + nativeBuildInputs = [ + dos2unix + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ cffi ] ++ lib.optionals gurobiSupport ([ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix index 462768eed799..5ad4ef448454 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mkdocs-minify"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "byrnereese"; repo = "${pname}-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-ajXkEKLBC86Y8YzDCZXd6x6QtLLrCDJkb6kDrRE536o="; + hash = "sha256-LDCAWKVbFsa6Y/tmY2Zne4nOtxe4KvNplZuWxg4e4L8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index a7b109d127eb..ff9326a8ba7d 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -1,22 +1,26 @@ { lib +, beautifulsoup4 , buildPythonPackage , drawio-headless -, fetchPypi -, pythonOlder +, fetchFromGitHub , mkdocs -, beautifulsoup4 +, pathspec +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.2"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo="; + src = fetchFromGitHub { + owner = "Blueswen"; + repo = "mkdocs-swagger-ui-tag"; + rev = "refs/tags/v${version}"; + hash = "sha256-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g="; }; propagatedBuildInputs = [ @@ -24,10 +28,22 @@ buildPythonPackage rec { beautifulsoup4 ]; + nativeCheckInputs = [ + pathspec + pytestCheckHook + ]; + pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ]; + disabledTests = [ + # Don't actually build results + "test_material" + "test_material_dark_scheme_name" + "test_template" + ]; + meta = with lib; { description = "A MkDocs plugin supports for add Swagger UI in page"; homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag"; diff --git a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index e297f47a0b5d..df8b47a3e983 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-Z92w84JI7tzARHNdVZvOrMHFbMLUayf6uHak++C0suc="; + hash = "sha256-r9zboUvF1IH32d6jQ+nRbzXejlZADt5+YNZ/LdFyULk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix b/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix index c329196d51de..eae60372af0d 100644 --- a/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix @@ -27,6 +27,14 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "numpy~=1.21.2" "numpy" \ + --replace "numpy~=1.23.3" "numpy" \ + --replace "pybind11~=2.10.0" "pybind11" \ + --replace "setuptools~=67.6.0" "setuptools" + ''; + nativeBuildInputs = [ setuptools pybind11 diff --git a/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix b/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix index 005efb6c686d..12f47a9e80d0 100644 --- a/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.14.0"; + version = "1.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-eiCbx15lY8H+xS2HhDCpsqwsuZGxou8aHgaktd/+65U="; + hash = "sha256-gB6lcLymkajRoeOQ70kmZVlBI7oeZgQo1VySfPGeQLQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/molecule/default.nix b/nixpkgs/pkgs/development/python-modules/molecule/default.nix index c12dc3a92f35..e62ee8fb29db 100644 --- a/nixpkgs/pkgs/development/python-modules/molecule/default.nix +++ b/nixpkgs/pkgs/development/python-modules/molecule/default.nix @@ -4,7 +4,6 @@ , ansible-compat , ansible-core , click-help-colors -, cookiecutter , enrich , jsonschema , withPlugins ? true, molecule-plugins @@ -12,36 +11,41 @@ , pluggy , rich , setuptools +, setuptools-scm , yamllint +, wcmatch +, wheel }: buildPythonPackage rec { pname = "molecule"; - version = "5.1.0"; + version = "6.0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-+nr4n9+TF1OcPsqZyx5edSLXpX4LZ/W2mORCdvmNnYI="; + hash = "sha256-uRk1P3mXRt5gsWonV1YneD45wmj98vKqA3LwFix7VHg="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ ansible-compat ansible-core click-help-colors - cookiecutter enrich jsonschema packaging pluggy rich yamllint + wcmatch ] ++ lib.optional withPlugins molecule-plugins; - nativeBuildInputs = [ - setuptools - ]; - pythonImportsCheck = [ "molecule" ]; # tests can't be easily run without installing things from ansible-galaxy diff --git a/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix b/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix index 9cb8a635c31e..af36fe3bb60c 100644 --- a/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "molecule-plugins"; - version = "23.4.1"; + version = "23.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NMR+4sEcNbowyoTqaEwe4Wac9+WNIZesnb/L9C0KG3s="; + hash = "sha256-8T6gR7hlDIkmBLgbdjgryAu0riXqULI/MOgf2dWAKv8="; }; # reverse the dependency diff --git a/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix b/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix index a74fa36629df..85c23a39c77a 100644 --- a/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-oaNZ0US0YR/PSwAZ5GfRpAW+HRYVhdCZI83fC00rgok="; }; + postPatch = '' + # Asked in https://github.com/Project-MONAI/monai-deploy-app-sdk/issues/450 + # if this patch can be incorporated upstream. + substituteInPlace pyproject.toml --replace 'versioneer-518' 'versioneer' + ''; + nativeBuildInputs = [ versioneer ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index 8584930c31f1..887c5446d53c 100644 --- a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: +{ lib, fetchPypi, fetchpatch, python, buildPythonPackage +, mpi, mpiCheckPhaseHook, openssh +}: buildPythonPackage rec { pname = "mpi4py"; @@ -33,10 +35,6 @@ buildPythonPackage rec { # sometimes packages specify where files should be installed outside the usual # python lib prefix, we override that back so all infrastructure (setup hooks) # work as expected - - # Needed to run the tests reliably. See: - # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 - export OMPI_MCA_rmaps_base_oversubscribe=yes ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; @@ -45,7 +43,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; diff --git a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix index 89ccbb63ff60..f5ae1860039c 100644 --- a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.18.1"; + version = "0.18.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cacwbl5JYqQGXhdt/F0nhX032GCw8RwFi0XBsn7dlq0="; + hash = "sha256-t5TM7CgVIxdXR6jMOXh1XhpA9vBrYHBcR2iLYP4A/Jc="; }; # Requires libasan to be accessible diff --git a/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/nixpkgs/pkgs/development/python-modules/msprime/default.nix index d33adc13080a..f4b3a2eb70c6 100644 --- a/nixpkgs/pkgs/development/python-modules/msprime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msprime/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, oldest-supported-numpy , setuptools-scm +, wheel , pythonOlder , gsl , numpy @@ -25,8 +27,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-scm gsl + oldest-supported-numpy + setuptools-scm + wheel ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/multiset/default.nix b/nixpkgs/pkgs/development/python-modules/multiset/default.nix index 6d9a28e564ba..0e6e143676bc 100644 --- a/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , setuptools , setuptools-scm +, wheel , pytestCheckHook }: @@ -16,9 +18,13 @@ buildPythonPackage rec { hash = "sha256-5FZxyug4Wo5iSKmwejqDKAwtDMQxJxMFjPus3F7Jlz4="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm + patches = [ + # https://github.com/wheerd/multiset/pull/115 + (fetchpatch { + name = "relax-setuptools-scm-dependency.patch"; + url = "https://github.com/wheerd/multiset/commit/296187b07691c94b783f65504afc580a355abd96.patch"; + hash = "sha256-vnZR1cyM/2/JfbLuVOxJuC9oMVVVploUHpbzagmo+AE="; + }) ]; postPatch = '' @@ -26,6 +32,12 @@ buildPythonPackage rec { sed -i '/python_requires/d' setup.cfg ''; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + pythonImportsCheck = [ "multiset" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d64d9d20c5ca..2df248c3d4de 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.17.3"; + version = "7.18.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-ziJb/aIvK8zZ2NwCKtyGHNQ0LM0Sro6//oAESlku0kI="; + hash = "sha256-43kyDgolXEu5J5OVaLKqjVdyWaobfGNvevNFh4CFjss="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index 56734b6a9d52..8b22c42f0f7b 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.28.16"; + version = "1.28.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PJkVweQPGGR3NwCpg/O+Cs822XU6awMfUL6wWwT6e0w="; + hash = "sha256-w9OLKJAn9UBnA7x+uedhplSV8plZRYlBpviU9Gv1Ny8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 063974c955fe..61aa96fa1340 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -1,6 +1,7 @@ { lib , boto3 , buildPythonPackage +, cython_3 , fetchPypi , pythonOlder , typing-extensions @@ -8,19 +9,23 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.27"; + version = "1.28.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8QlDRPaNH/4rmYQE4uT/mqQjlDhpIYf6g617c0c5mRw="; + hash = "sha256-RNo3X9TXWxxczCbc075IKUxwYURe/W2Q6/ykP/67s+Q="; }; + nativeBuildInputs = [ + cython_3 + ]; + propagatedBuildInputs = [ boto3 - ] ++ lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix b/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix index c0a326b0ef7f..87dad04cf781 100644 --- a/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -1,30 +1,44 @@ -{ lib, buildPythonPackage, fetchFromGitHub, setuptools, napalm, netmiko -, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, napalm +, netmiko +, pip +, pytestCheckHook +}: buildPythonPackage rec { pname = "napalm-hp-procurve"; version = "0.7.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "napalm-automation-community"; repo = pname; rev = version; - sha256 = "1lspciddkd1w5lfyz35i0qwgpbn5jq9cbqkwjbsvi4kliz229vkh"; + hash = "sha256-cO4kxI90krj1knzixRKWxa77OAaxjO8dLTy02VpkV9M="; }; + nativeBuildInputs = [ + pip + ]; + # dependency installation in setup.py doesn't work patchPhase = '' echo -n > requirements.txt ''; - buildInputs = [ setuptools napalm ]; + buildInputs = [ napalm ]; + propagatedBuildInputs = [ netmiko ]; # setup.cfg seems to contain invalid pytest parameters preCheck = '' rm setup.cfg ''; + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ # AssertionError: Some methods vary. "test_method_signatures" diff --git a/nixpkgs/pkgs/development/python-modules/napari/default.nix b/nixpkgs/pkgs/development/python-modules/napari/default.nix index 769134bcd4e5..9df87e357dd3 100644 --- a/nixpkgs/pkgs/development/python-modules/napari/default.nix +++ b/nixpkgs/pkgs/development/python-modules/napari/default.nix @@ -38,7 +38,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.17"; + version = "0.4.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -47,7 +47,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE="; + hash = "sha256-xF0DYK+226MZpB050IukNvTg2iHMQAIZW0serKRJd/0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index 6f17d83524c2..79febaf68518 100644 --- a/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.5.2"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QPEbvMWeiVbD1e8TLeyOWoU+iT7Pgx55HVTaDYpQ150="; + hash = "sha256-CuEesjGUVdgFWWvzIDNs2pVUtB2Zq5o8Mb+BgL/6MOM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 74018b75e93d..de0d972aa986 100644 --- a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VA239AZjR/I9BlDEro59hTNMaa33SeAwr2TBLplv+I4="; + hash = "sha256-7DOchpG2iPhnYQSjZ6S4zz6gH9CJ3CjSTewi1WOxFWI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 1447ceb9bcf1..96790c04c450 100644 --- a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.11.0"; + version = "5.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE="; + hash = "sha256-feKKBbULkWxEgUaMROvmQph2YTAgSOVDRz/OnpzG9Ac="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index e75315400621..9f00a33fdf6b 100644 --- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -3,7 +3,9 @@ , fetchPypi , isPyPy , python +, oldest-supported-numpy , setuptools +, wheel , numpy , zlib , netcdf @@ -26,7 +28,12 @@ buildPythonPackage rec { hash = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; }; - nativeBuildInputs = [ setuptools cython ]; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; propagatedBuildInputs = [ cftime diff --git a/nixpkgs/pkgs/development/python-modules/newversion/default.nix b/nixpkgs/pkgs/development/python-modules/newversion/default.nix index f1643b9f21cb..e3283a4eb9e2 100644 --- a/nixpkgs/pkgs/development/python-modules/newversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/newversion/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , packaging , poetry-core , pytestCheckHook @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; }; + patches = [ + # https://github.com/vemel/newversion/pull/9 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/vemel/newversion/commit/b50562671029dd6834bc7a8ad0dd3f9e0fbdfc1d.patch"; + hash = "sha256-6dXVQ9Hk0/EfSwPbW19ZV8MAFcSx+ZRO5G94kbh23GM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/ninja/default.nix b/nixpkgs/pkgs/development/python-modules/ninja/default.nix index 0ff678569302..808bf9fb8c0e 100644 --- a/nixpkgs/pkgs/development/python-modules/ninja/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ninja/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { --subst-var version substituteInPlace "$sourceRoot/ninja/__init__.py" \ + --subst-var version \ --subst-var-by BIN_DIR "${ninja}/bin" ''; diff --git a/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py b/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py index fcf70f10ba31..d6e7abe15205 100644 --- a/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py +++ b/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py @@ -2,6 +2,8 @@ import os import subprocess import sys +__version__ = '@version@' + BIN_DIR = '@BIN_DIR@' def _program(name, args): diff --git a/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/nixpkgs/pkgs/development/python-modules/nitime/default.nix index 105cecd95b10..b0870c984911 100644 --- a/nixpkgs/pkgs/development/python-modules/nitime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nitime/default.nix @@ -5,6 +5,9 @@ , pythonOlder , pytestCheckHook , cython +, setuptools +, setuptools-scm +, wheel , numpy , scipy , matplotlib @@ -23,11 +26,32 @@ buildPythonPackage rec { hash = "sha256-NnoVrSt6MTTcNup1e+/1v5JoHCYcycuQH4rHLzXJt+Y="; }; - buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; + # Upstream wants to build against the oldest version of numpy possible, but + # we only want to build against the most recent version. + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "numpy==" "numpy>=" + ''; + + nativeBuildInputs = [ + cython + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + networkx + nibabel + ]; nativeCheckInputs = [ pytestCheckHook ]; + doCheck = !stdenv.isDarwin; # tests hang indefinitely + pythonImportsCheck = [ "nitime" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix b/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix index ce438528bc28..7252ce45b711 100644 --- a/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , paho-mqtt , poetry-core , psutil @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "notus-scanner"; - version = "22.5.0"; + version = "22.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,17 +23,9 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h+jZWjDvTfW9XjoGhWYX08hgJ/Qp64MEaqHHwnahnC4="; + hash = "sha256-Ih6Uz7dTVMNCBsLcDsslyIzttg+IDBW3B+Ixpp7sz1Y="; }; - patches = [ - (fetchpatch { - name = "update-packaging-dependency.patch"; - url = "https://github.com/greenbone/notus-scanner/commit/bfa7d3d2e63e250ff25a66c60b782eb9da0e89e7.patch"; - hash = "sha256-hzS8TYBXDEq+cgWlp6fSOtSbyeX9EX2rURmnFMF5jN0="; - }) - ]; - pythonRelaxDeps = [ "python-gnupg" ]; diff --git a/nixpkgs/pkgs/development/python-modules/numpyro/default.nix b/nixpkgs/pkgs/development/python-modules/numpyro/default.nix index e521e19e8621..f301fdac7be9 100644 --- a/nixpkgs/pkgs/development/python-modules/numpyro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpyro/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-S3ifL/KPOJQcyBEYoE1XGxPLmSfh1uT9wJG/YtABBKQ="; + hash = "sha256-n+5K6fZlatKkXGVxzKcVhmP5XNuJeeM+GcCJ1Kh/WMk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 855ecb8384d4..37f7a1e44c21 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.0.6"; + version = "16.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-82I+ZmWRUUV+kxveHNDXTsbOeZcT0QJo/SJP3paxRcY="; + hash = "sha256-opF7HdTJX4M7gTgB0VyWyyG/DO7lrVTvTcxMBX3a6UE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 9cae940ccc38..13f5819a6ef3 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.110.1"; + version = "2.111.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-v2h/K1gat+nHGjn6a9r1BDMDAoJ/OtNctxHzV41gRkg="; + hash = "sha256-7lkxk/oFb5DPH3LcOJLJByMaf4xQB8L6FLKrXOn+HsM="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix index a7b99614aef8..5d6e11c34daf 100644 --- a/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix @@ -25,10 +25,11 @@ buildPythonPackage rec { --replace 'numpy==' 'numpy>=' ''; - nativeBuildInputs = [ + propagatedBuildInputs = [ numpy ]; + # package has no tests doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/opentsne/default.nix b/nixpkgs/pkgs/development/python-modules/opentsne/default.nix index beab3b0d5e6d..9fc3c7fe8143 100644 --- a/nixpkgs/pkgs/development/python-modules/opentsne/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentsne/default.nix @@ -3,11 +3,13 @@ , fetchFromGitHub , cython , numpy +, oldest-supported-numpy , scipy , scikit-learn , pytestCheckHook , nix-update-script , setuptools +, wheel }: let @@ -23,8 +25,14 @@ let hash = "sha256-L5Qx6dMJlXF3EaWwlFTQ3dkhGXc5PvQBXYJo+QO+Hxc="; }; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; + propagatedBuildInputs = [ numpy scipy scikit-learn ]; - nativeBuildInputs = [ cython setuptools ]; pythonImportsCheck = [ "openTSNE" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/opower/default.nix b/nixpkgs/pkgs/development/python-modules/opower/default.nix index 381afbea510f..916a4c66b9fc 100644 --- a/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.31"; + version = "0.0.33"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-lJVaQnGfZBjMgWLKZG/LNao8l4Fj3z3AZhnfgJwOcxo="; + hash = "sha256-YZ9I+Pdfh7i8gtBYnVwIaJSRSG0uU+8hKSCSk391hzc="; }; pythonRemoveDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/nixpkgs/pkgs/development/python-modules/optimum/default.nix index 6f781c3f174d..0c8a9a738aa1 100644 --- a/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-J0QcHmR2hVd/Ygi7QFtsObwx/Sm3DCwU+DojzXHokYU="; + hash = "sha256-/Z7Gh8pAa5z96X7rdcuq6kxtpF53EFGIYOu1ft8w+XM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix index 07157162f4cd..e6e7f7bc6ce9 100644 --- a/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "osc"; - version = "1.0.0b1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - sha256 = "cMltsR4Nxe0plHU5cP2Lj/qqlIqRbCXi6FXP8qx7908="; + sha256 = "sha256-gHcPqo3AuSrVprYUGLenC0kw9hKNmjabZ1m6YVMsNPs="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper @@ -18,8 +18,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 cryptography ]; postInstall = '' - install -D -m444 osc.fish $out/etc/fish/completions/osc.fish - install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper + install -D -m444 contrib/osc.fish $out/etc/fish/completions/osc.fish + install -D -m555 contrib/osc.complete $out/share/bash-completion/helpers/osc-helper mkdir -p $out/share/bash-completion/completions cat >>$out/share/bash-completion/completions/osc <<EOF test -z "\$BASH_VERSION" && return diff --git a/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix index 3591669291aa..1e89c69f7e2f 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - hash = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M="; + hash = "sha256-nPAw1hpszh9Hpi1AUPXoPhvRoQGKxnG7GTruB9Fb28I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix b/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix new file mode 100644 index 000000000000..9bd81077abfd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix @@ -0,0 +1,111 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchFromGitHub +, attrdict +, beautifulsoup4 +, cython +, fire +, fonttools +, lmdb +, lxml +, numpy +, opencv4 +, openpyxl +, pdf2docx +, pillow +, premailer +, pyclipper +, pymupdf +, python-docx +, rapidfuzz +, scikit-image +, shapely +, tqdm +, paddlepaddle +, lanms-neo +, polygon3 +}: + +let + version = "2.7.0.1"; +in +buildPythonPackage { + pname = "paddleocr"; + inherit version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PaddlePaddle"; + repo = "PaddleOCR"; + rev = "254786752a2659e184822b4b2de5637a05236590"; + hash = "sha256-M/Fpk9swX9Gds7o5poM9Iv6LOhKoZNbe0Wv9JNMPOU0="; + }; + + patches = [ + # The `ppocr.data.imaug` re-exports the `IaaAugment` and `CopyPaste` + # classes. These classes depend on the `imgaug` package which is + # unmaintained and has been removed from nixpkgs. + # + # The image OCR feature of PaddleOCR doesn't use these classes though, so + # they work even after stripping the the `IaaAugment` and `CopyPaste` + # exports. It probably breaks some of the OCR model creation tooling that + # PaddleOCR provides, however. + ./remove-import-imaug.patch + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + # trying to relax only pymupdf makes the whole build fail + pythonRelaxDeps = true; + pythonRemoveDeps = [ + "imgaug" + "visualdl" + "opencv-python" + "opencv-contrib-python" + ]; + + propagatedBuildInputs = [ + attrdict + beautifulsoup4 + cython + fire + fonttools + lmdb + lxml + numpy + opencv4 + openpyxl + pdf2docx + pillow + premailer + pyclipper + pymupdf + python-docx + rapidfuzz + scikit-image + shapely + tqdm + paddlepaddle + lanms-neo + polygon3 + ]; + + # TODO: The tests depend, among possibly other things, on `cudatoolkit`. + # But Cudatoolkit fails to install. + # preCheck = "export HOME=$TMPDIR"; + # nativeCheckInputs = with pkgs; [ which cudatoolkit ]; + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/PaddlePaddle/PaddleOCR"; + license = licenses.asl20; + description = "Multilingual OCR toolkits based on PaddlePaddle"; + longDescription = '' + PaddleOCR aims to create multilingual, awesome, leading, and practical OCR + tools that help users train better models and apply them into practice. + ''; + changelog = "https://github.com/PaddlePaddle/PaddleOCR/releases/tag/v${version}"; + maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch b/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch new file mode 100644 index 000000000000..f24156fb6a12 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch @@ -0,0 +1,20 @@ +diff --git a/ppocr/data/imaug/__init__.py b/ppocr/data/imaug/__init__.py +index 121582b4..a6987c75 100644 +--- a/ppocr/data/imaug/__init__.py ++++ b/ppocr/data/imaug/__init__.py +@@ -16,7 +16,6 @@ from __future__ import division + from __future__ import print_function + from __future__ import unicode_literals + +-from .iaa_augment import IaaAugment + from .make_border_map import MakeBorderMap + from .make_shrink_map import MakeShrinkMap + from .random_crop_data import EastRandomCropData, RandomCropImgMask +@@ -30,7 +29,6 @@ from .rec_img_aug import BaseDataAugmentation, RecAug, RecConAug, RecResizeImg, + RFLRecResizeImg, SVTRRecAug + from .ssl_img_aug import SSLRotateResize + from .randaugment import RandAugment +-from .copy_paste import CopyPaste + from .ColorJitter import ColorJitter + from .operators import * + from .label_ops import * diff --git a/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index be4329a41334..460d99575b9e 100644 --- a/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pallets-sphinx-themes"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "pallets"; repo = "pallets-sphinx-themes"; rev = "refs/tags/${version}"; - sha256 = "sha256-u1sHeO0fk11+M5M0yqDcWsMJKBMeAGW+GPOgu1oniok="; + sha256 = "sha256-Z03rsqkwF2rYaqRZflf5qc5EdHPIEcEcB1ftYIm5DQs="; }; propagatedBuildInputs = [ packaging sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 0c3b28d1d215..d79b9eea4bce 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -6,8 +6,10 @@ # build-system , cython +, oldest-supported-numpy , setuptools , versioneer +, wheel # propagates , numpy @@ -75,7 +77,9 @@ buildPythonPackage rec { setuptools cython numpy + oldest-supported-numpy versioneer + wheel ] ++ versioneer.optional-dependencies.toml; enableParallelBuilding = true; @@ -168,10 +172,6 @@ buildPythonPackage rec { all = lib.concatLists (lib.attrValues extras); }; - # Doesn't work with -Werror,-Wunused-command-line-argument - # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - nativeCheckInputs = [ glibcLocales hypothesis diff --git a/nixpkgs/pkgs/development/python-modules/particle/default.nix b/nixpkgs/pkgs/development/python-modules/particle/default.nix index 1a9f4fef309b..69eabb7cf57f 100644 --- a/nixpkgs/pkgs/development/python-modules/particle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/particle/default.nix @@ -1,6 +1,7 @@ { lib , attrs , buildPythonPackage +, deprecated , fetchFromGitHub , fetchPypi , hatch-vcs @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.21.2"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns="; + hash = "sha256-2BD4/CfeuOf9ZBdAF9lgfVBSIknAlzoACOWA+T2xF1A="; }; postPatch = '' @@ -39,6 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + deprecated hepunits ]; diff --git a/nixpkgs/pkgs/development/python-modules/paste/default.nix b/nixpkgs/pkgs/development/python-modules/paste/default.nix index ba082c9285b9..2388e2d15c6d 100644 --- a/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.5.2"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-lpQMzrRpcG5TqWm/FJn4oo9TV8Skf0ypZVeQC4y8p1U="; + hash = "sha256-W02UY9P3qjIFhR/DCpQZyvjEmJYl0MvMcGt9N4xgbaY="; }; postPatch = '' @@ -35,15 +35,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # broken test - "test_file_cache" - # requires network connection - "test_proxy_to_website" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # https://github.com/cdent/paste/issues/72 - "test_form" - ]; + preCheck = '' + # needs to be modified after Sat, 1 Jan 2005 12:00:00 GMT + touch tests/urlparser_data/secured.txt + ''; pythonNamespaces = [ "paste" diff --git a/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix b/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix index ecdc7dfe80d9..31ec1f003144 100644 --- a/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix @@ -2,20 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pathvalidate"; - version = "2.5.2"; - format = "setuptools"; + version = "3.1.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X/V9D6vl7Lek8eSVe/61rYq1q0wPpx95xrvCS9m30U0="; + hash = "sha256-QmlwIm4kGZ/ZDZOZXSI8Hii9qWfN9DcHVaFM33KiqO4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Requires `pytest-md-report`, causing infinite recursion. doCheck = false; @@ -24,8 +29,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc"; + description = "Library to sanitize/validate a string such as filenames/file-paths/etc"; homepage = "https://github.com/thombashi/pathvalidate"; + changelog = "https://github.com/thombashi/pathvalidate/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ oxalica ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/patool/default.nix b/nixpkgs/pkgs/development/python-modules/patool/default.nix index f23521ea2140..7d22c167a356 100644 --- a/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -1,6 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, - cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file, - gzip, bzip2, xz}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, p7zip +, cabextract +, zip +, lzip +, zpaq +, gnutar +, gnugrep +, diffutils +, file +, gzip +, bzip2 +, xz +}: # unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar) # it will still use unrar if present in the path @@ -24,15 +39,31 @@ in buildPythonPackage rec { pname = "patool"; version = "1.12"; + format = "setuptools"; #pypi doesn't have test data src = fetchFromGitHub { owner = "wummel"; repo = pname; rev = "upstream/${version}"; - sha256 = "0v4r77sm3yzh7y1whfwxmp01cchd82jbhvbg9zsyd2yb944imzjy"; + hash = "sha256-Xv4aCUnLi+b1T29tuKRADTIWwK2dO8iDP/D7UfU5mWw="; }; + patches = [ + # https://github.com/wummel/patool/pull/63 + (fetchpatch { + name = "apk-sometimes-has-mime-jar.patch"; + url = "https://github.com/wummel/patool/commit/a9f3ee3d639a1065be024001e89c0b153511b16b.patch"; + hash = "sha256-a4aWqHHc/cBs5T2QKZ08ky1K1tqKZEgqVmTmV11aTVE="; + }) + # https://github.com/wummel/patool/pull/130 + (fetchpatch { + name = "apk-sometimes-has-mime-android-package.patch"; + url = "https://github.com/wummel/patool/commit/e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd.patch"; + hash = "sha256-AVooVdU4FNIixUfwyrn39N2SDFHNs4CUYzS5Eey+DrU="; + }) + ]; + postPatch = '' substituteInPlace patoolib/util.py \ --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' diff --git a/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix index fc9987d3e903..e337bf292fcf 100644 --- a/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , pythonRelaxDepsHook , imagemagick +, pip , pytestCheckHook , pymupdf , fire @@ -29,7 +30,12 @@ buildPythonPackage { hash = "sha256-NrT4GURQIJbqnHstfJrPzwLXT9c2oGBi4QJ6eGIFwu4="; }; - nativeBuildInputs = [ pythonRelaxDepsHook imagemagick ]; + nativeBuildInputs = [ + pip + pythonRelaxDepsHook + imagemagick + ]; + pythonRemoveDeps = [ "opencv-python" ]; preBuild = "echo '${version}' > version.txt"; diff --git a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 200d765c81f2..e92022ecd68a 100644 --- a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.0.3"; + version = "19.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DRTXBOrz//IdoMC+zKFkKS2KX0EsAbTqu1tOqskQRQ4="; + hash = "sha256-1j1QQo8hTUM7CzDUiRvOUWImb+rGIQgPWl69hTvlZUo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 56d36ebdda56..51f13095ed08 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.143"; - format = "flit"; + version = "2.1.145"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xyYD9oGrlK1kswQ7uiO3/gAJUnelvWv7ZHyzn/g5iCg="; + hash = "sha256-1rrIxOjOdGz+Xxb6QrH6Zth/eF+zaBOGFf4I9P17nbI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 1e2fc644b29d..9e0815ddfc71 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -7,6 +7,7 @@ , pythonOlder , scramp , setuptools +, versioningit }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + versioningit ]; propagatedBuildInputs = [ @@ -33,10 +35,6 @@ buildPythonPackage rec { importlib-metadata ]; - postPatch = '' - sed '/^\[metadata\]/a version = ${version}' setup.cfg - ''; - # Tests require a running PostgreSQL instance doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 0c0b611fbb06..61022edb9f22 100644 --- a/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.3"; + version = "5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fiNd+11hqMHgzSMNT7fgne3pTeJ4nu5krA48LCgIaIQ="; + hash = "sha256-fyLvgaYHmTh9OaWXkuenKmNTHCVYFln/FbN+5u2a9+8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pgvector/default.nix b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix index 89f3974d4069..a521038ef03d 100644 --- a/nixpkgs/pkgs/development/python-modules/pgvector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ="; + hash = "sha256-Phe8iAdOCVp4wpLuLfO+fQMD1MOD47OEIQJ45rYQzug="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 976fd81f6cfd..3fca04a27db4 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.18"; + version = "8.13.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s2DHViUoBdRLRHtbym0lDPa9bGm28PQljzv+Wrgb72k="; + hash = "sha256-OBgCR2lyQMzt103sS/vbwiuxCLnF+ZHycMo+QTleb5Y="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/picosvg/default.nix b/nixpkgs/pkgs/development/python-modules/picosvg/default.nix index a04479cfb414..d344fca85e59 100644 --- a/nixpkgs/pkgs/development/python-modules/picosvg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/picosvg/default.nix @@ -11,13 +11,13 @@ }: buildPythonPackage rec { pname = "picosvg"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "googlefonts"; repo = pname; - rev = "v${version}"; - hash = "sha256-J06ijF1c3ZKPqKiQha6yqfj8EjFZoZzA6i6UCCrexi8="; + rev = "refs/tags/v${version}"; + hash = "sha256-jG1rfamegnX8GXDwqkGFBFzUeycRLDObJvGbxNk6OpM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index f1489e1f458d..bb669f421177 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -24,6 +24,16 @@ import ./generic.nix (rec { hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; }; + patches = [ + # Pull in zlib-1.3 fix pending upstream inclusion + # https://github.com/python-pillow/Pillow/pull/7344 + (fetchpatch { + name = "zlib-1.3.patch"; + url = "https://github.com/python-pillow/Pillow/commit/9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1.patch"; + hash = "sha256-N7V6Xz+SBHSm3YIgmbty7zbqkv8MzpLMhU4Xxerhx8w="; + }) + ]; + passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix index a4dd78a557e6..6cc7cd22a97d 100644 --- a/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, setuptools-scm +, wheel , pint , pandas , pytestCheckHook @@ -20,8 +22,12 @@ buildPythonPackage rec { hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index f1fcf59ce2fe..1871ce74dd73 100644 --- a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -11,19 +11,21 @@ , pythonOlder , setuptools , setuptools-scm +, tomli +, tomli-w , wheel }: buildPythonPackage rec { pname = "pip-tools"; - version = "6.13.0"; + version = "7.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YdRr0uuAFu1Kkk4Zbm5bCiaM07q9eeWTBIcg2yNSK7E="; + hash = "sha256-jpyZEn/gJMAltGoLLRXHvUfxjzMibPczDTVJNmP8HR0="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; @@ -39,11 +41,16 @@ buildPythonPackage rec { pip setuptools wheel + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-xdist pytestCheckHook + tomli-w ]; preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' diff --git a/nixpkgs/pkgs/development/python-modules/pip/default.nix b/nixpkgs/pkgs/development/python-modules/pip/default.nix index ebac5724d66f..bc06cb39e247 100644 --- a/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage -, bootstrapped-pip , fetchFromGitHub +, installShellFiles , mock , scripttest +, setuptools , virtualenv +, wheel , pretend , pytest @@ -14,33 +16,40 @@ buildPythonPackage rec { pname = "pip"; - version = "23.0.1"; - format = "other"; + version = "23.2.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BSonlwKmegrlrQTTIL0avPi61/TY2M0f7kOZpSzPRQk="; - name = "${pname}-${version}-source"; + hash = "sha256-mUlzfYmq1FE3X1/2o7sYJzMgwHRI4ib4EMhpg83VvrI="; }; - nativeBuildInputs = [ bootstrapped-pip ]; - postPatch = '' # Remove vendored Windows PE binaries # Note: These are unused but make the package unreproducible. find -type f -name '*.exe' -delete ''; - # pip detects that we already have bootstrapped_pip "installed", so we need - # to force it a little. - pipInstallFlags = [ "--ignore-installed" ]; + nativeBuildInputs = [ + installShellFiles + setuptools + wheel + ]; nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; + # Pip wants pytest, but tests are not distributed doCheck = false; + postInstall = '' + installShellCompletion --cmd pip \ + --bash <($out/bin/pip completion --bash) \ + --fish <($out/bin/pip completion --fish) \ + --zsh <($out/bin/pip completion --zsh) + ''; + passthru.tests = { inherit pip-tools; }; meta = { @@ -48,6 +57,5 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; homepage = "https://pip.pypa.io/"; changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}"; - priority = 10; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index d248672b170a..250ad2f2399d 100644 --- a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { hatch-vcs ]; - propagatedBuildInput = [ + propagatedBuildInputs = [ pip ]; diff --git a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 33831490708f..f48ffb81e586 100644 --- a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.3.2"; + version = "0.4.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-aPG0MgChnJbivJRjYx9aQE5OPhL4WlPyt5uKCHZUpeE="; + hash = "sha256-QNp+KYOJIKV1fROmIhnWgDXFU8CymXkS2p90bOEPeoQ="; }; nativeBuildInputs = [ @@ -33,11 +33,6 @@ buildPythonPackage rec { typer ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' - ''; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix new file mode 100644 index 000000000000..b82712dc443f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, importlib-resources +, setuptools +, packaging +, tomli +, tox +}: + +buildPythonPackage rec { + pname = "pkg-about"; + version = "1.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "pkg_about"; + inherit version; + extension = "zip"; + hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; + }; + + nativeBuildInputs = [ + packaging + setuptools + tox + ]; + + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + packaging + setuptools + tomli + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pkg_about" + ]; + + meta = with lib; { + description = "Python metadata sharing at runtime"; + homepage = "https://github.com/karpierz/pkg_about/"; + changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst"; + license = licenses.zlib; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 99fbb98703bf..a449edd308b6 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "15.4.0"; + version = "15.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IO+IIMMJHrpVTS/L/cwwK2UYrYZDDQ0F/AxKITms9+0="; + hash = "sha256-zI3fOd1IcnXS5moM3mHl/1qzrAHnxoVrFg1GBCqiA10="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/nixpkgs/pkgs/development/python-modules/playwright/default.nix index 1c64471778a6..ec7a53f423a0 100644 --- a/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.36.0"; + version = "1.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc="; + hash = "sha256-7egK76A3+C+JPbCNFXDd4qTjepBRSZgtQmFrE/jWJN4="; }; patches = [ @@ -88,6 +88,7 @@ buildPythonPackage rec { driver = playwright-driver; browsers = playwright-driver.browsers; }; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/playwright/update.sh b/nixpkgs/pkgs/development/python-modules/playwright/update.sh index 464f9a3cba05..23c327608865 100755 --- a/nixpkgs/pkgs/development/python-modules/playwright/update.sh +++ b/nixpkgs/pkgs/development/python-modules/playwright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix +#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix jq set -euo pipefail root="$(dirname "$(readlink -f "$0")")" diff --git a/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index 270c78a69826..1205b860b8da 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -6,53 +6,72 @@ , pythonOlder , build , git -, importlib-metadata -, pep517 , pytest-mock , pytestCheckHook , setuptools +, tomli-w , virtualenv }: buildPythonPackage rec { pname = "poetry-core"; - version = "1.5.1"; + version = "1.6.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-h3d0h+WCrrNlfPOlUx6Rj0aG6untD6MiunqvPj4yT+0="; + hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; }; # revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/0bdf29e9631fda9436066a07ca8e69a4aa97a31e.patch"; + revert = true; + hash = "sha256-Uqlv17GUcmVkB6ZFePtrbUonsbkiIXay7LLuT/WcPh8="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/48447a18a60c43240bf075fc0c2501f6d68f0211.patch"; + revert = true; + hash = "sha256-23GazppqYmuAmkE/xMtuzng2PbxhYNwgtmsvb6lfvig="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/bc97ac6030049a01e5337fcb53493112a9c75a81.patch"; + revert = true; + hash = "sha256-8NAG+Xm/BNL16NONZJRNB3JiRRKvjMsZJH2FWlw+dHk="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/835bc91393fbb983de6227d67b076aea1360ea68.patch"; + revert = true; + hash = "sha256-Z5viypprDY9GGeX6luBsIoSI9D0lN9g14U9uMh4DTfA="; + }) + (fetchpatch { url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch"; revert = true; hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8="; }) (fetchpatch { url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch"; + excludes = [ + "vendors/poetry.lock" + "vendors/pyproject.toml" + ]; revert = true; - hash = "sha256-fXq8L23qjLraLeMzB1bwW1jU0eGd236/GHIoYKwOuL0="; + hash = "sha256-mbu16qFH9ymDZ0KIMiYMy7js5OmxY7z5qg6ZfgfgeLs="; }) ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - nativeCheckInputs = [ build git - pep517 pytest-mock pytestCheckHook setuptools + tomli-w virtualenv ]; diff --git a/nixpkgs/pkgs/development/python-modules/polyline/default.nix b/nixpkgs/pkgs/development/python-modules/polyline/default.nix index 26cec2331cb7..5ab360ae7e37 100644 --- a/nixpkgs/pkgs/development/python-modules/polyline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/polyline/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -20,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-e9ZDqcS3MaMlXi2a2JHI6NtRPqIV7rjsucGXEH6V8LA="; }; + patches = [ + # https://github.com/frederickjansen/polyline/pull/15 + (fetchpatch { + name = "relax-build-dependencies.patch"; + url = "https://github.com/frederickjansen/polyline/commit/cb9fc80606c33dbbcaa0d94de25ae952358443b6.patch"; + hash = "sha256-epg2pZAG+9QuICa1ms+/EO2DDmYEz+KEtxxnvG7rsWY="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=polyline --cov-report term-missing" "" @@ -27,6 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + wheel ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix b/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix new file mode 100644 index 000000000000..b45d72f3d07d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, construct +, fetchFromGitHub +, pytestCheckHook +, python-dateutil +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "procmon-parser"; + version = "0.3.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "eronnen"; + repo = "procmon-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-XkMf3MQK4WFRLl60XHDG/j2gRHAiz7XL9MmC6SRg9RE="; + }; + + propagatedBuildInputs = [ + construct + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + python-dateutil + ]; + + pythonImportsCheck = [ + "procmon_parser" + ]; + + meta = with lib; { + description = "Parser to process monitor file formats"; + homepage = "https://github.com/eronnen/procmon-parser/"; + changelog = "https://github.com/eronnen/procmon-parser/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix b/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix index 911637bf8505..7c88211f5d27 100644 --- a/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix @@ -3,6 +3,7 @@ , bash , buildPythonPackage , fetchFromGitHub +, fetchpatch , gnumake , httpx , openssl @@ -13,6 +14,7 @@ , pythonOlder , setuptools-scm , typing-extensions +, wheel }: buildPythonPackage rec { @@ -29,6 +31,22 @@ buildPythonPackage rec { hash = "sha256-dA7a9RicBFCSf6IoGX/CdvI8x/xMOFfNtyuvFn9YmHI="; }; + patches = [ + # this patch is so that the one following it applies cleanly + # https://github.com/abhinavsingh/proxy.py/pull/1209 + (fetchpatch { + name = "update-build-dependencies.patch"; + url = "https://github.com/abhinavsingh/proxy.py/commit/2e535360ce5ed9734f2c00dc6aefe5ebd281cea5.patch"; + hash = "sha256-eR3R4M7jwQMnY5ob0V6G71jXcrkV7YZvo1JOUG4gnrY="; + }) + # https://github.com/abhinavsingh/proxy.py/pull/1345 + (fetchpatch { + name = "remove-setuptools-scm-git-archive-dependency.patch"; + url = "https://github.com/abhinavsingh/proxy.py/commit/027bfa6b912745f588d272f1a1082f6ca416f815.patch"; + hash = "sha256-O2LlSrSrB3u2McAZRY+KviuU7Hv1tOuf0n+D/H4BWvI="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "SHELL := /bin/bash" "SHELL := ${bash}/bin/bash" @@ -40,6 +58,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 1c6e042e5778..79070dcfcb08 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230814"; + version = "0.10.0.20230828"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GG6ilUUauVT2u/BuS4agzJVQdydEuGwpxJVznWDb46Q="; + hash = "sha256-eVPcj1gMY9a8Znhon2lEs9EKWgc55euyvzxnrkDH05o="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index a1cedcaa5ab4..cad2f1366e18 100644 --- a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.42.0"; + version = "6.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-UUUnbByfxBMdJzZRu7EZHa809eshrR4h4poBxJAdTiI="; + hash = "sha256-AnyKDoD7hh3iYheUK8RXFfXEi5yChkZNAyWobC2ghmQ="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix index 6c70ad8861c7..27443d166e76 100644 --- a/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix @@ -4,8 +4,10 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -22,8 +24,18 @@ buildPythonPackage rec { hash = "sha256-1jIsKQa27XNVievU02jjanRWFtJDYsHolgPBab6qpM0="; }; + patches = [ + # https://github.com/emontnemery/py-dormakaba-dkey/pull/45 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/emontnemery/py-dormakaba-dkey/commit/cfda4be71d39f2cfd1c0d4f7fff9018050c57f1a.patch"; + hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix b/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix index 481d73134178..c6c35ebd297d 100644 --- a/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-wfVADL87ObJbuYQ2MYcRH0DCOGymS6+mrp7pAIKoS4Q="; + hash = "sha256-RObJSvkqD3T8i470po/CayGC/ae8J6rFQROsrQ1EAGs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 6d9ea5ddf2ed..951d5d849714 100644 --- a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.12.0"; + version = "4.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-cW9IQy4D2iaoQ6oHQ07f27YQR7q9DBv2JkoukUtPBRQ="; + hash = "sha256-5P0DfQL8lwCY4nvp5efB7fO7YyBMTRaB4qflkc+Arso="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index 75525b943445..c9563039b0a8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , certifi , fetchFromGitHub +, fetchpatch , numpy , poetry-core , pygments @@ -28,6 +29,15 @@ buildPythonPackage rec { hash = "sha256-+yqN3q+uA/v01uCguzUSoeCJK9lRmiiYn8d272+Dd2M="; }; + patches = [ + # https://github.com/bachya/pyairvisual/pull/298 + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/pyairvisual/commit/eb32beb7229a53ff81917cc417ed66b26aae47dd.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml --replace \ 'certifi = ">=2023.07.22"' \ @@ -46,6 +56,9 @@ buildPythonPackage rec { pysmb ]; + # this lets tests bind to localhost in sandbox mode on macOS + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix b/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix new file mode 100644 index 000000000000..c7a8e7d83ebf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, swig +}: + +buildPythonPackage rec { + pname = "pybox2d"; + version = "2.3.10"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pybox2d"; + repo = "pybox2d"; + rev = "refs/tags/${version}"; + hash = "sha256-yjLFvsg8GQLxjN1vtZM9zl+kAmD4+eS/vzRkpj0SCjY="; + }; + + nativeBuildInputs = [ + swig + ]; + + # We need to build the package explicitly a first time so that the library/Box2D/Box2D.py file + # gets generated. + # After that, the default behavior will succeed at installing the package. + preBuild = '' + python setup.py build + ''; + + pythonImportsCheck = [ + "Box2D" + "Box2D._Box2D" + ]; + + # Tests need to start GUI windows. + doCheck = false; + + meta = with lib; { + description = "2D Game Physics for Python"; + homepage = "https://github.com/pybox2d/pybox2d"; + license = licenses.zlib; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix index d8f9e4616f4e..b2c05f73bc63 100644 --- a/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pybtex-docutils"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q6o1O21Jj9WsMPAHOpjjMtBh00/mGdPVDRdh+P1KoBY="; + hash = "sha256-On69+StZPgDowcU4qpogvKXZLYQjESRxWsyWTVHZPGs="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycardano/default.nix b/nixpkgs/pkgs/development/python-modules/pycardano/default.nix new file mode 100644 index 000000000000..8345a3da2065 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycardano/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, blockfrost-python +, cbor2 +, cose +, ecpy +, frozendict +, frozenlist +, mnemonic +, poetry-core +, pprintpp +, pynacl +, setuptools +, typeguard +, websocket-client +}: + +let + cose_0_9_dev8 = cose.overridePythonAttrs (old: rec { + version = "0.9.dev8"; + src = (old.src.override { + rev = "v${version}"; + hash = "sha256-/jwq2C2nvHInsgPG4jZCr+XsvlUJdYewAkasrUPVaHM="; + }); + pythonImportsCheck = [ "cose" ]; + }); + +in buildPythonPackage rec { + pname = "pycardano"; + version = "0.9.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Python-Cardano"; + repo = "pycardano"; + rev = "v${version}"; + hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik="; + }; + + propagatedBuildInputs = [ + blockfrost-python + cbor2 + cose_0_9_dev8 + ecpy + frozendict + frozenlist + mnemonic + poetry-core + pprintpp + pynacl + setuptools + typeguard + websocket-client + ]; + + pythonImportsCheck = [ "pycardano" ]; + + meta = with lib; { + description = "A lightweight Cardano library in Python"; + homepage = "https://github.com/Python-Cardano/pycardano"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix b/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix index 89b1eef76b9f..79700a7bdc7f 100644 --- a/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pycmarkgfm"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; + hash = "sha256-oPklCB54aHn33ewTiSlXgx38T0RzLure5OzGuFwsLNo="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 8e51bf8d085f..eb1029837435 100644 --- a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.10.5"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-G4mNBHk8xskQyt1gbMqz5XhoTfWWxp+qTruOSqmTvOc="; + hash = "sha256-IBrd4PH8EzVVVFQtJdJ8bTMLEzfh7MYMe79yuCrhmww="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydeck/default.nix b/nixpkgs/pkgs/development/python-modules/pydeck/default.nix index ccdc8509b8cb..da009608b678 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeck/default.nix @@ -4,6 +4,7 @@ , ipykernel , ipywidgets , jinja2 +, jupyter , numpy , pandas , pytestCheckHook @@ -26,6 +27,8 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + jinja2 + jupyter setuptools wheel ]; diff --git a/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix b/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix index c18c0210c86d..52708208d4c9 100644 --- a/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , pytestCheckHook , pythonRelaxDepsHook @@ -26,10 +27,14 @@ buildPythonPackage rec { fetchSubmodules = true; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # https://github.com/razorx89/pydicom-seg/pull/54 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/razorx89/pydicom-seg/commit/ac91eaefe3b0aecfe745869972c08de5350d2b61.patch"; + hash = "sha256-xBOVjWZPjyQ8gSj6JLe9B531e11TI3FUFFtL+IelZOM="; + }) + ]; pythonRelaxDeps = [ "jsonschema" diff --git a/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix b/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix new file mode 100644 index 000000000000..d17c719196e1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pydiscourse"; + version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydiscourse"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "pydiscourse" + ]; + + meta = with lib; { + description = "A Python library for working with Discourse"; + homepage = "https://github.com/pydiscourse/pydiscourse"; + changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ Dettorer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix b/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix new file mode 100644 index 000000000000..4adda6c53ccc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix @@ -0,0 +1,65 @@ +{ lib +, aiohttp +, aioresponses +, apischema +, buildPythonPackage +, fetchFromGitHub +, freezegun +, gql +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, requests +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pydrawise"; + version = "2023.8.0"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-cnQJ0enDgOB66rEZePmfTImFrPNMiXfggATM6hsL+ag="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + apischema + gql + graphql-core + requests + ]; + + nativeCheckInputs = [ + aioresponses + freezegun + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pydrawise" + ]; + + meta = with lib; { + description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API"; + homepage = "https://github.com/dknowles2/pydrawise"; + changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix b/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix index a8d7dbb16c5d..6c1db830955a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2023.8.3"; + version = "2023.8.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-zqaW6iQe982BgxaxeeRFTJ/a2nySGoSW4sxKmNxbKQc="; + hash = "sha256-VDDDG/D21yumWmcTC0mwXoGItB7OTdVCcjo01W1YZXY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix new file mode 100644 index 000000000000..77ec68ea2884 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, black +, codespell +, isort +, mypy +, pre-commit +, pygobject3 +}: + +buildPythonPackage rec { + pname = "pygobject-stubs"; + version = "2.8.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pygobject"; + repo = "pygobject-stubs"; + rev = "v${version}"; + hash = "sha256-8TB8eqXPhvoKtyQ8+hnCQnH4NwO2WC1NYAxmVj+FCvg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # This package does not include any tests. + doCheck = false; + + meta = with lib; { + description = "PEP 561 Typing Stubs for PyGObject"; + homepage = "https://github.com/pygobject/pygobject-stubs"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ hacker1024 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 5018f8f924a5..5e83dc793ca5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -5,7 +5,6 @@ , cryptography , fetchFromGitHub , freezegun -, openssl , oscrypto , pytest-asyncio , pytestCheckHook @@ -29,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-q2YxncyMHmbRmcoLb68huK02CYiKqF2CFRl8vkUfxg4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "pytest-runner",' "" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix new file mode 100644 index 000000000000..7e59dbf9b112 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, setuptools +, setuptools-scm +, numpy +, pybind11 +, wheel +, pytestCheckHook +, pythonOlder +, graphviz +}: + +buildPythonPackage rec { + pname = "pyhepmc"; + version = "2.12.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + setuptools + setuptools-scm + wheel + ]; + + buildInputs = [ + pybind11 + ]; + + propagatedBuildInputs = [ + numpy + ]; + + dontUseCmakeConfigure = true; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; + + preBuild = '' + export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" + ''; + + nativeCheckInputs = [ + graphviz + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyhepmc" ]; + + meta = with lib; { + description = "Easy-to-use Python bindings for HepMC3"; + homepage = "https://github.com/scikit-hep/pyhepmc"; + changelog = "https://github.com/scikit-hep/pyhepmc/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 1747fc677398..dbf6ab12b44e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -4,6 +4,7 @@ , async-generator , buildPythonPackage , fetchFromGitHub +, fetchpatch , pypubsub , pyserial , pyserial-asyncio @@ -11,24 +12,35 @@ , pythonOlder , setuptools , voluptuous +, wheel }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.4.3"; + version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo="; + hash = "sha256-REm0E7+otqDypVslB5heHEaWA+q3Nh1O96gxFeCC3As="; }; + patches = [ + # https://github.com/pyinsteon/pyinsteon/pull/361 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -57,6 +69,7 @@ buildPythonPackage rec { 2413U, 2412S, 2448A7 and Hub models 2242 and 2245. ''; homepage = "https://github.com/pyinsteon/pyinsteon"; + changelog = "https://github.com/pyinsteon/pyinsteon/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix index 48cd93608e98..392595fbc082 100644 --- a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2022.10.0"; + version = "2023.08.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4xoK/SwpcsjIpGUertWoSlRsKIpgpV1XmuIzDJcZMZg="; + hash = "sha256-vPcb0mwREQri9FuYhWXihWSYnZ2ywBVujPMaNThTbVI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix index 69e55805993d..2b482295e422 100644 --- a/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2-cffi, python-dateutil, future +, argon2-cffi, python-dateutil , python }: buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.5"; + version = "4.0.6"; format = "setuptools"; @@ -14,16 +14,12 @@ buildPythonPackage rec { owner = "libkeepass"; repo = "pykeepass"; rev = "v${version}"; - hash = "sha256-IdILcIhrxcTDddoxiK257II0V7ctVb1CTLfTPmuwjTQ="; + hash = "sha256-832cTVzI/MFdwiw6xWzRG35z3iwqb5Qpf6W6XYBIFWs="; }; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - propagatedBuildInputs = [ lxml pycryptodomex construct - argon2-cffi python-dateutil future + argon2-cffi python-dateutil ]; propagatedNativeBuildInputs = [ argon2-cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index eb6a93bc4a7a..00d69542c897 100644 --- a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.5"; + version = "2023.4.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e3k4L/lY8yszqYmJCaZghtv1nrmTi+WyWuzYuHSXM08="; + hash = "sha256-74EKgHocrEi37bh4WBoYyLKF1XYrwxT7e2oo3igTWms="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index c25d11eb1180..374f7d26c9d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.39"; + version = "2.4.40"; src = fetchPypi { inherit pname version; - hash = "sha256-rS1EZGGAcWEi7MK565oii+KUaqACruLrWXNcB/aXPek="; + hash = "sha256-PWpVKtNEof/54MgRNhrJ2LuCAc9qrK1yJNUW+gN8yzA="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index 05da3476ea61..1f4bcb1cce29 100644 --- a/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -6,6 +6,12 @@ , markdown , pyyaml , pygments + +# for passthru.tests +, mkdocstrings +, mkdocs-material +, mkdocs-mermaid2-plugin +, hydrus }: let @@ -38,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.9.2"; + version = "10.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-ld3NuBTjDJUN4ZK+eTwmmfzcB8XCtg8xaLMECo95+Cg="; + hash = "sha256-KqDEmWAWXdDpQPsP9Vrced+Ozz9IZiD8rCG57hPR7Xs="; }; nativeBuildInputs = [ hatchling ]; @@ -59,6 +65,10 @@ buildPythonPackage rec { pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; + passthru.tests = { + inherit mkdocstrings mkdocs-material mkdocs-mermaid2-plugin hydrus; + }; + meta = with lib; { description = "Extensions for Python Markdown"; homepage = "https://facelessuser.github.io/pymdown-extensions/"; diff --git a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index 307ee7fbfd64..a27f49c8613a 100644 --- a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , environs , fetchFromGitHub +, gitpython , grpcio , grpcio-testing , mmh3 @@ -13,6 +14,7 @@ , scikit-learn , setuptools-scm , ujson +, wheel }: buildPythonPackage rec { @@ -29,15 +31,17 @@ buildPythonPackage rec { hash = "sha256-wwhgO2iCzPXobyZI0narHPn2WCAB9sS1+AoLrP1Ih6Q="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ "grpcio" ]; nativeBuildInputs = [ + gitpython pythonRelaxDepsHook setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix index 3d1c3a842208..6c7f1c0f59a2 100644 --- a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BTH34zv7OAaVKc20VASfv3QaxAt/Y14Dkd/PBo/V6vo="; + hash = "sha256-hlN5uUlgmcipQqmr22rB245oEXOUe5WB9jWo7MXXViE="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module intended to limit a functions resources"; homepage = "https://github.com/automl/pynisher"; + changelog = "https://github.com/automl/pynisher/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix index c0900b664439..9e0de7f3915d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyomo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.6.1"; + version = "6.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-1FSu5ejFjjNTuvaFU/UqAI/817HkrOA1Hczq8gcPQGA="; + hash = "sha256-hh2sfWOUp3ac75NEuTrw3YkvS7hXpzJp39v6cfrhNiQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix index bc0a350a31c6..f85e825f2645 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -2,12 +2,16 @@ , buildPythonPackage , pythonAtLeast , fetchPypi +, cython_3 +, numpy +, setuptools +, wheel }: buildPythonPackage rec { pname = "pyopengl-accelerate"; version = "3.1.7"; - disabled = pythonAtLeast "3.10"; # fails to compile + format = "pyproject"; src = fetchPypi { pname = "PyOpenGL-accelerate"; @@ -15,6 +19,13 @@ buildPythonPackage rec { hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA="; }; + nativeBuildInputs = [ + cython_3 + numpy + setuptools + wheel + ]; + meta = { description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x"; homepage = "https://pyopengl.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index c0e4ea20dd26..b9335d108b2e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyoutbreaksnearme"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; + hash = "sha256-Qrq8/dPJsJMJNXobc+Ps6Nbg819+GFuYplovGuWK0nQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index a12ae560bfc5..ac7f88d48575 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pandoc , pandocfilters +, poetry-core , pythonOlder , substituteAll , texlive @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "pypandoc"; version = "1.10"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,6 +32,10 @@ buildPythonPackage rec { ./skip-tests.patch ]; + nativeBuildInputs = [ + poetry-core + ]; + nativeCheckInputs = [ texlive.combined.scheme-small pandocfilters diff --git a/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/nixpkgs/pkgs/development/python-modules/pypck/default.nix index 3cdd7fa4aceb..3eef4a86ce8f 100644 --- a/nixpkgs/pkgs/development/python-modules/pypck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypck/default.nix @@ -2,11 +2,13 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -23,8 +25,18 @@ buildPythonPackage rec { hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE="; }; + patches = [ + # https://github.com/alengwenus/pypck/pull/109 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/alengwenus/pypck/commit/17023ebe8082120b1eec086842ca809ec6e9df2b.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix b/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix index 6ca6ac25a98d..6cbef5b8a77f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix @@ -6,7 +6,6 @@ # build time , hatchling , hatch-vcs -, setuptools-scm # runtime , packaging @@ -21,13 +20,14 @@ # tests , pytest-mock , pytestCheckHook +, setuptools , virtualenv , wheel }: buildPythonPackage rec { pname = "pyproject-api"; - version = "1.5.0"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-VO+huA9i7uMpCVaWHC29XlfestSu+N9vWWHteY21uqs="; + hash = "sha256-HX+5BypfEOfQ3vg3vha0QCVrEarjMu/Q8id+xgmWGfA="; }; outputs = [ @@ -44,12 +44,11 @@ buildPythonPackage rec { "doc" ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ hatchling hatch-vcs - setuptools-scm # docs sphinxHook @@ -66,6 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock pytestCheckHook + setuptools virtualenv wheel ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix b/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix index d751160b54d8..3624b5f02edb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , flit-core +, pyproject-hooks , pytestCheckHook , pythonOlder , setuptools @@ -30,17 +31,33 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ - pytestCheckHook - setuptools - testpath - ]; + # We need to disable tests because this package is part of the bootstrap chain + # and its test dependencies cannot be built yet when this is being built. + doCheck = false; - disabledTests = [ - # fail to import setuptools - "test_setup_py" - "test_issue_104" - ]; + passthru.tests = { + pytest = buildPythonPackage { + pname = "${pname}-pytest"; + inherit version; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + pyproject-hooks + pytestCheckHook + setuptools + testpath + ]; + + disabledTests = [ + # fail to import setuptools + "test_setup_py" + "test_issue_104" + ]; + }; + }; pythonImportsCheck = [ "pyproject_hooks" diff --git a/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix index 0227aa102331..345b5aa13a1e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -1,15 +1,28 @@ -{ lib, fetchPypi, buildPythonPackage, packaging, sip }: +{ lib +, buildPythonPackage +, fetchPypi +, packaging +, setuptools +, sip +, wheel +}: buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.14.1"; + version = "1.15.2"; + format = "pyproject"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - hash = "sha256-g7w+MAr/i0FAWAS2qcKRM4mrWcSK2fDLhYSm73O8pQI="; + hash = "sha256-dGz+g8A+v/RFjUeKHAZxR5Dvk+RY7NWii8KDe6yI63Q="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ packaging sip ]; pythonImportsCheck = [ "pyqtbuild" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 2252d619d030..3fdfd2bfdd6d 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-erqKAtTNMQQy/zUkpOd0LoQT2MY2mgz5yGuSQJ0QTjI="; + hash = "sha256-g3kGaNq07yMu3mnRDeZB3Ck8wwzK3HcOIzkl36cNOs8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 7fcd0092a7d4..bf939afd646c 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "refs/tags/v${version}"; - hash = "sha256-SWD3Jw1wehWLvWkLA7rotweExYCrabq7men22D0zN5w="; + hash = "sha256-ZDRHCzNLwBx8cugNVSkk7lZhE7MzariX0OS4pHv0f1s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index d438078e3cff..7b16c695e97f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-KHHs39RGksE7Rww8nHHo73+WOUzZaNiD4sZMhBPqqYQ="; + hash = "sha256-koXoBb3iyODQyjOmXSeEvVhYtrxpQtVb2HVqYBFkKrs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index ccb8e6245e33..9b02a38cb18b 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "refs/tags/v${version}"; - hash = "sha256-W3Osv0RApm6sCVdsLXUB79H3g62yUID4dtBi5Ywk5NY="; + hash = "sha256-5CDwevzD6R1nIcID6C5PV+i6pwY2CLakRC6NUXtmPs8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 4a05c5067e2a..b6f47d9f4a44 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-windows"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; rev = "refs/tags/v${version}"; - hash = "sha256-jXUTGt/kbw6XfxA7A+t9km5GdltV1VRBTUf4lw1AwO4="; + hash = "sha256-279+nP5IeZiIjKNhJ2adbcJSDzcu7yqIB5JNFK5CPF0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index c85399eefa24..6ea53e7dadd8 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, jinja2 , packaging , poetry-core , pyparsing @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.9.11"; + version = "0.10.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,19 +24,20 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-lbpx5THSegZK09jREH15RpokmdfOng2vX4tClsc/x/A="; + hash = "sha256-pEw0CmQYwZmfpN1mAv04eeOBTVX6JfW3aKhfofZaKYo="; }; + pythonRelaxDeps = [ + "packaging" + ]; + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "packaging" - ]; - propagatedBuildInputs = [ + jinja2 packaging pyparsing pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix b/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix new file mode 100644 index 000000000000..eecf54425380 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchDebianPatch +, fetchPypi +, buildPythonPackage +, m2crypto +}: + +buildPythonPackage rec { + pname = "pysimplesoap"; + # Unfortunately, the latest stable release is broken on Python 3. + version = "1.16.2"; + + src = fetchPypi { + pname = "PySimpleSOAP"; + inherit version; + hash = "sha256-sbv00NCt/5tlIZfWGqG3ZzGtYYhJ4n0o/lyyUJFtZ+E="; + }; + + propagatedBuildInputs = [ + m2crypto + ]; + + patches = map (args: fetchDebianPatch ({ + inherit pname version; + debianRevision = "5"; + } // args)) [ + # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027 + { patch = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; } + # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb + { patch = "fix-httplib2-version-check"; + hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; } + { patch = "reorder-type-check-to-avoid-a-TypeError"; + hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; } + # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227 + { patch = "Support-integer-values-in-maxOccurs-attribute"; + hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; } + { patch = "PR204"; + hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; } + ] ++ [ ./stringIO.patch ]; + + meta = with lib; { + description = "Python simple and lightweight SOAP Library"; + homepage = "https://github.com/pysimplesoap/pysimplesoap"; + license = licenses.lgpl3Plus; + + # I don't directly use this, only needed it as a dependency of debianbts + # so co-maintainers would be welcome. + maintainers = [ maintainers.nicoo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch b/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch new file mode 100644 index 000000000000..8ecad11b9a74 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch @@ -0,0 +1,31 @@ +diff --git i/pysimplesoap/c14n.py w/pysimplesoap/c14n.py +index 5749e49..297592e 100644 +--- i/pysimplesoap/c14n.py ++++ w/pysimplesoap/c14n.py +@@ -55,11 +55,8 @@ except: + class XMLNS: + BASE = "http://www.w3.org/2000/xmlns/" + XML = "http://www.w3.org/XML/1998/namespace" +-try: +- import cStringIO +- StringIO = cStringIO +-except ImportError: +- import StringIO ++ ++from io import StringIO + + _attrs = lambda E: (E.attributes and E.attributes.values()) or [] + _children = lambda E: E.childNodes or [] +diff --git i/pysimplesoap/xmlsec.py w/pysimplesoap/xmlsec.py +index 2f96df7..053149f 100644 +--- i/pysimplesoap/xmlsec.py ++++ w/pysimplesoap/xmlsec.py +@@ -15,7 +15,7 @@ from __future__ import print_function + import base64 + import hashlib + import os +-from cStringIO import StringIO ++from io import StringIO + from M2Crypto import BIO, EVP, RSA, X509, m2 + + # if lxml is not installed, use c14n.py native implementation diff --git a/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix b/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix index aa9bb6732fb1..27be3381ae4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.25"; + version = "0.3.26"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - hash = "sha256-yDeGY5BFj0DKqqK+CzrIxqLa7G5C6Le+GIcFHwtJK9E="; + hash = "sha256-aMgUwgKHgR+NQvRxiUV7GaXehjDIlJJJHwSmHDmzK08="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyslim/default.nix b/nixpkgs/pkgs/development/python-modules/pyslim/default.nix index fcb53da4a4f3..f21dc7b354e3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyslim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyslim/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyslim"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BRfv5AcdRpnvk7zGeYYWweh+foFEOSZjz3pTjX8KOnA="; + hash = "sha256-valAhPEVZNv/IYe85a88SGE+2/9O1omvBywz/HeeRco="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix b/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix index 24868e7a6b62..dd8d6ea4fcde 100644 --- a/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pysnooz"; - version = "0.8.5"; + version = "0.8.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,13 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AustinBrunkhorst"; repo = pname; - rev = "v${version}"; - hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg="; + rev = "refs/tags/v${version}"; + hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \ + --replace 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \ + --replace 'Events = "^0.4"' 'Events = ">=0.4"' \ --replace " --cov=pysnooz --cov-report=term-missing:skip-covered" "" ''; @@ -62,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control SNOOZ white noise machines"; homepage = "https://github.com/AustinBrunkhorst/pysnooz"; + changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix index 6b32660ad02d..b69bf47c96d7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow, fetchpatch }: buildPythonPackage rec { pname = "pyssim"; @@ -14,6 +14,18 @@ buildPythonPackage rec { sha256 = "sha256-VvxQTvDTDms6Ccyclbf9P0HEQksl5atPPzHuH8yXTmc="; }; + patches = [ + # "Replace Image.ANTIALIAS with Image.LANCZOS" + # Image.ANTIALIAS has been removed in Pillow 10.0.0, + # the version currently in nixpkgs, + # and Image.LANCZOS is a drop-in since Pillow 2.7.0. + # https://github.com/jterrace/pyssim/pull/45 + (fetchpatch { + url = "https://github.com/jterrace/pyssim/commit/db4296c12ca9c027eb9cd61b52195a78dfcc6711.patch"; + hash = "sha256-wNp47EFtjXv6jIFX25IErXg83ksmGRNFKNeMFS+tP6s="; + }) + ]; + # Tests are copied from .travis.yml checkPhase = '' $out/bin/pyssim test-images/test1-1.png test-images/test1-1.png | grep 1 diff --git a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index f952cb475eb9..5ea2ebb98405 100644 --- a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.39.0"; + version = "0.39.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-CswgfEmKaQvhDXizpcu6d8JMYtJSgNQ3L4+63ee58eE="; + hash = "sha256-wrn57mluIvUYBXOxw4NTFuq0UuOQwtC/WRWhfQpyRTA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix b/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix index 07461e06a298..86af2ae0846f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix @@ -1,31 +1,44 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib +{ lib +, buildPythonPackage , dataproperty +, dominate +, elasticsearch +, fetchFromGitHub +, loguru , mbstrdecoder +, pandas , pathvalidate +, pytestCheckHook +, pythonOlder +, pyyaml , setuptools +, simplejson , tabledata , tcolorpy -, typepy -, pytestCheckHook -, pyyaml , toml -, elasticsearch -, dominate +, typepy +, xlsxwriter +, xlwt }: buildPythonPackage rec { pname = "pytablewriter"; - version = "0.64.2"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-+IOHnmdd9g3SoHyITJJtbJ0/SAAmwWmwX5XeqsO34EM="; + rev = "refs/tags/v${version}"; + hash = "sha256-VDx7/kKRBho4oWvUXYe5K9CC4vUCDs91G05Wlpa47OE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dataproperty mbstrdecoder @@ -35,23 +48,82 @@ buildPythonPackage rec { typepy ]; - checkInputs = [ pyyaml toml elasticsearch dominate ]; - nativeCheckInputs = [ pytestCheckHook ]; - # Circular dependency + passthru.optional-dependencies = { + all = [ + dominate + elasticsearch + loguru + pandas + # pytablereader + pyyaml + simplejson + toml + xlsxwriter + xlwt + ]; + es = [ + elasticsearch + ]; + es8 = [ + elasticsearch + ]; + excel = [ + xlwt + xlsxwriter + ]; + html = [ + dominate + ]; + logging = [ + loguru + ]; + # from = [ + # pytablereader + # ]; + pandas = [ + pandas + ]; + # sqlite = [ + # simplesqlite + # ]; + # theme = [ + # pytablewriter-altrow-theme + # ]; + toml = [ + toml + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "pathvalidate" + ]; + disabledTests = [ + # Circular dependency "test_normal_from_file" "test_normal_from_text" "test_normal_clear_theme" + # Test compares CLI output + "test_normal" ]; + disabledTestPaths = [ "test/writer/binary/test_excel_writer.py" "test/writer/binary/test_sqlite_writer.py" ]; meta = with lib; { - homepage = "https://github.com/thombashi/pytablewriter"; description = "A library to write a table in various formats"; - maintainers = with maintainers; [ genericnerdyusername ]; + homepage = "https://github.com/thombashi/pytablewriter"; + changelog = "https://github.com/thombashi/pytablewriter/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/nixpkgs/pkgs/development/python-modules/pytado/default.nix index ddd618d6d14f..8575fceadc4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytado/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , pytestCheckHook , requests +, pythonOlder }: buildPythonPackage rec { pname = "pytado"; - version = "0.16.0"; + version = "0.17.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; - # Upstream hasn't tagged 0.13.0 yet rev = "refs/tags/${version}"; - sha256 = "sha256-tpWr+VlkJ9svN9XtBIDEAos4uxYCl6njvUBPIJG++Yg="; + sha256 = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; propagatedBuildInputs = [ @@ -32,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for Tado web API"; homepage = "https://github.com/wmalgadey/PyTado"; - license = licenses.gpl3; + changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix index f2a8d4bf1dc8..53766a3134a5 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.3.3"; + version = "0.4.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-2xdRW8Q10x6mtNs/EdAsgrOtVmvLAOdbIGXfyeB8ZAg="; + hash = "sha256-yYFzaIPYOsuvS8bGcuwQQNS/CtvGUe1XQdORmfEJQmU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix index 87c0e8d33a02..7a53cbbba882 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix @@ -5,8 +5,8 @@ # install dependencies , pytest , vcrpy -, attrs # test dependencies +, hatchling , pytestCheckHook , pytest-httpbin , pytest-mock @@ -15,22 +15,23 @@ buildPythonPackage rec { pname = "pytest-recording"; - version = "0.12.2"; + version = "0.13.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "kiwicom"; repo = "pytest-recording"; rev = "v${version}"; - hash = "sha256-nivwxaW8AIrBtPkzPJYfxlPxWn2NuYcaMry/IrBnnl0="; + hash = "sha256-SCHdzii6GYVWVY7MW/IW6CNZMuu5h/jXEj49P0jvhoE="; }; buildInputs = [ + hatchling pytest ]; propagatedBuildInputs = [ vcrpy - attrs ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix index fe663c3f265b..df1ae78c8612 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "8.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-m0CCi1j7esK/8pzBRlk0rfQ08Q3VoQj2BTXe5SZgpj0="; + hash = "sha256-UxGzaeBUaSD85GTDv5RbVevnWhJ1aPbWFelLiJE0AUk="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; # markers don't get added when docker is not available (leads to warnings): - # https://github.com/pytest-dev/pytest-testinfra/blob/8.1.0/test/conftest.py#L228 + # https://github.com/pytest-dev/pytest-testinfra/blob/9.0.0/test/conftest.py#L223 preCheck = '' export HOME=$(mktemp -d) sed -i '54imarkers = \ diff --git a/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/nixpkgs/pkgs/development/python-modules/python-box/default.nix index cc66888ad4e7..3145debc745c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-box/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cython_3 , fetchFromGitHub , msgpack , poetry-core @@ -15,19 +16,20 @@ buildPythonPackage rec { pname = "python-box"; - version = "7.0.1"; + version = "7.1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-Ddt8/S6HzmOt1kvzRzed3+TbOacw6RG9nd2UNn+ELB4="; + hash = "sha256-oxT2y3um6BZ3bwYa+LWBoTgU+9b+V7XtQdCdECU3Gu0="; }; nativeBuildInputs = [ + cython_3 setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix index 647906511a17..10db66e4bb22 100644 --- a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aresponses +, backoff , buildPythonPackage , fetchFromGitHub , packaging @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.12"; + version = "0.5.15"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ftu79SnVa7wOMx/RiRBDPmmG7Mmw84r30G4yDzBea2k="; + hash = "sha256-PNgv3QXl3iyDX0KOn1egQrt6D64i3eCUyCPtXe94y0U="; }; postPatch = '' @@ -41,6 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff packaging pydantic yarl diff --git a/nixpkgs/pkgs/development/python-modules/python-creole/default.nix b/nixpkgs/pkgs/development/python-modules/python-creole/default.nix index a02a08e2b44b..52d13d452aff 100644 --- a/nixpkgs/pkgs/development/python-modules/python-creole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-creole/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , runtimeShell # build @@ -27,14 +28,20 @@ buildPythonPackage rec { hash = "sha256-8pXOnLNjhIv0d+BqjW8wlb6BT6CmFHSsxn5wLOv3LBQ="; }; + patches = [ + # https://github.com/jedie/python-creole/pull/77 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/jedie/python-creole/commit/bfc46730ab4a189f3142246cead8d26005a28671.patch"; + hash = "sha256-WtoEQyu/154Cfj6eSnNA+t37+o7Ij328QGMKxwcLg5k="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - substituteInPlace Makefile \ --replace "/bin/bash" "${runtimeShell}" diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 4c757735ada5..9a0269c983f0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.5.1"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-XTr5potc3t9TxHEqMydRsAzslmLnrzsGqDaM8qdKfp8="; + hash = "sha256-za2JY5Gu9MEqi3W1zxcuwYiJ5XLc43ig6Hdx/4JwDbY="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index bfb53c92df41..c6b5f1ec4539 100644 --- a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -4,6 +4,7 @@ , awesomeversion , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , protobuf , pytest-asyncio @@ -25,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA="; }; + patches = [ + # https://github.com/DCSBL/python-homewizard-energy/pull/235 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/DCSBL/python-homewizard-energy/commit/b006b0bc1f3d0b4a7569654a1afa90dd4cffaf18.patch"; + hash = "sha256-WQeepxiYnBfFcQAmrc3pavBz5j1Qo0HmUcOxsK/pr50="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -34,6 +44,8 @@ buildPythonPackage rec { aiohttp ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 846361aa064c..e3c1b155c90b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; + hash = "sha256-y7d7CuGuKYEUCjFHvWb+iDI6oDeVsTzBNPSySzxu1Zk="; }; # win_inet_pton is required for windows support diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 67bbaf998dbb..2dca97b7f858 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , docstring-to-markdown , fetchFromGitHub +, fetchpatch , flake8 , flaky , jedi @@ -28,6 +29,7 @@ , ujson , websockets , whatthepatch +, wheel , yapf }: @@ -45,7 +47,14 @@ buildPythonPackage rec { hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + patches = [ + # https://github.com/python-lsp/python-lsp-server/pull/416 + (fetchpatch { + name = "bump-jedi-upper-pin-to-0.20.patch"; + url = "https://github.com/python-lsp/python-lsp-server/commit/f33a93afc8c3a0f16751f9e1f6601a37967fd7df.patch"; + hash = "sha256-lBpzXxjlQp2ig0z2DRJw+jQZ5eRLIOJYjGrzfgvknDA="; + }) + ]; postPatch = '' substituteInPlace pyproject.toml \ @@ -53,6 +62,8 @@ buildPythonPackage rec { --replace "--cov pylsp --cov test" "" ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + pythonRelaxDeps = [ "autopep8" "flake8" @@ -65,6 +76,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix index 056b466216bf..890cfb50c2cc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-magic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix @@ -29,6 +29,14 @@ buildPythonPackage rec { url = "https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457.patch"; hash = "sha256-67GpjlGiR4/os/iZ69V+ZziVLpjmid+7t+gQ2aQy9I0="; }) + + # Upstream patch to amend test suite for-5.45: + # https://github.com/ahupp/python-magic/pull/290 + (fetchpatch { + name = "file-5.45.patch"; + url = "https://github.com/ahupp/python-magic/commit/3d2405ca80cd39b2a91decd26af81dcf181390a4.patch"; + hash = "sha256-HRsnO9MGfMD9BkJdC4SrEFQ1OZEaXpwakXFLoaCPK94="; + }) ]; preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index c04beb032f95..ccb013d14e54 100644 --- a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder # build , setuptools +, wheel # propagates , aiohttp @@ -39,8 +41,18 @@ buildPythonPackage rec { hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; }; + patches = [ + # https://github.com/home-assistant-libs/python-matter-server/pull/379 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/home-assistant-libs/python-matter-server/commit/1bbc945634db92ea081051645b03c3d9c358fb15.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix index f11bb76057f5..d6137cf191e2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix @@ -4,10 +4,13 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, fetchpatch +, pytest-asyncio , pytestCheckHook , pythonOlder , setuptools , voluptuous +, wheel }: buildPythonPackage rec { @@ -24,8 +27,18 @@ buildPythonPackage rec { hash = "sha256-bPN2h60ypjlKpXs1xDS7bZcGRXvatA3EdlAX/HLxxTM="; }; + patches = [ + # https://github.com/home-assistant-libs/python-otbr-api/pull/68 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/home-assistant-libs/python-otbr-api/commit/37eb19c12d17ac7d040ded035d8401def872fbda.patch"; + hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -36,6 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index c300ce9baa5b..5eb3b19afe06 100644 --- a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.32.3"; + version = "0.32.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-rKE+dgq0ax/EZ0qYkGVsnHhNxyt3F74hI2tZAaOHCqI="; + hash = "sha256-tZ0nyjARqXDffDOBTsGQ1iZSzzkMToUENb+NwhJ7xY4="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index cea69bf5b14b..605d8157051c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -14,13 +14,15 @@ , pytestCheckHook , pythonOlder , pytz +, setuptools +, wheel , tornado }: buildPythonPackage rec { pname = "python-telegram-bot"; version = "20.4"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -31,6 +33,11 @@ buildPythonPackage rec { hash = "sha256-owbJJZjBkMjsgfBLRl+rnePrIvQ0sUZs7rP9ie912pw="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiolimiter apscheduler diff --git a/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix b/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix index a9d585c777da..61d780809db5 100644 --- a/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "python-vagrant"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; + src = fetchFromGitHub { + owner = "pycontribs"; + repo = "python-vagrant"; + rev = "refs/tags/v${version}"; + hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; # The tests try to connect to qemu diff --git a/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix b/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix index f3a55cfb7f56..981f963db389 100644 --- a/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff"; hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI="; }) + # skip tests with expired test data + # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373 + ./skip-broken-tests.patch ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch b/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch new file mode 100644 index 000000000000..ea845e7da3de --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch @@ -0,0 +1,28 @@ +diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/OneLogin/saml2_tests/response_test.py +index fbe714f..bbed3c2 100644 +--- a/tests/src/OneLogin/saml2_tests/response_test.py ++++ b/tests/src/OneLogin/saml2_tests/response_test.py +@@ -562,6 +562,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): + response_2 = OneLogin_Saml2_Response(settings, xml_2) + self.assertTrue(response_2.check_one_condition()) + ++ @unittest.skip("test data expired") + def testCheckOneAuthnStatement(self): + """ + Tests the check_one_authnstatement method of SamlResponse +@@ -970,6 +971,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): + with self.assertRaisesRegex(Exception, 'Could not validate timestamp: expired. Check system clock.'): + response_2.is_valid(self.get_request_data(), raise_exceptions=True) + ++ @unittest.skip("test data expired") + def testIsInValidNoStatement(self): + """ + Tests the is_valid method of the OneLogin_Saml2_Response +@@ -1080,6 +1082,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): + with self.assertRaisesRegex(Exception, 'Found an Attribute element with duplicated Name'): + response.get_attributes() + ++ @unittest.skip("test data expired") + def testIsInValidDestination(self): + """ + Tests the is_valid method of the OneLogin_Saml2_Response class diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 6f782ae2139c..2701f7e64f1d 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.28.0"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-S/arFxM+9VZECqUzPijTxclBQ6oeiOxdRXQLb+uhkfM="; + hash = "sha256-ZEdBV+X9Ib1JvE8nzey+er7GrQMAV79zqn8ssC+kKdU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/nixpkgs/pkgs/development/python-modules/pytile/default.nix index 977cf15d074b..12d61c0da5eb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2023.04.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - hash = "sha256-SFHWhXKC7PIqanJIQyGcpM8klwxOAJPVtzk9w0i2YYA="; + rev = "refs/tags/${version}"; + hash = "sha256-wPtGofli3ZKBcAwjwjCbeYnLaSZ5lLshlBSz1/WlAcg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index d4067edd338e..c76b97c2374a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.6"; + version = "2.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-/RfHryuIFhLn9SCg6YVn0Ley8ajcIlsDtuKNuhUFm8M="; + hash = "sha256-R1uX5kPRnLWqqpEYbzJp7aOSK6e5mfyQ14CkbBCDszw="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 84a5aed8c7ad..d52436348ad7 100644 --- a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm +, wheel , requests , lxml , pandas @@ -27,6 +29,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ requests lxml pandas ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index a7c9ae9ecffe..292bd039f8d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-iZygYN3874o9miKxp2+0KDgQKFHDX73/45FzMSeSAlg="; + hash = "sha256-NmOa/DH/EapcYCrpdcdn4CR9DiKuVnrDvKbnTiO3Ldc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix b/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix index 56fef67a1f9f..55d6ff6b5db6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix @@ -7,6 +7,9 @@ , stringparser , typing-extensions , pytestCheckHook +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { @@ -19,9 +22,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyVISA-sim"; inherit version; - sha256 = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY="; + hash = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ pyvisa pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index 73376122eb1d..e13aafe71485 100644 --- a/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.6.1"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q9vWzgi2xZfN1sdzDmtJqELZE/L2s8xitYXFjsPueUU="; + hash = "sha256-JugXm8F+MXa0zVdrn1p3MPhI1RvgUTdo/X8x/ZsnCpY="; }; propagatedBuildInputs = [ @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://pywbem.github.io"; changelog = "https://github.com/pywbem/pywbem/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix b/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix index c03a4d01b170..694f37de3974 100644 --- a/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.9"; + version = "1.0.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LFA1GJCYFIWl7/YblRrYgAB4lbELpzhCJyjB8aCkJ/E="; + hash = "sha256-7eNhvpaikzdQBrzjXw67JGqoynvfmz4poruharTkuG0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index a2fc6c4bd279..277de7a83170 100644 --- a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6aigzwHP9iAQF4GKKQfnZl9sAbwZfOAG/xPf6ay7rGs="; + hash = "sha256-+AdNT7ClT8JkYLkwk+IVNWgXGS04WNtENOtqmbjv7nQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix b/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix index ef65af007d90..2590a557b8ce 100644 --- a/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , fetchPypi , pythonOlder , buildPythonPackage @@ -8,7 +9,9 @@ , matplotlib , numpy , pandas +, setuptools , versioningit +, wheel , xarray , hickle , ipython @@ -24,18 +27,29 @@ buildPythonPackage rec { pname = "qcodes-loop"; version = "0.1.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; - format = "pyproject"; src = fetchPypi { inherit version; pname = "qcodes_loop"; - sha256 = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; + hash = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; }; + patches = [ + # https://github.com/QCoDeS/Qcodes_loop/pull/39 + (fetchpatch { + name = "relax-versioningit-dependency.patch"; + url = "https://github.com/QCoDeS/Qcodes_loop/commit/58006d3fb57344ae24dd44bceca98004617b5b57.patch"; + hash = "sha256-mSlm/Ql8e5xPL73ifxSoVc9+U58AAcAmBkdW5P6zEsg="; + }) + ]; + nativeBuildInputs = [ + setuptools versioningit + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/nixpkgs/pkgs/development/python-modules/quandl/default.nix index b70cdf4de385..5be099d98697 100644 --- a/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -29,9 +29,13 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "6e0b82fbc7861610b3577c5397277c4220e065eee0fed4e46cd6b6021655b64c"; + hash = "sha256-bguC+8eGFhCzV3xTlyd8QiDgZe7g/tTkbNa2AhZVtkw="; }; + patches = [ + ./pandas2-datetime-removal.patch + ]; + propagatedBuildInputs = [ pandas numpy diff --git a/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch b/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch new file mode 100644 index 000000000000..6e473ad4fb3c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch @@ -0,0 +1,33 @@ +diff --git a/test/test_datatable_data.py b/test/test_datatable_data.py +index ee9ac61..0266a19 100644 +--- a/test/test_datatable_data.py ++++ b/test/test_datatable_data.py +@@ -1,3 +1,4 @@ ++import datetime + import re + import unittest + import httpretty +@@ -135,7 +136,7 @@ class ListDatatableDataTest(unittest.TestCase): + df = results.to_pandas() + self.assertEqual(df.index.name, 'None') + +- # if datatable has Date field then it should be convert to pandas datetime ++ # if datatable has Date field then it should be convert to datetime + @parameterized.expand(['GET', 'POST']) + def test_pandas_dataframe_date_field_is_datetime(self, request_method): + if request_method == 'POST': +@@ -143,10 +144,10 @@ class ListDatatableDataTest(unittest.TestCase): + datatable = Datatable('ZACKS/FC') + results = Data.page(datatable, params={}) + df = results.to_pandas() +- self.assertIsInstance(df['per_end_date'][0], pandas.datetime) +- self.assertIsInstance(df['per_end_date'][1], pandas.datetime) +- self.assertIsInstance(df['per_end_date'][2], pandas.datetime) +- self.assertIsInstance(df['per_end_date'][3], pandas.datetime) ++ self.assertIsInstance(df['per_end_date'][0], datetime.datetime) ++ self.assertIsInstance(df['per_end_date'][1], datetime.datetime) ++ self.assertIsInstance(df['per_end_date'][2], datetime.datetime) ++ self.assertIsInstance(df['per_end_date'][3], datetime.datetime) + + @parameterized.expand(['GET', 'POST']) + def test_to_numpy_returns_numpy_object(self, request_method): diff --git a/nixpkgs/pkgs/development/python-modules/radian/default.nix b/nixpkgs/pkgs/development/python-modules/radian/default.nix index d8ffc2bff9ef..ab33203d7011 100644 --- a/nixpkgs/pkgs/development/python-modules/radian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/radian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "radian"; - version = "0.6.6"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,13 +27,12 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU="; + hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' "" \ - --replace '0.3.39,<0.4.0' '0.3.39' + --replace '"pytest-runner"' "" ''; nativeBuildInputs = [ @@ -59,6 +58,8 @@ buildPythonPackage rec { git ]; + makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ]; + preCheck = '' export HOME=$TMPDIR export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 7410b8029a85..02cdcbed68cd 100644 --- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -15,6 +15,7 @@ , matplotlib , ipython , numpy +, oldest-supported-numpy , packaging , pytest-randomly , pytestCheckHook @@ -22,6 +23,7 @@ , setuptools , shapely , snuggs +, wheel }: buildPythonPackage rec { @@ -41,6 +43,10 @@ buildPythonPackage rec { nativeBuildInputs = [ cython gdal + numpy + oldest-supported-numpy + setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index 10e5a4ff34e3..f2a9f17ab670 100644 --- a/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.36.1"; + version = "14.43.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-JadtlJMxRib8FpNC4QGYXfUEJGyB1aniDbsbsBYU3no="; + hash = "sha256-ik/ADmu6yGY7xWXCAn0kcWJphANIIwM8QKWjm9xoVYQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index c6321ebab664..8c911b282605 100644 --- a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -17,12 +17,13 @@ buildPythonPackage rec { pname = "recordlinkage"; - version = "0.15"; + version = "0.16"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aIrx54vnf85I/Kit/4njg/VIOu6H0SE7NdQ1GbeP8Cc="; + hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/reflink/default.nix b/nixpkgs/pkgs/development/python-modules/reflink/default.nix index ccada2453a3e..44106c6ca814 100644 --- a/nixpkgs/pkgs/development/python-modules/reflink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reflink/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "reflink"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; + hash = "sha256-iCN17nMZJ1rl9qahKHQGNl2sHpZDuRrRDlGH0/hCU70="; }; propagatedBuildInputs = [ cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index f506b13a7795..62de4b4f88c5 100644 --- a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2023.06.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-W5W/2gBraraZs8ai8tyg3aRWvHt6WOQCVICuiAigae0="; + hash = "sha256-2czpPLTJOUxjzG0+aOyY01jfwlcRgoHiQdB6ybQ6gWg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/remarshal/default.nix b/nixpkgs/pkgs/development/python-modules/remarshal/default.nix index 738c2f18f661..5d2e002538c2 100644 --- a/nixpkgs/pkgs/development/python-modules/remarshal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/remarshal/default.nix @@ -18,23 +18,16 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.14.0"; + version = "0.17.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256:nTM3jrPf0kGE15J+ZXBIt2+NGSW2a6VlZCKj70n5kHM="; + hash = "sha256-FytVq9p7Yo0lS5rHj0crPIpHFjxolW8esSPkj2wLfaI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \ - --replace 'tomlkit = "^0.7"' 'tomlkit = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -52,6 +45,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}"; description = "Convert between TOML, YAML and JSON"; license = licenses.mit; homepage = "https://github.com/dbohdan/remarshal"; diff --git a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index e98159128247..073977d1252e 100644 --- a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -1,20 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook , zope_interface +, zope_testrunner , sphinx }: buildPythonPackage rec { pname = "repoze.sphinx.autointerface"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE="; }; - propagatedBuildInputs = [ zope_interface sphinx ]; + propagatedBuildInputs = [ + zope_interface + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + zope_testrunner + ]; meta = with lib; { homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; diff --git a/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/nixpkgs/pkgs/development/python-modules/reproject/default.nix index 3baf811140f9..00060c08bc2e 100644 --- a/nixpkgs/pkgs/development/python-modules/reproject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reproject/default.nix @@ -6,6 +6,7 @@ , cython , fetchPypi , numpy +, oldest-supported-numpy , pytest-astropy , pytestCheckHook , pythonOlder @@ -25,9 +26,16 @@ buildPythonPackage rec { hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "cython==" "cython>=" + ''; + nativeBuildInputs = [ astropy-extension-helpers cython + numpy + oldest-supported-numpy setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix index 4f1aafbdfa66..875771d8f8c6 100644 --- a/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "6.1"; + version = "6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-fljqFcySoLkW4MjKKV6LLG1A/uTRLhorUGPYbvwnmpw="; + hash = "sha256-23Prfjs5ZQ8NIdEMyN2pwOKYbmIclLDF3jL7De46CK8="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rfcat/default.nix b/nixpkgs/pkgs/development/python-modules/rfcat/default.nix index edb17bc813fd..9ee83c5fa728 100644 --- a/nixpkgs/pkgs/development/python-modules/rfcat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfcat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rfcat"; - version = "1.9.7"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "atlas0fd00m"; repo = "rfcat"; rev = "refs/tags/v${version}"; - hash = "sha256-VOLA/ZZLazW7u0VYkAHzDh4aaHGr3u09bKVOkhYk6Fk="; + hash = "sha256-hdRsVbDXRC1EOhBoFJ9T5ZE6hwOgDWSdN5sIpxJ0x3E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/riscof/default.nix b/nixpkgs/pkgs/development/python-modules/riscof/default.nix index d774e0ed3e8a..fc5874e39e33 100644 --- a/nixpkgs/pkgs/development/python-modules/riscof/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscof/default.nix @@ -1,15 +1,19 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , git -, riscv-isac -, riscv-config , jinja2 +, pythonOlder +, riscv-config +, riscv-isac }: buildPythonPackage rec { pname = "riscof"; version = "1.25.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "riscv-software-src"; @@ -18,18 +22,36 @@ buildPythonPackage rec { hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY="; }; - postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython"; - - propagatedBuildInputs = [ riscv-isac riscv-config jinja2 ]; - patches = [ - # riscof copies a template directory from the store, but breaks because it doesn't change permissions and expects it to be writeable + # riscof copies a template directory from the store, but breaks because it + # doesn't change permissions and expects it to be writeable ./make_writeable.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "import pip" "" + substituteInPlace riscof/requirements.txt \ + --replace "GitPython==3.1.17" "GitPython" + ''; + + propagatedBuildInputs = [ + riscv-isac + riscv-config + jinja2 + ]; + + pythonImportsCheck = [ + "riscof" + ]; + + # No unitests available + doCheck = false; + meta = with lib; { - homepage = "https://github.com/riscv-software-src/riscof"; description = "RISC-V Architectural Test Framework"; + homepage = "https://github.com/riscv-software-src/riscof"; + changelog = "https://github.com/riscv-software-src/riscof/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 75dd855af33f..409c3a0d7ed1 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, fetchpatch , lib , cerberus , pyyaml @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; version = "3.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "riscv-software-src"; @@ -17,6 +19,15 @@ buildPythonPackage rec { hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw="; }; + patches = [ + # Remove when updating to v3.8.0+ + (fetchpatch { + name = "remove-dangling-pip-import.patch"; + url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch"; + hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E="; + }) + ]; + propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix index 6d6a48425574..6fb44840f5b2 100644 --- a/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm +, wheel , docutils , importlib-metadata , jinja2 @@ -19,18 +21,19 @@ buildPythonPackage rec { pname = "rst2pdf"; version = "0.101"; - format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; + hash = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; }; outputs = [ "out" "man" ]; nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix b/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix index 055d5ff85728..4c929ceef965 100644 --- a/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix @@ -15,18 +15,18 @@ buildPythonPackage rec { pname = "rustworkx"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw="; + hash = "sha256-WwQuvRMDGiY9VrWPfxL0OotPCUhCsvbXoVSCNhmIF/g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ="; + hash = "sha256-QuzBJyM83VtB6CJ7i9/SFE8h6JbxkX/LQ9lOFSQIidU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix index bf0d3b28c9bb..b1fb11573eb7 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix @@ -14,7 +14,9 @@ , pyproject-metadata , pytest-subprocess , pytestCheckHook +, setuptools , tomli +, wheel }: buildPythonPackage rec { @@ -62,6 +64,8 @@ buildPythonPackage rec { ninja pytest-subprocess pytestCheckHook + setuptools + wheel ] ++ passthru.optional-dependencies.pyproject; disabledTestPaths = [ @@ -74,12 +78,6 @@ buildPythonPackage rec { "tests/test_setuptools_pep518.py" ]; - # Tries to access ninja.__version__ which our stub doesn't have. - # FIXME: remove for next cycle - disabledTests = [ - "test_get_ninja_programs_cmake_module" - ]; - pythonImportsCheck = [ "scikit_build_core" ]; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix index dbb5d2044e21..354c27f01915 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , matplotlib , networkx , nose @@ -24,12 +25,28 @@ buildPythonPackage rec { hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0="; }; + patches = [ + # https://github.com/scikit-fuzzy/scikit-fuzzy/pull/299 + (fetchpatch { + name = "numpy-1.25-test-compatibility-1.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/d7d114cff002e2edf9361a55cb985615e91797b5.patch"; + hash = "sha256-udF/z94tVGRHq7gcOko4BSkvVnqe/A/bAARfCPrc06M="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-2.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/f1612f6aeff34dc9329dbded7cee098fcd22ffd9.patch"; + hash = "sha256-Le1ECR4+RjWCkfqjVrd471GD7tuVaQlZ7RZd3zvFdHU="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-3.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/459b9602cf182b7b42f93aad8bcf3bda6f20bfb5.patch"; + hash = "sha256-gKrhNpGt6XoAlMwQW70OPFZj/ZC8NhQq6dEaBpGE8yY="; + }) + ]; + propagatedBuildInputs = [ networkx numpy scipy ]; nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; - # numpy API breakage: "AttributeError: module 'numpy' has no attribute 'float'" - disabledTests = [ "test_fuzzy_compare" ]; - pythonImportsCheck = [ "skfuzzy" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix index 03eaf556050f..7987f3bba1cb 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix @@ -54,6 +54,9 @@ let postPatch = '' patchShebangs skimage/_build_utils/{version,cythoner}.py + + substituteInPlace pyproject.toml \ + --replace "numpy==" "numpy>=" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix index fa35fbd9ed93..2cb24d76b2b9 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -8,6 +8,8 @@ , pkg-config , numpy , openblas +, setuptools +, wheel }: buildPythonPackage rec { @@ -23,6 +25,9 @@ buildPythonPackage rec { postPatch = '' patchShebangs . + + substituteInPlace pyproject.toml \ + --replace 'numpy==' 'numpy>=' ''; nativeBuildInputs = [ @@ -30,7 +35,10 @@ buildPythonPackage rec { gfortran git meson-python + numpy pkg-config + setuptools + wheel ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix b/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix index 9b140ae6fed5..f3d37df7735c 100644 --- a/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , django , sly @@ -20,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI="; }; + patches = [ + # https://github.com/15five/scim2-filter-parser/pull/43 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/15five/scim2-filter-parser/commit/675d85f3a3ff338e96a408827d64d9e893fa5255.patch"; + hash = "sha256-PjJH1S5CDe/BMI0+mB34KdpNNcHfexBFYBmHolsWH4o="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index d51c049589ee..e58a165f5cca 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -7,8 +7,6 @@ , python , pythonOlder , buildPythonPackage -, pypaBuildHook -, pipInstallHook , cython , gfortran , meson-python @@ -33,11 +31,9 @@ let # # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # - # Even if you do update these hashes manually, don't change their base - # (base16 or base64), because the update script uses sed regexes to replace - # them with the updated hashes. - version = "1.11.1"; - srcHash = "sha256-bgnYXe3EhzL7+Gfriz1cXCl2eYQJ8zF+rcIwHyZR8bQ="; + # The update script uses sed regexes to replace them with the updated hashes. + version = "1.11.2"; + srcHash = "sha256-7FE740/yKUXtujVX60fQB/xvCZFfV69FRihvSi6+UWo="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -59,7 +55,7 @@ let ''; in buildPythonPackage { inherit pname version; - format = "other"; + format = "pyproject"; src = fetchFromGitHub { owner = "scipy"; @@ -80,12 +76,22 @@ in buildPythonPackage { }) ]; + # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ - --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" + --replace 'numpy==' 'numpy>=' \ + --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" \ + --replace 'wheel<0.41.0' 'wheel' ''; - nativeBuildInputs = [ pypaBuildHook pipInstallHook cython gfortran meson-python pythran pkg-config wheel ]; + nativeBuildInputs = [ + cython + gfortran + meson-python + pythran + pkg-config + wheel + ]; buildInputs = [ blas @@ -99,14 +105,13 @@ in buildPythonPackage { propagatedBuildInputs = [ numpy ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ nose pytest pytest-xdist ]; doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' - # Relax deps a bit - substituteInPlace pyproject.toml \ - --replace 'numpy==' 'numpy>=' # Helps parallelization a bit export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES # We download manually the datasets and this variable tells the pooch diff --git a/nixpkgs/pkgs/development/python-modules/scipy/update.sh b/nixpkgs/pkgs/development/python-modules/scipy/update.sh index b0d6e2da4f41..c6b3dca49186 100755 --- a/nixpkgs/pkgs/development/python-modules/scipy/update.sh +++ b/nixpkgs/pkgs/development/python-modules/scipy/update.sh @@ -16,10 +16,12 @@ if grep -q 'version = "'$version $fname; then echo "Current version $version is the latest available, will update only datasets' hashes (don't take long)" else echoerr got version $version - sed -i -E 's/(version = ).*=/\1'$version'/g' $fname + sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname + # Verify the sed command above did not fail + grep -q $version $fname # Update srcHash - srcHash='"sha256-'$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .sha256)'"' - sed -i 's/srcHash = .*=";/srcHash = '$srcHash';/g' $fname + srcHash="$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .hash)" + sed -i -E 's#(srcHash = ").*(";)#\1'$srcHash'\2#g' $fname fi for d in $datasets; do diff --git a/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/nixpkgs/pkgs/development/python-modules/scramp/default.nix index 954a95c94cd8..aa6013589cd3 100644 --- a/nixpkgs/pkgs/development/python-modules/scramp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scramp/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -40,6 +42,7 @@ buildPythonPackage rec { postPatch = '' # Upstream uses versioningit to set the version + sed -i "/versioningit >=/d" pyproject.toml sed -i '/^name =.*/a version = "${version}"' pyproject.toml sed -i "/dynamic =/d" pyproject.toml ''; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 61b3ed1e1e2d..2fd3c6ceb7db 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-ThajP8jAOli99OjUvcofhnNU6sacz1c2WMf/NPoMrjk="; + hash = "sha256-kdZ4dfu1N2B7B+MTY0RXGKNTK1RObitLr4oEKyGh0Q8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 94cb5ab003cc..b3953486902e 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.29.2"; + version = "1.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; + hash = "sha256-bs2Eg9eq39/LeuAWyW8FlnPULRUvQXils7OFrAEIg0w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix b/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix index ef031de98347..258f958ce03f 100644 --- a/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix @@ -4,10 +4,12 @@ , git , mock , pep440 +, pip , pytestCheckHook , pythonOlder , setuptools-scm , six +, wheel }: buildPythonPackage rec { @@ -30,12 +32,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + wheel ]; nativeCheckInputs = [ git mock pep440 + pip pytestCheckHook six ]; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix new file mode 100644 index 000000000000..a9129334208f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix @@ -0,0 +1,76 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, nix-update-script +, pytestCheckHook +, git +, setuptools-scm +, writeScript +}: +buildPythonPackage rec { + pname = "setuptools-odoo"; + version = "3.1.12"; + src = fetchFromGitHub { + owner = "acsone"; + repo = pname; + rev = version; + hash = "sha256-GIX21gOENE0r3yFIyzwjaoEcb0XvuCqiPU8F3GLxNt4="; + }; + + propagatedBuildInputs = [ + setuptools-scm + ]; + + # HACK https://github.com/NixOS/nixpkgs/pull/229460 + SETUPTOOLS_SCM_PRETEND_VERSION = version; + patchPhase = '' + runHook prePatch + + old_manifest="$(cat MANIFEST.in 2>/dev/null || true)" + echo 'global-include **' > MANIFEST.in + echo "$old_manifest" >> MANIFEST.in + + runHook postPatch + ''; + + pythonImportsCheck = [ + "setuptools_odoo" + ]; + + setupHook = writeScript "setupHook.sh" '' + setuptoolsOdooHook() { + # Don't look for a version suffix from git when building addons + export SETUPTOOLS_ODOO_POST_VERSION_STRATEGY_OVERRIDE=none + + # Let setuptools-odoo know which files to install, when Git is missing + # HACK https://github.com/acsone/setuptools-odoo/issues/20#issuecomment-340192355 + echo 'recursive-include odoo/addons/* **' >> MANIFEST.in + + # Make sure you can import the built addon + for manifest in $(find -L . -name __manifest__.py); do + export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $manifest))" + done + } + + preBuildHooks+=(setuptoolsOdooHook) + ''; + + nativeCheckInputs = [ pytestCheckHook git ]; + disabledTests = [ + "test_addon1_uncommitted_change" + "test_addon1" + "test_addon2_uncommitted_version_change" + "test_odoo_addon1_sdist" + "test_odoo_addon1" + "test_odoo_addon5_wheel" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Setuptools plugin for Odoo addons"; + homepage = "https://github.com/acsone/setuptools-odoo"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index c851cef24b30..ad7638f3cb38 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -1,73 +1,36 @@ { stdenv +, lib , buildPythonPackage , fetchFromGitHub , python -, bootstrapped-pip -, lib -, pipInstallHook -, setuptoolsBuildHook +, wheel }: -let +buildPythonPackage rec { pname = "setuptools"; - version = "67.4.0"; - - # Create an sdist of setuptools - sdist = stdenv.mkDerivation rec { - name = "${pname}-${version}-sdist.tar.gz"; - - src = fetchFromGitHub { - owner = "pypa"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-QDHycUFA2VRUE9alan8rF0efZTNV3Jt0CskjkCc+in0="; - name = "${pname}-${version}-source"; - }; - - patches = [ - ./tag-date.patch - ./setuptools-distutils-C++.patch - ]; - - buildPhase = '' - ${python.pythonForBuild.interpreter} setup.py egg_info - ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar - - # Here we untar the sdist and retar it in order to control the timestamps - # of all the files included - tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/ - tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" --sort=name ${pname}-${version}.post0 - ''; - - installPhase = '' - echo "Moving sdist..." - mv dist/${name} $out - ''; + version = "68.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = "setuptools"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ew/DpI5XsYMB4kBfkFeeB5wv5cjx4oYTddZCWLgBHBs="; }; -in buildPythonPackage { - inherit pname version; - # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. - # Instead, we override it to remove setuptools to avoid a circular dependency. - # The same is done for pip and the pipInstallHook. - format = "other"; - src = sdist; + patches = [ + ./tag-date.patch + ./setuptools-distutils-C++.patch + ]; nativeBuildInputs = [ - bootstrapped-pip - (pipInstallHook.override{pip=null;}) - (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) + wheel ]; preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 ''; - pipInstallFlags = [ "--ignore-installed" ]; - - # Adds setuptools to nativeBuildInputs causing infinite recursion. - catchConflicts = false; - # Requires pytest, causing infinite recursion. doCheck = false; @@ -77,7 +40,6 @@ in buildPythonPackage { changelog = "https://setuptools.pypa.io/en/stable/history.html#v${replaceStrings [ "." ] [ "-" ] version}"; license = with licenses; [ mit ]; platforms = python.meta.platforms; - priority = 10; maintainers = teams.python.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index d4fbc5c861b8..c3264d7366f1 100644 --- a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.05.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dcWDB9tpKrFbnWf35HLDmgy2zNTzKNeJQrdtRXbSMvs="; + hash = "sha256-DExMa9z/VYAMoqUmr/gfZzYFWfTxnC+Cz4rRTaNSLBM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index fb6a49ff6204..349544f1d035 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w="; + hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index 47bbf831afda..ddf1866a1056 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.4.0.post0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM="; + hash = "sha256-Txx8kQNb3ODbaJXfuHERzPx4zGUqYXzy+jbLNaMyf+w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE="; + hash = "sha256-KQA8dfHnuysx9EUySJXZ/52Hfq6AbALwkBp3B1WJJuc="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/development/python-modules/smbus2/default.nix b/nixpkgs/pkgs/development/python-modules/smbus2/default.nix index ba36c02e6962..893dd1921b51 100644 --- a/nixpkgs/pkgs/development/python-modules/smbus2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smbus2/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "smbus2"; - version = "0.4.2"; + version = "0.4.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,19 +16,13 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; + hash = "sha256-tjJurJzDn0ATiYY3Xo66lwUs98/7ZLG3d4+h1prVHAI="; }; nativeCheckInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - pythonImportsCheck = [ "smbus2" ]; @@ -35,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Drop-in replacement for smbus-cffi/smbus-python"; homepage = "https://smbus2.readthedocs.io/"; + changelog = "https://github.com/kplindegaard/smbus2/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 42b225aa3819..35d7a877fed1 100644 --- a/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.35.0"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sZMmou9uHThl7AIMnuBxABnWTF1CCFsDj1I7FYxgJ3Y="; + hash = "sha256-ViFAPAA6uU5MQNHCTIw0OTR8eZPgF34GqRP+py6L6RU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/socksio/default.nix b/nixpkgs/pkgs/development/python-modules/socksio/default.nix index ad0e8e2e6c07..fb767db631d8 100644 --- a/nixpkgs/pkgs/development/python-modules/socksio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/socksio/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonAtLeast , flit-core @@ -19,6 +20,15 @@ buildPythonPackage { hash = "sha256-+IvrPaW1w4uYkEad5n0MsPnUlLeLEGyhhF+WwQuRxKw="; }; + patches = [ + # https://github.com/sethmlarson/socksio/pull/61 + (fetchpatch { + name = "unpin-flit-core.patch"; + url = "https://github.com/sethmlarson/socksio/commit/5c50fd76e7459bb822ff8f712172a78e21b8dd04.patch"; + hash = "sha256-VVUzFvF2KCXXkCfCU5xu9acT6OLr+PlQQPeVGONtU4A="; + }) + ]; + nativeBuildInputs = [ flit-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/soxr/default.nix b/nixpkgs/pkgs/development/python-modules/soxr/default.nix index 7c9251dfd7b6..20532f4c00fa 100644 --- a/nixpkgs/pkgs/development/python-modules/soxr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soxr/default.nix @@ -2,9 +2,10 @@ , buildPythonPackage , fetchFromGitHub -# build-sytem +# build-system , cython_3 , numpy +, oldest-supported-numpy , setuptools , setuptools-scm , gnutar @@ -29,12 +30,13 @@ buildPythonPackage rec { hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ cython_3 gnutar numpy + oldest-supported-numpy setuptools setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix b/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix index 956eaa30b847..913a458ae0f3 100644 --- a/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "spdx"; repo = "tools-python"; rev = "refs/tags/v${version}"; - hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM="; + hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index e5e92b8b038e..2a8085de7c23 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -5,7 +5,9 @@ , importlib-metadata , sphinx , pyenchant -, pbr +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { @@ -21,7 +23,9 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pbr + setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index edb6ab2ed29e..1a075b227913 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "2.0.4.2"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "absent1706"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE="; + hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index c3ad45ec13a6..4edb02182b11 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.34"; + version = "3.35"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM="; + hash = "sha256-j2/n+NEncs1c9FlHA6mNzQw3wP1oIN0gVBunS5/KNjo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 20a9a0d81f78..1c08e61f6660 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.26.1"; + version = "0.27.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/zYqYmmCcOLU8Di9b4BzDLFtB5wYEEF1bYN6u2rb8Lg="; + hash = "sha256-qT3ZJQY5l1K88llJdKoSkwHvfcWwjH6JysMnHYGknqw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stim/default.nix b/nixpkgs/pkgs/development/python-modules/stim/default.nix index 381676047c1a..734a3b3c9ff1 100644 --- a/nixpkgs/pkgs/development/python-modules/stim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stim/default.nix @@ -11,6 +11,8 @@ , matplotlib , networkx , scipy +, setuptools +, wheel , pandas }: @@ -28,9 +30,20 @@ buildPythonPackage rec { hash = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0="; }; + postPatch = '' + # asked to relax this in https://github.com/quantumlib/Stim/issues/623 + substituteInPlace pyproject.toml \ + --replace "pybind11==" "pybind11>=" + ''; + + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + propagatedBuildInputs = [ numpy - pybind11 ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index d41dcda8aba1..b05e147dcaa9 100644 --- a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -3,6 +3,8 @@ , fetchPypi , nose , setuptools +, setuptools-scm +, wheel , arrow , requests , units @@ -22,6 +24,12 @@ buildPythonPackage rec { hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + nativeCheckInputs = [ nose ]; @@ -33,7 +41,6 @@ buildPythonPackage rec { pint pydantic pytz - setuptools six ]; diff --git a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index 98bd27072d16..761a14fbfd03 100644 --- a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,20 +42,21 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.185.1"; + version = "0.205.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-PwhTD1k2GOVf6ACNDY1atLLP1jjAF6eTDCE3eLUIpJA="; + hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok="; }; patches = [ (fetchpatch { + # https://github.com/strawberry-graphql/strawberry/pull/2199 name = "switch-to-poetry-core.patch"; url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; @@ -64,7 +65,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --emoji --mypy-ini-file=mypy.ini --benchmark-disable" "" \ + --replace "--emoji --mypy-ini-file=mypy.ini" "" \ ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/nixpkgs/pkgs/development/python-modules/streamlit/default.nix index 2ab4d11e640d..95a11c70592b 100755 --- a/nixpkgs/pkgs/development/python-modules/streamlit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/streamlit/default.nix @@ -18,10 +18,12 @@ , pympler , python-dateutil , pythonOlder +, pythonRelaxDepsHook , requests , rich , tenacity , toml +, tornado , typing-extensions , tzlocal , validators @@ -30,16 +32,23 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.24.1"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version format; - hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; + hash = "sha256-JUdfsVo8yfsYSUXz/JNvARmYvYOG4MiS/r4UyWJb9Ho="; }; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ + "pillow" + "pydeck" + ]; + propagatedBuildInputs = [ altair blinker @@ -60,6 +69,7 @@ buildPythonPackage rec { rich tenacity toml + tornado typing-extensions tzlocal validators diff --git a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 7f13c29172e0..491af1105dae 100644 --- a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "TDAmeritrade"; repo = "stumpy"; rev = "refs/tags/v${version}"; - hash = "sha256-ARpXqZpWkbvIEDVkxA1SwlWoxq+3WO6tvv/e7WZ/25c="; + hash = "sha256-rVl3tIx8iWx2mnaix3V5YnfWWdPBTP8+K2JJKTfctDA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/syrupy/default.nix b/nixpkgs/pkgs/development/python-modules/syrupy/default.nix index a8047c5b16be..cd9d2addc604 100644 --- a/nixpkgs/pkgs/development/python-modules/syrupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/syrupy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder +, python , poetry-core , pytest , colored @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.0.8"; + version = "4.2.1"; format = "pyproject"; - disabled = pythonOlder "3.8.1"; + disabled = lib.versionOlder python.version "3.8.1"; src = fetchFromGitHub { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-qUKOZHkpQmeS/QELRf1FoUniaHs/gYyOtsBCFOidx4g="; + hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix index 49c2124c7952..be299e867d32 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-G7OEupjKDbblp96u2oHVdSueGG5NON5gvYhuvyz4f3E="; + hash = "sha256-ZfX25CaV+tZVdas+n7O6Gqv1GxOP1iwippIXxfhcOfg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 5ce4c59490da..9e33acfc991e 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.2"; + version = "3.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K68UhtPtgTZoAl9NG5ZHOwzsvDl028coXS4ZpmJ0ULs="; + hash = "sha256-kA2MFYryz61Mm/sPfH1NuLKnz4whtdNb6hGPYQZgQKQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix index 883c62d9049b..23d332c4cbd1 100644 --- a/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.33.0"; + version = "0.35.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IhqUUsS1kCG/AwnbcLAhmQYLBSqf1ff0pD2xH4Tgdho="; + hash = "sha256-WOYS1bovS6OGmFnJaxvEpqM3jRSzQg1M0vQGv1yfcnw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index 1d9fd2a469f6..0dcc2fdba2d9 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -196,7 +196,8 @@ in buildPythonPackage rec { export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' - export CUDNN_INCLUDE_DIR=${cudnn}/include + export CUDNN_INCLUDE_DIR=${cudnn.dev}/include + export CUDNN_LIB_DIR=${cudnn.lib}/lib '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} @@ -290,7 +291,7 @@ in buildPythonPackage rec { buildInputs = [ blas blas.provider pybind11 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now - ++ lib.optionals cudaSupport [ cudnn nccl ] + ++ lib.optionals cudaSupport [ cudnn.dev cudnn.lib nccl ] ++ lib.optionals rocmSupport [ openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] diff --git a/nixpkgs/pkgs/development/python-modules/torchio/default.nix b/nixpkgs/pkgs/development/python-modules/torchio/default.nix index 58ab010eb969..66071011f2fb 100644 --- a/nixpkgs/pkgs/development/python-modules/torchio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchio/default.nix @@ -19,15 +19,16 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.18.90"; + version = "0.19.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fepegar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h8cvNhOkjMMbQ6Nry8FKtwnK+yhRYRGjXi/xp0i5yyY="; + hash = "sha256-SNX558kSRCS9Eks00Kj2kFmo7hCUgV6saYLsnx/Kus0="; }; propagatedBuildInputs = [ @@ -57,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Medical imaging toolkit for deep learning"; - homepage = "http://www.torchio.org/"; + homepage = "https://torchio.readthedocs.io"; license = licenses.asl20; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/tornado/4.nix b/nixpkgs/pkgs/development/python-modules/tornado/4.nix index e4f59c148735..7476a22792ee 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/4.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/4.nix @@ -2,6 +2,7 @@ , unittestCheckHook , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , pythonAtLeast }: @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-28370.patch"; + url = "https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f.patch"; + hash = "sha256-2dpPHkNThOaZD8T2g1vb/I5WYZ/vy/t690539uprJyc="; + }) + ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent diff --git a/nixpkgs/pkgs/development/python-modules/tornado/5.nix b/nixpkgs/pkgs/development/python-modules/tornado/5.nix index d3961d06c405..8ba3a8c073ba 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/5.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/5.nix @@ -2,6 +2,7 @@ , unittestCheckHook , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , pythonAtLeast }: @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-28370.patch"; + url = "https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f.patch"; + hash = "sha256-2dpPHkNThOaZD8T2g1vb/I5WYZ/vy/t690539uprJyc="; + }) + ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent diff --git a/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/nixpkgs/pkgs/development/python-modules/tornado/default.nix index e255e603b9a1..ac57f212d229 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -3,17 +3,29 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook + +# for passthru.tests +, distributed +, jupyter-server +, jupyterlab +, matplotlib +, mitmproxy +, pytest-tornado +, pytest-tornasync +, pyzmq +, sockjs-tornado +, urllib3 }: buildPythonPackage rec { pname = "tornado"; - version = "6.2.0"; + version = "6.3.3"; src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; rev = "v${version}"; - hash = "sha256-IV0QN3GqoclFo9kWJVc21arypmBkvUClo86Zmt/Gv6E="; + hash = "sha256-l9Ce/c2wDSmsySr9yXu5Fl/+63QkQay46aDSUTJmetA="; }; nativeCheckInputs = [ @@ -38,6 +50,20 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + passthru.tests = { + inherit + distributed + jupyter-server + jupyterlab + matplotlib + mitmproxy + pytest-tornado + pytest-tornasync + pyzmq + sockjs-tornado + urllib3; + }; + meta = with lib; { description = "A web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 1482d0a6589f..a561bcbdfb74 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.23.3"; + version = "3.23.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-61nMytrqc7w7IbO7TX7H4O4DYoVL9MTBasN3UDx492w="; + hash = "sha256-vf1mnszEs/r/IyggCklAjNXsrZ8ZtgIsSttVS7s6JiE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/troposphere/default.nix b/nixpkgs/pkgs/development/python-modules/troposphere/default.nix index 567c2dec60e2..39c71da17761 100644 --- a/nixpkgs/pkgs/development/python-modules/troposphere/default.nix +++ b/nixpkgs/pkgs/development/python-modules/troposphere/default.nix @@ -1,18 +1,16 @@ { lib +, awacs , buildPythonPackage +, cfn-flip , fetchFromGitHub , pythonOlder -, python - - # python dependencies -, awacs -, cfn-flip , typing-extensions +, unittestCheckHook }: buildPythonPackage rec { pname = "troposphere"; - version = "4.3.2"; + version = "4.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,34 +19,35 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8vIpwZBUdU9gD1Ya0+L1phMDMcAABtuyRx4quDfQWGA="; + hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU="; }; propagatedBuildInputs = [ cfn-flip - ] ++ lib.lists.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; nativeCheckInputs = [ awacs + unittestCheckHook ]; passthru.optional-dependencies = { - policy = [ awacs ]; + policy = [ + awacs + ]; }; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - pythonImportsCheck = [ "troposphere" ]; + pythonImportsCheck = [ + "troposphere" + ]; meta = with lib; { description = "Library to create AWS CloudFormation descriptions"; - maintainers = with maintainers; [ jlesquembre ]; - license = licenses.bsd2; homepage = "https://github.com/cloudtools/troposphere"; changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ jlesquembre ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix b/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix index af5a65a08037..bc4808a268cb 100644 --- a/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { hash = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM="; }; + postPatch = '' + sed -i '/\[project\]/a version = "${version}"' pyproject.toml + sed -i '/\[project\]/a name = "tweedledum"' pyproject.toml + ''; + nativeBuildInputs = [ cmake ninja scikit-build ]; dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index fadf2ef3818c..ef2678e88b31 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.6.0"; + version = "8.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-ATspn/cY9DJahcsesnzwDOCEKYoUbqSoeOR3+kLou0s="; + hash = "sha256-wzsAHW0OlorLVI6nnDjv8WP1dpzyrmtE4OfwzFnZOH4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/typecode/default.nix b/nixpkgs/pkgs/development/python-modules/typecode/default.nix index 9bcb05076c4e..88e76fda670a 100644 --- a/nixpkgs/pkgs/development/python-modules/typecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typecode/default.nix @@ -47,9 +47,17 @@ buildPythonPackage rec { disabledTests = [ "TestFileTypesDataDriven" + + # Many of the failures below are reported in: + # https://github.com/nexB/typecode/issues/36 + # AssertionError: assert 'application/x-bytecode.python'... "test_compiled_python_1" "test_package_json" + + # fails due to change in file (libmagic) 5.45 + "test_doc_postscript_eps" + "test_package_debian" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/typepy/default.nix b/nixpkgs/pkgs/development/python-modules/typepy/default.nix index a1d9e7df1534..c5c393b29c01 100644 --- a/nixpkgs/pkgs/development/python-modules/typepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typepy/default.nix @@ -26,14 +26,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder - python-dateutil - pytz - packaging ]; + passthru.optional-dependencies = { + datetime = [ + python-dateutil + pytz + packaging + ]; + }; + nativeCheckInputs = [ pytestCheckHook tcolorpy + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "typepy" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix new file mode 100644 index 000000000000..ea56034cf9c2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "types-awscrt"; + version = "0.19.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "types_awscrt"; + inherit version; + hash = "sha256-YYM6oUDnJKkJgCVhD0uM3j3PZbhCYx10RzePn1204f0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "awscrt-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for awscrt"; + homepage = "https://github.com/youtype/types-awscrt"; + changelog = "https://github.com/youtype/types-awscrt/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix new file mode 100644 index 000000000000..00ebb5123e3c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-html5lib +}: + +buildPythonPackage rec { + pname = "types-beautifulsoup4"; + version = "4.12.0.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c="; + }; + + propagatedBuildInputs = [ + types-html5lib + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bs4-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for beautifulsoup4"; + homepage = "https://pypi.org/project/types-beautifulsoup4/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix b/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix new file mode 100644 index 000000000000..7c1128efb840 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-docopt"; + version = "0.6.11.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mRpkwVaTEMIkCuc0/SwQYnq7ikr6875axvTv+aYB8xo="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "docopt-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for docopt"; + homepage = "https://pypi.org/project/types-docopt/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix b/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix new file mode 100644 index 000000000000..843b1a108c85 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-html5lib"; + version = "1.1.11.15"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gOGiBi0io6/+XCjZfaML/786B205PID8bxZxIWwb1JI="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "html5lib-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for html5lib"; + homepage = "https://pypi.org/project/types-html5lib/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 8275ed31f944..adbf50aa924b 100644 --- a/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.4"; + version = "4.6.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xHWp089z3WlsOIfTBkQyP8VvXgCvlhUQNbO1tSh1ybM="; + hash = "sha256-XxedEL08qZWoE0qvzd/D4S1SsghDfEUp7yfmisswHzg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix b/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix index d6ec6611b755..77c4b099687d 100644 --- a/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UOAeIVjn3Z5zC4jZP0y+XH1HjYesxjGmFYpEknu8cag="; + hash = "sha256-isngr9CZ2YYuq+5s3p4HXrTU20vPqZGZ1r8mBoVkxiI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix b/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix index 802844afb65d..966e9c459d86 100644 --- a/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , setuptools , setuptools-scm @@ -8,13 +9,15 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.1"; + version = "0.1.3"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-UhTIbyEP6rm+W8wALwQtZeruw8CTP9ZlpDNstw6GxZ0="; + hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix index 7b3b5c8983cd..b3c904ba2f24 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -28,7 +28,7 @@ , pytest-mock }: let - version = "0.10.10"; + version = "0.10.11"; in buildPythonPackage { pname = "unstructured-api-tools"; @@ -40,8 +40,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-api-tools"; - rev = version; - hash = "sha256-CJ5bsII24hw03JN4+8VywYRYCsnMlYHjmaIIn0zttIs="; + rev = "refs/tags/${version}"; + hash = "sha256-t1fK40ayR2bxc1iMIwvn/OHuyVlR98Gq+NpIhOmaP+4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 02b060c790f4..951aec2cd879 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -133,6 +133,8 @@ buildPythonPackage { grpcio ]; + passthru.optional-dependencies = optional-dependencies; + meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; homepage = "https://github.com/Unstructured-IO/unstructured"; diff --git a/nixpkgs/pkgs/development/python-modules/us/default.nix b/nixpkgs/pkgs/development/python-modules/us/default.nix index 4e7d97068f25..e489879bd502 100644 --- a/nixpkgs/pkgs/development/python-modules/us/default.nix +++ b/nixpkgs/pkgs/development/python-modules/us/default.nix @@ -2,35 +2,52 @@ , buildPythonPackage , fetchPypi , jellyfish +, pytestCheckHook +, pythonOlder +, pytz }: buildPythonPackage rec { pname = "us"; - version = "2.0.2"; + version = "3.1.1"; + format = "setuptools"; - propagatedBuildInputs = [ jellyfish ]; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cb11ad0d43deff3a1c3690c74f0c731cff5b862c73339df2edd91133e1496fbc"; + hash = "sha256-40eWPo0kocp0N69EP6aFkXdoR7UMhlDY7w61NILnBcI="; }; - # Upstream requires jellyfish==0.5.6 but we have 0.6.1 postPatch = '' - substituteInPlace setup.py --replace "jellyfish==" "jellyfish>=" + # Upstream spins jellyfish + substituteInPlace setup.py \ + --replace "jellyfish==" "jellyfish>=" ''; - doCheck = false; # pypi version doesn't include tests + propagatedBuildInputs = [ + jellyfish + ]; - meta = { + nativeCheckInputs = [ + pytestCheckHook + pytz + ]; + + pythonImportsCheck = [ + "us" + ]; + + meta = with lib; { description = "A package for easily working with US and state metadata"; longDescription = '' - all US states and territories, postal abbreviations, Associated Press style - abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic - state name lookup, is contiguous or continental, URLs to shapefiles for state, - census, congressional districts, counties, and census tracts + All US states and territories, postal abbreviations, Associated Press style + abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic + state name lookup, is contiguous or continental, URLs to shapefiles for state, + census, congressional districts, counties, and census tracts. ''; homepage = "https://github.com/unitedstates/python-us/"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix index b071612562aa..556d06d7d393 100644 --- a/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder , pythonRelaxDepsHook @@ -26,10 +27,14 @@ buildPythonPackage rec { hash = "sha256-v1/8taHdN1n9+gy7L+g/wAJ2x9FwYCaxZiEdFqLct1Y="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # https://github.com/vega/ipyvega/pull/507 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/vega/ipyvega/commit/1a5028ee5d54e24b9650b66685f54c42b72c7899.patch"; + hash = "sha256-W8UmMit7DJGKCM9+/OSRLTuRvC0ZR42AP/b/frVEvsk="; + }) + ]; nativeBuildInputs = [ poetry-core diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix index 709271d0905f..f8242d34f4c2 100644 --- a/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2w1D0380ljgRa5NSPAUlUPFTmGzjl79hyLwirmuHmGo="; + hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index 3f75354376dd..2d2b9aa649ca 100644 --- a/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,13 +28,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; + hash = "sha256-eoKF6uBHgML63DrDlC1zPfDu/mAMoaevttwqHLCKh+M="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-9ruk3PMcWNLOIGth5fo91/miyF17lgERWL3F4y4as18="; + hash = "sha256-4XqR6pZqPAftZoJqZf+iZWp0c8xv00MDJDDETiGGEDo="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix index 689c27a470e2..08b6e1800955 100644 --- a/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.4.1"; + version = "8.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sfBCqJnqTEWLcyHaG14zMePg7HgVg0NN4TAZRs6tuUM="; + hash = "sha256-hsF1ctD3XL87yxoY878vnnKzmpwIybSnTpkeGIKo77M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/web3/default.nix b/nixpkgs/pkgs/development/python-modules/web3/default.nix index f4afe0646158..ae709ef40886 100644 --- a/nixpkgs/pkgs/development/python-modules/web3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/web3/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , aiohttp , eth-abi , eth-account , eth-hash , eth-typing , eth-utils -, eth-rlp , hexbytes , ipfshttpclient , jsonschema , lru-dict , protobuf , requests -, typing-extensions , websockets -, pythonOlder }: buildPythonPackage rec { @@ -33,24 +31,25 @@ buildPythonPackage rec { hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; }; + # Note: to reflect the extra_requires in main/setup.py. + passthru.optional-dependencies = { + ipfs = [ ipfshttpclient ]; + }; + propagatedBuildInputs = [ aiohttp eth-abi eth-account - eth-hash - eth-rlp + eth-hash ] ++ eth-hash.optional-dependencies.pycryptodome ++ [ eth-typing eth-utils hexbytes - ipfshttpclient jsonschema lru-dict protobuf requests websockets - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - ] ++ eth-hash.optional-dependencies.pycryptodome; + ]; # TODO: package eth-tester required for tests doCheck = false; @@ -64,9 +63,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Web3 library for interactions"; - homepage = "https://github.com/ethereum/web3"; + description = "A python interface for interacting with the Ethereum blockchain and ecosystem"; + homepage = "https://web3py.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = with maintainers; [ hellwolf ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/nixpkgs/pkgs/development/python-modules/wheel/default.nix index 3be508a0ec59..16c6c2dc087d 100644 --- a/nixpkgs/pkgs/development/python-modules/wheel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wheel/default.nix @@ -1,21 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, bootstrapped-pip -, setuptools +, flit-core }: buildPythonPackage rec { pname = "wheel"; - version = "0.38.4"; - format = "other"; + version = "0.41.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - hash = "sha256-yZLU0t/nz6kfnnoLL15bybOxN4+SJUaTJsCpGffl1QU="; - name = "${pname}-${version}-source"; + hash = "sha256-/EaDJ2zI/ly2BrrGhiZGwiBYDVPYWTki+87UqtCS3bw="; postFetch = '' cd $out mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ @@ -25,16 +23,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - bootstrapped-pip - setuptools + flit-core ]; # No tests in archive doCheck = false; - pythonImportsCheck = [ "wheel" ]; - # We add this flag to ignore the copy installed by bootstrapped-pip - pipInstallFlags = [ "--ignore-installed" ]; + pythonImportsCheck = [ "wheel" ]; meta = with lib; { homepage = "https://github.com/pypa/wheel"; diff --git a/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 5985b96d6dc9..91c56472e77e 100644 --- a/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.4"; + version = "0.18.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9dwkylr+aCTGw/VIY90nxq8IkqBASeEfdr5JGz7pZrc="; + hash = "sha256-0NJsZex054CWfKX2wyJRd6Cnxa89mNrZN59VqIV2MD8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix index 9a6d19583455..13168c3757eb 100644 --- a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "6.4.0"; + version = "6.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evansd"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ouEoqMcNh3Vwahwaq6bGQuVUFViVN14CDJosDXC5ozI="; + hash = "sha256-g1D0tjGsAP3y1fWvODWwNvxnTSZJuTpyZ0Otk83Oq9E="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to serve static file for WSGI applications"; - homepage = "https://whitenoise.evans.io/"; + homepage = "https://whitenoise.readthedocs.io/"; changelog = "https://github.com/evansd/whitenoise/blob/${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix index 57d1549ee867..156fbb9d387a 100644 --- a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { @@ -16,6 +18,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index a04ff8b72eed..33911fbd16db 100644 --- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -11,6 +11,7 @@ , jinja2 , lxml , markupsafe +, platformdirs , pycairo , pycountry , pyflakes @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.17.3"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-5RL4DkWcQRxzi1dhSJlGgoU0BU3aUWOfBNINFKiOwLg="; + hash = "sha256-yhzOfX2umux1ulDiInbbKXvATA+k1TLQrSa9vcR/i58="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { jinja2 lxml markupsafe + platformdirs pycountry pyflakes pypdf2 diff --git a/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix b/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix index eebd30364e47..97e5e62b01aa 100644 --- a/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , lxml , poetry-core , pythonOlder @@ -10,16 +11,25 @@ buildPythonPackage rec { pname = "xpath-expressions"; version = "1.1.0"; - disabled = pythonOlder "3.5"; format = "pyproject"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0l289iw2zmzxyfi3g2z7b917vmsaz47h5jp871zvykpmpigc632h"; + hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA="; }; + patches = [ + # https://github.com/orf/xpath-expressions/pull/4 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/orf/xpath-expressions/commit/3c5900fd6b2d08dd9468707f35ab42072cf75bd3.patch"; + hash = "sha256-IeV6ncJyt/w2s5TPpbM5a3pljNT6Bp5PIiqgTg2iTRA="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -29,12 +39,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Was fixed upstream but not released - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; - pythonImportsCheck = [ "xpath" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 72d5e4035519..8334fba45ffb 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , requests , setuptools @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.1.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw="; + src = fetchFromGitHub { + owner = "sigma67"; + repo = "ytmusicapi"; + rev = "refs/tags/${version}"; + hash = "sha256-YgV3kCvCOLNXb3cWBVXRuzH4guuvPpXVojOnSnrXj20="; }; nativeBuildInputs = [ @@ -24,6 +26,8 @@ buildPythonPackage rec { setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix new file mode 100644 index 000000000000..07cc6a2b7a19 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "zephyr-python-api"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-M9Kf0RtoSeDFAAgAuks+Ek+Wg5OM8qmd3eDoaAgAa3A="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + requests + ]; + + # No tests in archive + doCheck = false; + + pythonImportsCheck = [ "zephyr" ]; + + meta = { + homepage = "https://github.com/nassauwinter/zephyr-python-api"; + description = "A set of wrappers for Zephyr Scale (TM4J) REST API"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rapiteanu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 1fe56ea5c747..0fb2134276e4 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.82.1"; + version = "0.88.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-8zfhrRjW+WucwCo5M+rPOjuqfNKI6ne3bTumwDGIcbI="; + hash = "sha256-PE/KK2MFSVinaCLztdu7LS+gSemlq4UzVVwSjK+9yiM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 29ffbdeb3709..698e93d76076 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.102"; + version = "0.0.103"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-TsL6JRxYf8KqmLqfN0nosxaTbzezlP4Q0Fb876WeTHI="; + hash = "sha256-H6LkCjpyj1uk05aIvO2TNJoAEXsPZlsIHo+t5rO5ikY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index c73600df5a52..77fb2ac72c42 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.56.4"; + version = "0.57.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; + hash = "sha256-79TOt3PRvkhuF6wf+acYhhzFFkYX0l3yLpxv8dNRk1U="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zimports/default.nix b/nixpkgs/pkgs/development/python-modules/zimports/default.nix index ee9d683c8642..22cd50c9189e 100644 --- a/nixpkgs/pkgs/development/python-modules/zimports/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zimports/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sqlalchemyorg"; repo = "zimports"; rev = "refs/tags/v${version}"; - hash = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU="; + hash = "sha256-+sDvl8z0O0cZyS1oZgt924hlOkYeHiStpXL9y9+JZ5I="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix b/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix index 898ab1999650..cdac14d3300b 100644 --- a/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix +++ b/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix @@ -26,8 +26,7 @@ runCommand (radian.name + "-wrapper") { }; } ('' makeWrapper "${radian}/bin/radian" "$out/bin/radian" \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" \ - --set "R_HOME" "${R}/lib/R" + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" '' + lib.optionalString wrapR '' cd ${R}/bin for exe in *; do diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index 2a9ad50c8044..54842ff64135 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.18"; - source.sha256 = "sha256-tvfScSHUmHSmnJGU1PjvVWsjkMzuxBY1zPTzxYBp9w4="; + version = "2.4.19"; + source.sha256 = "sha256-M03HlkODhHMv3xm/ovYjdTt+2FFg0Izh8gAJmEzvs2I="; dontPatchShebangs = true; postFixup = '' diff --git a/nixpkgs/pkgs/development/tools/air/default.nix b/nixpkgs/pkgs/development/tools/air/default.nix index 9d374fc02288..b42fe4c16c59 100644 --- a/nixpkgs/pkgs/development/tools/air/default.nix +++ b/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.44.0"; + version = "1.45.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-BLha2PDn7iF0B5OPVkJT6en1Znt/6xiHxuCj14ha9tc="; + hash = "sha256-q1BnY0ztnhtsks1+GC1awR9o6nodXyb8rf1waVAs3gM="; }; - vendorHash = "sha256-n2Ei+jckSYAydAdJnMaPc7FGUcwSbC49hk6nlDyDMPE="; + vendorHash = "sha256-vyuXmQEjy5kPk9cKosHx0JZSZxstYtCNyfLIlRt2bnk="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix b/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix index 0511f4ccbe70..03e26e5eaede 100644 --- a/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "banana-vera"; - version = "1.3.0-python3.10"; + version = "1.3.0-fedora38"; src = fetchFromGitHub { owner = "Epitech"; repo = "banana-vera"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-1nAKhUltQS1301JNrr0PQQrrf2W9Hj5gk1nbUhN4cXw="; + sha256 = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 4fdcdf9a0f1e..2cdb64b5ae7f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.7"; + version = "2.4.22"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NveRGWf0Aghu0fxVAVSukrH9zFl+QJ2rWNYm5JIHIjk="; + hash = "sha256-pbeyv7Ms/7iJUsxEl2YeHjbXJ5ZJZe2OXtDpnnH5ZD8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 3825f81bcf10..9bdf3829cd9e 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.1"; + version = "2.14.2"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-6gq70bF954CNUS1t38o+1YqWZORGgxM1CWcbUnRyhOU="; + sha256 = "sha256-FITcbf1+9euy55nQutDZMmRzpHxICdLBmTVHTRCyFLQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 4516de52b3e8..448b8a1b7cc1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.214.0"; + version = "0.215.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-N3eunmUl08RPu54k1QQWqgKa9RS0uzVVI2f0kCbmb2w="; + sha256 = "sha256-n6swStUU+mKeUhs94h71eCJk02yP6QFAkpDz67DJmXg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix index 95838c9c27fd..473dc9d7a4bb 100644 --- a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix @@ -17,13 +17,13 @@ let self = stdenv.mkDerivation rec { pname = "kcov"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "sha256-Kit4Yn5Qeg3uAc6+RxwlVEhDKN6at+Uc7V38yhDPrAY="; + sha256 = "sha256-8/182RjuNuyFzSyCgyyximGaveDyhStwIQg29S5U/pI="; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index cfc24aef9799..8a99a455bbdf 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -25,11 +25,11 @@ let rizin = stdenv.mkDerivation rec { pname = "rizin"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - hash = "sha256-apJJBu/fVHrFBGJ2f1rdU5AkNuekhi0sDiTKkbd2FQg="; + hash = "sha256-dgZHyvinimOKDgQL97icPtBk+r3+rE/kT/FdYrqsbJE="; }; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index b0c94ef8c647..7b5e3522ef3b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ykAuypWBbZ+53ImzNJGsztLHG8OQLIGBHC6Z3Amu+L0="; + sha256 = "sha256-bd0epx3AciECCYi4OYG2WzTVhZ+JYnf5ebDZoMrPfmo="; }; - cargoHash = "sha256-517AXkFqYaHC/FejtxolAQxJVpvcFhmf3Nptzcy9idY="; + cargoHash = "sha256-RjjYfdcdJzIxnJFZqx93KADihN5YK+bCuk1QaPhVuGQ="; cargoBuildFlags = [ "--bin" "svlint" ]; diff --git a/nixpkgs/pkgs/development/tools/argc/default.nix b/nixpkgs/pkgs/development/tools/argc/default.nix index 0dca25bc2729..84d9332ade14 100644 --- a/nixpkgs/pkgs/development/tools/argc/default.nix +++ b/nixpkgs/pkgs/development/tools/argc/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-xuSoTTtULVdG1LZFiEPYYuwJxG7FdN9vY+7K7OmfWZI="; + hash = "sha256-BM9MXokVXA5EJwr8F7Wg5LTE1xhmj9ttVXOMNJx0RRw="; }; - cargoHash = "sha256-BJaVaOBCLH5c7/DrsOq6uVN02wEfLA7k+FgxCBmOUTA="; + cargoHash = "sha256-SScCPBERXScYJ9LlPcbIhwCikRum0F1tU3gZYaQRFTo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 32b7ba5a1784..311e44051d62 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -42,9 +42,11 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace 'PyYAML>=' 'PyYAML>=5.4.1 #' \ + --replace "aws_lambda_builders==" "aws_lambda_builders>=" \ --replace 'aws-sam-translator==1.70.0' 'aws-sam-translator>=1.60.1' \ --replace 'boto3>=' 'boto3>=1.26.79 #' \ --replace 'cfn-lint~=0.77.9' 'cfn-lint~=0.73.2' \ + --replace "cookiecutter~=" "cookiecutter>=" \ --replace 'docker~=6.1.0' 'docker~=6.0.1' \ --replace 'ruamel_yaml~=0.17.32' 'ruamel_yaml~=0.17.21' \ --replace 'tomlkit==0.11.8' 'tomlkit>=0.11.8' \ @@ -56,8 +58,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; + homepage = "https://github.com/awslabs/aws-sam-cli"; + changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ lo1tuma ]; }; diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 3ab48462dbbc..0d94e4e2f6c3 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.20.0"; + version = "10.20.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-0NUOOJu3iuKBlIi4z1Jv8e00BTsgk0dpLOgfpIKSc2A="; + sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y="; }; subPackages = [ "." ]; @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { broken = stdenv.isDarwin; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens kashw2 ]; license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; }; diff --git a/nixpkgs/pkgs/development/tools/b4/default.nix b/nixpkgs/pkgs/development/tools/b4/default.nix index e6f656c4012e..24da485d863d 100644 --- a/nixpkgs/pkgs/development/tools/b4/default.nix +++ b/nixpkgs/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4="; + hash = "sha256-tk4VBvSnHE6VnUAa3QYCqFLQbsHTJ6Bfqwa1wKEC6mI="; }; # tests make dns requests and fails @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; license = licenses.gpl2Only; description = "A helper utility to work with patches made available via a public-inbox archive"; - maintainers = with maintainers; [ jb55 qyliss ]; + mainProgram = "b4"; + maintainers = with maintainers; [ jb55 qyliss mfrw ]; }; } diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index b610a7a20442..dda16c238436 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3paYKK+L5mBCQvlusKlSBS1X9fVSDHFw1Ujiyo5yrc="; + sha256 = "sha256-NZDdSIXNQFSCoav+YN1VLFrHQSKZfoZDp2TWXtmQC6o="; }; - vendorHash = "sha256-V1GKZPLBjFhl0F0AvUC6MfAsrZsVToSZU3K2/hwOCVs="; + vendorHash = "sha256-oYagIEb/u/XCTbZkvynxcOtORhW75hReinrVAkdOApM="; doCheck = false; @@ -23,6 +23,7 @@ buildGoModule rec { BEWARE: This package does not work on NixOS. ''; homepage = "https://github.com/bazelbuild/bazelisk"; + changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; }; diff --git a/nixpkgs/pkgs/development/tools/benthos/default.nix b/nixpkgs/pkgs/development/tools/benthos/default.nix index 2678da07a280..8dc8b26f43dd 100644 --- a/nixpkgs/pkgs/development/tools/benthos/default.nix +++ b/nixpkgs/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-wap11/D1PIvDt5Jk3CCyxWJNULMg62WFmiA09gc95dY="; + hash = "sha256-C/dExBN+ZBE8o3L0RBgYe4griFhv/Yd2I10em2UK/nQ="; }; - vendorHash = "sha256-pA8SBawcl8YFbUrDfWxzcrMK715xBTx1slvHoA/a9OM="; + vendorHash = "sha256-33eY+jF12lYSO1Fqm1hRLKA1+aMNxe0c9gqNl2wf10I="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/biome/default.nix b/nixpkgs/pkgs/development/tools/biome/default.nix new file mode 100644 index 000000000000..f853669bcc38 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/biome/default.nix @@ -0,0 +1,63 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2_1_6 +, zlib +, stdenv +, darwin +, git +}: + +rustPlatform.buildRustPackage rec { + pname = "biome"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "biomejs"; + repo = "biome"; + rev = "cli/v${version}"; + hash = "sha256-oX/LyC6JN0NUc/xi4G9lzKgF9yOlooAt69Gw+eLJxbE="; + }; + + cargoHash = "sha256-4P57fmp5CpGn1wYkQos7PO3YFChup8LrrLExv9S76gs="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2_1_6 + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + git + ]; + + cargoBuildFlags = [ "-p=rome_cli" ]; + cargoTestFlags = cargoBuildFlags; + + env = { + BIOME_VERSION = version; + }; + + preCheck = '' + # tests assume git repository + git init + + # tests assume $BIOME_VERSION is unset + unset BIOME_VERSION + ''; + + meta = with lib; { + description = "Toolchain of the web"; + homepage = "https://biomejs.dev/"; + changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "biome"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix index fd0457789ade..2026d6829371 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -4,6 +4,7 @@ }: { src +, sourceRoot ? null , patches ? [ ] , pname , version @@ -19,23 +20,31 @@ let fetchedMavenDeps = stdenv.mkDerivation ({ name = "${pname}-${version}-maven-deps"; - inherit src patches; + inherit src sourceRoot patches; nativeBuildInputs = [ maven ]; buildPhase = '' + runHook preBuild + mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} + + runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' + runHook preInstall + find $out -type f \( \ -name \*.lastUpdated \ -o -name resolver-status.properties \ -o -name _remote.repositories \) \ -delete + + runHook postInstall ''; # don't do any fixup diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index c912818285aa..5ed41717f3da 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -10,11 +10,11 @@ assert jdk != null; stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; - version = "3.9.3"; + version = "3.9.4"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-4eE6wMQvO2TZAMV//GUuzvaCuCVdfTVO+7tPYlGdpPE="; + hash = "sha256-/2a3DIMKONMx1E9sJaN7WCRx3vmhYck5ArrHvqMJgxk="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index c731a1d2e723..1692058dcac8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,22 +5,27 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7zAeGJyMfMdrVDCuTWU3zikXjM/ydjnGj6Ctjckd32c="; + hash = "sha256-yvdsRc5KZAwzekktSu9tR9R2vvAMi+4JVkvy+ANFkQ8="; }; - vendorHash = "sha256-SxGBfWcV10L6xC5XPIfv/HJWQy5g3AoV8z4/ae23DEc="; + vendorHash = "sha256-0rmqsUMwk5ytAZc94JzvZTuh0WAmQwBEWSE96yNALE0="; + + subPackages = [ "." ]; doCheck = false; + ldflags = [ "-s" "-w" "-X main.gitCommit=${version}" ]; + meta = with lib; { homepage = "https://github.com/buchgr/bazel-remote"; description = "A remote HTTP/1.1 cache for Bazel"; + changelog = "https://github.com/buchgr/bazel-remote/releases/tag/v${version}"; license = licenses.asl20; maintainers = lib.teams.bazel.members; platforms = platforms.darwin ++ platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 61b2cbb415d8..8c46b2456ee3 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.3.2"; + version = "6.3.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-K0MJQYzWkryrO7jjx16UMq7CGRasWF40WUWRtroW6ME="; + hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index ff38657334da..59ceeb8761a6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-qG+Ddn0BHUZX1VX5hO84exgRz8YuUgYF/fH6MmgkrXE"; + hash = "sha256-7RYMj/vfyzBQhZUpWzEaZYN27ZhYCRyKhQUhlH8tE0U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index 218783fd4926..58d3a7d86f42 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -1,44 +1,72 @@ -{ lib, stdenv, fetchFromGitLab, python3, ensureNewerSourcesForZipFilesHook +{ lib +, stdenv +, fetchFromGitLab +, ensureNewerSourcesForZipFilesHook +, python3 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` -, withTools ? null +, extraTools ? [] }: -let - wafToolsArg = with lib.strings; - optionalString (withTools != null) " --tools=\"${concatStringsSep "," withTools}\""; -in -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.0.25"; + version = "2.0.26"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; - rev = "${pname}-${version}"; - sha256 = "sha256-wqZEAfGRHhcd7Xm2pQ0FTjZGfuPafRrZAUdpc7ACoEA="; + rev = "waf-${finalAttrs.version}"; + hash = "sha256-AXDMWlwivJ0Xot6iwuIIlbV2Anz6ieghyOI9jA4yrko="; }; - nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ + ensureNewerSourcesForZipFilesHook + python3 + ]; + + buildInputs = [ + # waf executable uses `#!/usr/bin/env python` + python3 + ]; - # waf bin has #!/usr/bin/env python - buildInputs = [ python3 ]; + strictDeps = true; configurePhase = '' + runHook preConfigure + python waf-light configure + + runHook postConfigure ''; - buildPhase = '' - python waf-light build${wafToolsArg} + + buildPhase = let + extraToolsList = + lib.optionalString (extraTools != []) + "--tools=\"${lib.concatStringsSep "," extraTools}\""; + in + '' + runHook preBuild + + python waf-light build ${extraToolsList} + + runHook postBuild ''; + installPhase = '' + runHook preInstall + install -D waf $out/bin/waf - ''; - strictDeps = true; + runHook postInstall + ''; - meta = with lib; { - description = "Meta build system"; - homepage = "https://waf.io"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + meta = { + homepage = "https://waf.io"; + description = "The meta build system"; + changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.bsd3; + mainProgram = "waf"; + maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; + inherit (python3.meta) platforms; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix new file mode 100644 index 000000000000..7282ed9ebf97 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, pkgs +, makeSetupHook +, waf +}: + +makeSetupHook { + name = "waf-setup-hook"; + + substitutions = { + # Sometimes the upstream provides its own waf file; in order to honor it, + # waf is not inserted into propagatedBuildInputs, rather it is inserted + # directly + inherit waf; + crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) + ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; + }; + + meta = { + description = "A setup hook for using Waf in Nixpkgs"; + inherit (waf.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/nixpkgs/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh index 4d95c28de1f1..2593b0a9d808 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2206 + wafConfigurePhase() { runHook preConfigure @@ -7,7 +9,7 @@ wafConfigurePhase() { fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags" + local prefixFlag="${prefixKey:---prefix=}$prefix" fi if [ -n "${PKG_CONFIG}" ]; then @@ -15,13 +17,15 @@ wafConfigurePhase() { fi local flagsArray=( - "${flagsArray[@]}" + $prefixFlag $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then flagsArray+=(@crossFlags@) fi + echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" @@ -38,15 +42,11 @@ wafConfigurePhase() { runHook postConfigure } -if [ -z "${dontUseWafConfigure-}" -a -z "${configurePhase-}" ]; then - configurePhase=wafConfigurePhase -fi - wafBuildPhase () { runHook preBuild # set to empty if unset - : ${wafFlags=} + : "${wafFlags=}" local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} @@ -61,10 +61,6 @@ wafBuildPhase () { runHook postBuild } -if [ -z "${dontUseWafBuild-}" -a -z "${buildPhase-}" ]; then - buildPhase=wafBuildPhase -fi - wafInstallPhase() { runHook preInstall @@ -85,6 +81,14 @@ wafInstallPhase() { runHook postInstall } -if [ -z "${dontUseWafInstall-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseWafConfigure-}" ] && [ -z "${configurePhase-}" ]; then + configurePhase=wafConfigurePhase +fi + +if [ -z "${dontUseWafBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=wafBuildPhase +fi + +if [ -z "${dontUseWafInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=wafInstallPhase fi diff --git a/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix b/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix deleted file mode 100644 index f0f3a683aab0..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, stdenv, pkgs, makeSetupHook, waf }: - -makeSetupHook { - name = "waf-hook"; - substitutions = { - inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) - ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; - }; -} ./setup-hook.sh diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 14141cb023f1..df44b63f9d23 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.31.2"; + version = "1.31.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-AoE9/aIKmo5+XGz7glt5h2RHEgVGiI9K+jpgJJ0uC2g="; + hash = "sha256-Uqs4MlKwFz4EGd6HTGXqcLTSfYPJTpgKKyXmA3B3RjU="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/buildkit/default.nix b/nixpkgs/pkgs/development/tools/buildkit/default.nix index 93b8b38ec9c2..6787ca6b07dd 100644 --- a/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-Fee/XuxtNP9+T8kRd3yeEhFvpfaIgMkqfSaZCpaYEdM="; + hash = "sha256-u85Yrg3aMG6Tx8onivSy1p7yB4lZxsBWF4bxnwO68EE="; }; vendorHash = null; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; + changelog = "https://github.com/moby/buildkit/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam developer-guy ]; mainProgram = "buildctl"; diff --git a/nixpkgs/pkgs/development/tools/comby/comby.patch b/nixpkgs/pkgs/development/tools/comby/comby.patch index d3d2088d602f..b780560093d4 100644 --- a/nixpkgs/pkgs/development/tools/comby/comby.patch +++ b/nixpkgs/pkgs/development/tools/comby/comby.patch @@ -1,5 +1,5 @@ diff --git a/comby-kernel.opam b/comby-kernel.opam -index 9db7cc5..a497bff 100644 +index 9db7cc5..83e6e7b 100644 --- a/comby-kernel.opam +++ b/comby-kernel.opam @@ -20,7 +20,7 @@ build: [ @@ -7,7 +7,7 @@ index 9db7cc5..a497bff 100644 "dune" {>= "2.8.0"} "ocaml" {>= "4.08.1"} - "core_kernel" -+ "core_kernel" {>= "v0.15.0"} ++ "core-kernel" {>= "v0.16.0"} "mparser" {>= "1.3"} "mparser-pcre" "ppx_deriving" @@ -25,7 +25,7 @@ index 88563f6..fbbc122 100644 "lwt" "cohttp" diff --git a/comby.opam b/comby.opam -index 9e5d96b..ecab789 100644 +index 9e5d96b..d5be316 100644 --- a/comby.opam +++ b/comby.opam @@ -31,7 +31,7 @@ depends: [ @@ -33,14 +33,23 @@ index 9e5d96b..ecab789 100644 "comby-kernel" {= "1.7.0"} "comby-semantic" {= "1.7.0"} - "core" -+ "core" {>= "v0.15.0"} ++ "core" {>= "v0.16.0"} "hack_parallel" {arch != "arm32" & arch != "arm64"} "lwt" "lwt_react" diff --git a/lib/app/configuration/command_configuration.ml b/lib/app/configuration/command_configuration.ml -index 75c3107..418276e 100644 +index 75c3107..29826a9 100644 --- a/lib/app/configuration/command_configuration.ml +++ b/lib/app/configuration/command_configuration.ml +@@ -1,7 +1,7 @@ + open Core + open Camlzip + +-open Polymorphic_compare ++open Poly + + open Comby_kernel + @@ -16,21 +16,21 @@ type 'a next = let fold_directory ?(sorted=false) root ~init ~f = @@ -356,6 +365,60 @@ index 7a6353d..b79cba2 100644 - (preprocess (pps ppx_jane))) + (preprocess + (pps ppx_jane))) +diff --git a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml +index 4e064fb..dca77b2 100644 +--- a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml ++++ b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml +@@ -287,7 +287,7 @@ end = struct + ~running_step:(fun (car, pos) cadr -> + match car, cadr with + | Same car_lines, Same cadr_lines -> +- Skip (Same (Array.concat [ car_lines; cadr_lines ]), pos) ++ Skip {state = (Same (Array.concat [ car_lines; cadr_lines ]), pos)} + | Unified _, _ | _, Unified _ -> + raise_s + [%message +@@ -296,7 +296,7 @@ end = struct + (cadr : string Range.t)] + | (Prev _ | Next _ | Replace _), (Prev _ | Next _ | Replace _) + | Same _, (Prev _ | Next _ | Replace _) +- | (Prev _ | Next _ | Replace _), Same _ -> Yield ((car, pos), (cadr, Middle))) ++ | (Prev _ | Next _ | Replace _), Same _ -> Yield {value = (car, pos); state = (cadr, Middle)}) + ~inner_finished:(fun (last, pos) -> + match last, pos with + | Unified _, _ -> +@@ -308,7 +308,7 @@ end = struct + Some (last, End)) + ~finishing_step:(function + | None -> Done +- | Some result -> Yield (result, None)) ++ | Some result -> Yield {value = result; state = None}) + ;; + + include struct +@@ -448,7 +448,7 @@ end = struct + ~init:{ prev_start; next_start; ranges = [] } + ~running_step:(fun t drop_or_keep -> + match (drop_or_keep : Drop_or_keep.t) with +- | Keep range -> Skip { t with ranges = range :: t.ranges } ++ | Keep range -> Skip {state = { t with ranges = range :: t.ranges }} + | Drop n -> + let hunk = to_hunk t in + let t = +@@ -457,11 +457,11 @@ end = struct + ; ranges = [] + } + in +- if List.is_empty (Hunk.ranges hunk) then Skip t else Yield (hunk, t)) ++ if List.is_empty (Hunk.ranges hunk) then Skip {state = t} else Yield {value = hunk; state = t}) + ~inner_finished:(fun t -> if List.is_empty t.ranges then None else Some t) + ~finishing_step:(function + | None -> Done +- | Some t -> Yield (to_hunk t, None)) ++ | Some t -> Yield {value = to_hunk t; state = None}) + ;; + end + diff --git a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml b/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml index 4f53a0b..88ee0e3 100644 --- a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml @@ -501,7 +564,7 @@ index 03b120a..4d48b61 100644 + ppx_deriving_yojson + ppx_deriving_yojson.runtime)) diff --git a/lib/kernel/matchers/alpha.ml b/lib/kernel/matchers/alpha.ml -index d6116f7..993aafc 100644 +index d6116f7..7d16171 100644 --- a/lib/kernel/matchers/alpha.ml +++ b/lib/kernel/matchers/alpha.ml @@ -13,20 +13,11 @@ module R = MakeRegexp(Regexp) @@ -537,6 +600,15 @@ index d6116f7..993aafc 100644 List.fold plist ~init:(return Types.Unit) ~f:(>>) let with_debug_matcher s tag = +@@ -745,7 +736,7 @@ module Make (Lang : Types.Language.S) (Meta : Types.Metasyntax.S) (Ext : Types.E + let hole_parser ?at_depth sort dimension = + let open Types.Hole in + let hole_parser = +- let open Polymorphic_compare in ++ let open Poly in + List.fold ~init:[] hole_parsers ~f:(fun acc (sort', parser) -> if sort' = sort then parser::acc else acc) + in + let skip_signal hole = skip (string "_signal_hole") |>> fun () -> Types.Hole hole in diff --git a/lib/kernel/matchers/dune b/lib/kernel/matchers/dune index 12ed326..4625458 100644 --- a/lib/kernel/matchers/dune @@ -566,7 +638,7 @@ index 12ed326..4625458 100644 + yojson + ppx_deriving_yojson)) diff --git a/lib/kernel/matchers/evaluate.ml b/lib/kernel/matchers/evaluate.ml -index 9ea71a0..288f79a 100644 +index 9ea71a0..4f63ab6 100644 --- a/lib/kernel/matchers/evaluate.ml +++ b/lib/kernel/matchers/evaluate.ml @@ -3,10 +3,7 @@ open Core_kernel @@ -581,8 +653,17 @@ index 9ea71a0..288f79a 100644 type result = bool * Match.environment option +@@ -102,7 +99,7 @@ let apply + |> Option.some + in + List.find_map cases ~f:(fun (template, case_expression) -> evaluate template case_expression) +- |> Option.value_map ~f:ident ~default:(false, Some env) ++ |> Option.value_map ~f:Fn.id ~default:(false, Some env) + + (* rewrite ... { ... } *) + | Rewrite (Template t, (match_template, rewrite_template)) -> diff --git a/lib/kernel/matchers/omega.ml b/lib/kernel/matchers/omega.ml -index 61cc69a..0bef682 100644 +index 61cc69a..3445307 100644 --- a/lib/kernel/matchers/omega.ml +++ b/lib/kernel/matchers/omega.ml @@ -32,15 +32,9 @@ let push_source_ref : string ref = ref "" @@ -593,17 +674,25 @@ index 61cc69a..0bef682 100644 - match Sys.getenv "DEBUG_COMBY" with - | exception Not_found -> false - | _ -> true -- ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + -let rewrite = - match Sys.getenv "REWRITE" with - | exception Not_found -> false - | _ -> true -+let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some -+ +let rewrite = Sys.getenv "REWRITE" |> Option.is_some let actual = Buffer.create 10 +@@ -540,7 +534,7 @@ module Make (Language : Types.Language.S) (Meta : Metasyntax.S) (Ext : External. + + let hole_parser sort dimension : (production * 'a) t t = + let hole_parser = (* This must be fold, can't be find *) +- let open Polymorphic_compare in ++ let open Poly in + List.fold ~init:[] Template.Matching.hole_parsers ~f:(fun acc (sort', parser) -> + if sort' = sort then parser::acc else acc) + in diff --git a/lib/kernel/matchers/preprocess.ml b/lib/kernel/matchers/preprocess.ml index 84f3ed0..b6d10e7 100644 --- a/lib/kernel/matchers/preprocess.ml @@ -633,7 +722,7 @@ index ef0bd59..906820b 100644 module type Regexp_engine_intf = sig type t diff --git a/lib/kernel/matchers/rewrite.ml b/lib/kernel/matchers/rewrite.ml -index 32c4740..2fc28db 100644 +index 32c4740..545cba5 100644 --- a/lib/kernel/matchers/rewrite.ml +++ b/lib/kernel/matchers/rewrite.ml @@ -4,10 +4,7 @@ open Core_kernel @@ -648,6 +737,35 @@ index 32c4740..2fc28db 100644 let counter = let uuid_for_id_counter = ref 0 in +@@ -46,24 +43,24 @@ let parse_first_label ?(metasyntax = Metasyntax.default_metasyntax) template = + in + parse_string ~consume:All parser template + |> function +- | Ok label -> List.find_map label ~f:ident ++ | Ok label -> List.find_map label ~f:Fn.id + | Error _ -> None + + let substitute_fresh + ?(metasyntax = Metasyntax.default_metasyntax) + ?(fresh = counter) + template = +- let label_table = String.Table.create () in ++ let label_table = Hashtbl.create (module String) in + let template_ref = ref template in + let current_label_ref = ref (parse_first_label ~metasyntax !template_ref) in + while Option.is_some !current_label_ref do + let label = Option.value_exn !current_label_ref in + let id = +- match String.Table.find label_table label with ++ match Hashtbl.find label_table label with + | Some id -> id + | None -> + let id = fresh () in +- if String.(label <> "") then String.Table.add_exn label_table ~key:label ~data:id; ++ if String.(label <> "") then Hashtbl.add_exn label_table ~key:label ~data:id; + id + in + let left, right = replacement_sentinel metasyntax in diff --git a/lib/kernel/matchers/template.ml b/lib/kernel/matchers/template.ml index 423a07f..136236c 100644 --- a/lib/kernel/matchers/template.ml diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix index 8ebc464cb346..816702d263ed 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "dagger"; - version = "0.6.4"; + version = "0.8.4"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-ms736KXQjqWnIU7WHQ4k1r6qwCp07N6tufCx9s9biVc="; + hash = "sha256-iFuPbSat555QHPqqP6j/6uTid19x1+OtRHADmGxTYzs="; }; - vendorHash = "sha256-zssmvu1s7O2DdvjxUYkR13CKOe4EYn50RFRRIPBJ9qg="; + vendorHash = "sha256-DWmHq8BIR00QTh3ZcbEgTtbHwTmsMFAhV7kQVRSKNdQ="; proxyVendor = true; subPackages = [ "cmd/dagger" ]; - ldflags = [ "-s" "-w" "-X=github.com/dagger/dagger/internal/engine.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/engine.Version=${version}" ]; passthru.tests.version = testers.testVersion { package = dagger; diff --git a/nixpkgs/pkgs/development/tools/convco/default.nix b/nixpkgs/pkgs/development/tools/convco/default.nix index 1ac7aaaaf8ac..9b735d2af215 100644 --- a/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/nixpkgs/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HOHUyO2Ct0BlQtLqqwsQZZPmnLij8AsayX+aIhIpZpw="; + sha256 = "sha256-RNUMLc4lY18tsOr2vmpkYdQ2poVOQxsSVl5PEuhzQxw="; }; - cargoHash = "sha256-p8aDqBZ0HpQ4iWG0lAF6KIvE4F5P1myd/Dt/txaoz0k="; + cargoHash = "sha256-ChB4w9qnSzuOGTPYfpAJS2icy9wi1RjONCsfT+3vlRo="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index fd3d4276f1eb..1bebbc731100 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "rmssIpXp6bwrrxtbH45catYxQh/7K+tkQtvfKYBToNk="; + sha256 = "HBjtR2OTzWgMdm8oBfBuJaxP4arAokOMUnRECEsTvg8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/atlas/default.nix b/nixpkgs/pkgs/development/tools/database/atlas/default.nix new file mode 100644 index 000000000000..f17313ec3a0c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/atlas/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "atlas"; + version = "0.13.3"; + + src = fetchFromGitHub { + owner = "ariga"; + repo = "atlas"; + rev = "v${version}"; + hash = "sha256-mnLrmsKFDpjTHyOgOeL/YsWcTfbKgv/M+phJSMFQReU="; + }; + + modRoot = "cmd/atlas"; + + vendorHash = "sha256-Xi0N3lU/gqmkqJcJeQqkKr0rcbad6cIclhq4t6DCTZI="; + + nativeBuildInputs = [ installShellFiles ]; + + env.GOWORK = "off"; + + ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; + + subPackages = [ "." ]; + + postInstall = '' + installShellCompletion --cmd atlas \ + --bash <($out/bin/atlas completion bash) \ + --fish <($out/bin/atlas completion fish) \ + --zsh <($out/bin/atlas completion zsh) + ''; + + meta = with lib; { + description = "A modern tool for managing database schemas"; + homepage = "https://atlasgo.io/"; + changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + mainProgram = "atlas"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 3309dbd41862..ffc9e712381e 100644 --- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.23.0"; + version = "4.23.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-mIuHNNo/L5h2RvpTN0jZt6ri+Il0H9aSL4auOjIepjU="; + hash = "sha256-uWZ9l6C6QlVHqp/ma6/sz07zuCHpGucy7GhNDq8v1/U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/litefs/default.nix b/nixpkgs/pkgs/development/tools/database/litefs/default.nix index 660d06c63661..c12cde6af918 100644 --- a/nixpkgs/pkgs/development/tools/database/litefs/default.nix +++ b/nixpkgs/pkgs/development/tools/database/litefs/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EPOOQSjhhUgUcO+edcZIPomd6g/BI9Ee5MsmylKq1Sk="; + sha256 = "sha256-gTXIQVnNyVn2UqigozvEPaPm3XoqHd6E0RZnZS4bP3g="; }; vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; diff --git a/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index dfe0cac81f89..92a740ac0a7a 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -8,7 +8,7 @@ buildGoModule { inherit version; src = fetchFromGitHub { - owner = "kyleconroy"; + owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA="; diff --git a/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix b/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix index b6fac2c3127e..3ad3ef0656f4 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-d9XxE+yY3LEsg9JYOFYs9r2ZHaH0+tnEOqNV+5tEiAs="; + sha256 = "sha256-omclEa/URexzzpn5jRw2ivBPxmx6kw+WBIOk4XZASkU="; }; - vendorHash = "sha256-+buoX9etR34p1N2G8+48ZvF6cg/y4uKb89sSIwkoeuY="; + vendorHash = "sha256-mqyKH6xLfTqKVStEZYqau19U9y/NlqoD0XLeoWHScgM="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index c73cdb55ea94..14bb9ba345e5 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zIufjQ8JNt3/GGd7Q1wEdJULKe+qXtZpEJJzrH3KVno="; + hash = "sha256-olwvg/smXPDqKvSdpp30SEsHYWNQXU9ISbOmJH7MKLo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix index 29b98eb77fa5..47b01955868f 100644 --- a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix @@ -25,15 +25,15 @@ in rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.1.0"; + version = "2.1.1"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-FdmjfywvDD3mo1d1pUQMYvebo5AUTa99gQbQuOWmZZk="; + hash = "sha256-fpvC9C30DJy5ih+sFTTMoiykUHqG6OzDhF9jvix1Ctg="; }; - cargoHash = "sha256-onPzM9E53VUogZdIu3jAeB4dL3MC2FP3b6QWZ5Tr3j0="; + cargoHash = "sha256-nPmUCww8sOJwnG7+uIflLPgT87xPX0s7g0AcuDKhY2I="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/earthly/default.nix b/nixpkgs/pkgs/development/tools/earthly/default.nix index 06983c3e286c..225a2981a604 100644 --- a/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.15"; + version = "0.7.17"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-cCN63eHfYAsCcvRU+hAH+dZJHlmBu7MitvrjGB/qzMU="; + hash = "sha256-JkZVuOlN9lDTdJ2076+STLU+UcoAAmWdqsBDGMtUJyw="; }; - vendorHash = "sha256-8t7nWVItX9OPo6fsJuzo+w6ZyVcsqwi2e7HE2nqyYck="; + vendorHash = "sha256-R3UxfshCAca73xRnjen5Dg8/gbTrTpZsz9HB18/MxEQ="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index 69d020f74d5f..4fec2ef0c065 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.21.1"; + version = "9.21.2"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-pbZNqle4ExLGoICJumJ94PYnL22bxZfHdMzWbo3P4NU="; + sha256 = "sha256-7MIjXF1qgEye2Z/cyeuSFkEmXT8AxkwYfw+/UevsPFg="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix b/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix new file mode 100644 index 000000000000..5ee3476eac2c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gcov2lcov"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "jandelgado"; + repo = "gcov2lcov"; + rev = "v${version}"; + hash = "sha256-S5fAhd0bh1XEeQwaya8LvnKQ/iz4PjAbpjK4uFI6H1g="; + }; + + vendorHash = "sha256-r95PFkTywGiDIEnDfLpzt97SkuDeXo4xg2N7ikG0hs0="; + + ldflags = [ "-s" "-w" ]; + + # Some checks depend on looking up vcs root + checkPhase = false; + + meta = with lib; { + description = "Convert go coverage files to lcov format"; + homepage = "https://github.com/jandelgado/gcov2lcov"; + changelog = "https://github.com/jandelgado/gcov2lcov/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ meain ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix index 3e0080332e18..0b5b542ca07f 100644 --- a/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-0BnvIGqAm1N4xbZiqq/iouXkvDWfpZvBA0gKMcB+WYU="; + sha256 = "sha256-ikZ3vuoGYCbjvcpqol11WZ1PfxqSm1VNfdLDJIlNeP0="; }; - vendorHash = "sha256-jpCib0bwb5MtaHhM+d3dFxIXwyMGvxdo+Vgv6PKVp7w="; + vendorHash = "sha256-huXVFvSd2KkNqb6BWsTY2megnD9dJLy7edX2mGBv0rU="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index 47bac190dc44..f17b9d310fee 100644 --- a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -1,29 +1,50 @@ -{ lib, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }: let mavenJdk8 = maven.override { jdk = jdk8; }; + + defineMvnWrapper = '' + mvn() + { + # One of the deps that are downloaded and run needs zlib. + export LD_LIBRARY_PATH="${lib.makeLibraryPath [zlib]}" + # Give access to ELF interpreter under FHS path, to be able to run + # prebuilt binaries. + "${lib.getExe proot}" -b "${stdenv.cc.libc}/lib:/lib64" mvn "$@" + } + ''; in mavenJdk8.buildMavenPackage rec { pname = "global-platform-pro"; - version = "18.09.14"; - GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty + version = "20.01.23"; + GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty src = fetchFromGitHub { owner = "martinpaljak"; repo = "GlobalPlatformPro"; - rev = version; - sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg"; + rev = "v${version}"; + sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; }; - mvnHash = "sha256-xFcEZpJ0+ApJTDTuA63LgvUwLrxATVKoj5Mh3WZyfq8="; + mvnHash = "sha256-+297ttqBT4Q4NyNIvTYTtiDrB1dfmuu9iWmAxxBZiW8="; nativeBuildInputs = [ jdk8 makeWrapper ]; + # Fix build error due to missing .git directory: + # Failed to execute goal pl.project13.maven:git-commit-id-plugin:4.0.0:revision (retrieve-git-info) on project gppro: .git directory is not found! Please specify a valid [dotGitDirectory] in your pom.xml -> [Help 1] + mvnParameters = "-Dmaven.gitcommitid.skip=true"; + + mvnFetchExtraArgs = { + preConfigure = defineMvnWrapper; + }; + + preConfigure = defineMvnWrapper; + installPhase = '' mkdir -p "$out/lib/java" "$out/share/java" - cp target/gp.jar "$out/share/java" + cp tool/target/gp.jar "$out/share/java" makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ --add-flags "-jar '$out/share/java/gp.jar'" \ --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" diff --git a/nixpkgs/pkgs/development/tools/go-jet/default.nix b/nixpkgs/pkgs/development/tools/go-jet/default.nix index 2f20c8d3ca49..aea629bebefe 100644 --- a/nixpkgs/pkgs/development/tools/go-jet/default.nix +++ b/nixpkgs/pkgs/development/tools/go-jet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jet"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-Dj/Bq7MEM2sIhz1ThvRpO9wYCasISvd8icP68LVXEx0="; + sha256 = "sha256-G/yKS4YFKOVkuoqT/Qh12ul43dKo4W23EIyCgmeaUoo="; }; vendorHash = "sha256-AwrtLTzKqKjFf5fV3JWYWyaqzHJjMNrYuSXhHXyV5HE="; diff --git a/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/nixpkgs/pkgs/development/tools/go-mockery/default.nix index fd92a8035839..690dd71d4328 100644 --- a/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.32.4"; + version = "2.33.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-8J8SEPsRj6T6kpCTaouHEojLJQD4K0894m5ldVGdy6I="; + sha256 = "sha256-HQBGKWJSjo4ox8YEeQhzM8r+GxuEMsj3SiFAO78j0bA="; }; preCheck = '' diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix index 95a258886c1f..e3edc73465e6 100644 --- a/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/nixpkgs/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.12.3"; + version = "3.12.4"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-OWYIfzJcR0V5GogVntzu5hOe3h3JO5FYWxSqYSxRp6A="; + sha256 = "sha256-ox4UPwotJBA8qxZpqyKmOW2bqbSWHX+yIpGvFnf2Rzo="; }; - vendorHash = "sha256-Zt8Nzga9xRYuUv8ofCJa3yL2Kq+xvnqs3c0g2BnrgTo="; + vendorHash = "sha256-AIhAMgpVLMxeYoj4Jl4O92/etOtFD++ddV18R8aYRuY="; subPackages = [ "cmd/goa" ]; diff --git a/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix b/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix index 2d36c207fdbe..9f87aa67020e 100644 --- a/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix +++ b/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.3.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-JIXBC7fk/Bd3tTHiK+qtB+5CdAATaB/j1nvKOJrz4n4="; + hash = "sha256-aQVjnJ//fV3i6blGKb05C2Sw1Bum9b4/o00q6krFtVI="; }; vendorHash = "sha256-lyV4HlpzzxYC6OZPGVdNVL2mvTFE9yHO37zZdB/ePBg="; diff --git a/nixpkgs/pkgs/development/tools/gojq/default.nix b/nixpkgs/pkgs/development/tools/gojq/default.nix index 09c78835e5f9..b2d80e1916dc 100644 --- a/nixpkgs/pkgs/development/tools/gojq/default.nix +++ b/nixpkgs/pkgs/development/tools/gojq/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "gojq"; }; } diff --git a/nixpkgs/pkgs/development/tools/gops/default.nix b/nixpkgs/pkgs/development/tools/gops/default.nix index a74d0a9d08c9..6b191d00bf3b 100644 --- a/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gops"; - version = "0.3.27"; + version = "0.3.28"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "sha256-F1/1wMO2lQ4v2+r3FPzaxCkL2lW+COgxy4fjv6+p7AY="; + sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; }; - vendorHash = "sha256-ea+1AV0WzaQiDHyAUsm0rd/bznehG9UtmB1ubgHrOGM="; + vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index 4ba850c624eb..39fc54b6ac40 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -1,21 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "hcloud"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-BmV+g0Geue41KNcB++TaoSsuGG1HA+uH5GHye7QRWOM="; + rev = "refs/tags/v${version}"; + hash = "sha256-6UQaO2ArAYd6Lr1maciC83k1GlR8FLx+acAZh6SjI3g="; }; - vendorHash = "sha256-eGeaH9nIjBSZLxNlsQtas122eEXrIbrGn/GYVB4KhvY="; + vendorHash = "sha256-mxAG3o3IY70xn8WymUzF96Q2XWwQ0efWrrw1VV4Y8HU="; ldflags = [ - "-s" "-w" - "-X github.com/hetznercloud/cli/internal/version.Version=${version}" + "-s" + "-w" + "-X=github.com/hetznercloud/cli/internal/version.Version=${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/html-minifier/default.nix b/nixpkgs/pkgs/development/tools/html-minifier/default.nix new file mode 100644 index 000000000000..6fd239fa816c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/html-minifier/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "html-minifier"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "kangax"; + repo = "html-minifier"; + rev = "v${version}"; + hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A="; + }; + + npmDepsHash = "sha256-VWXc/nBXgvSE/DoLHR4XTFQ5kuwWC1m0/cj1CndfPH8="; + + npmFlags = [ "--ignore-scripts" ]; + + dontNpmBuild = true; + + meta = { + description = "Highly configurable, well-tested, JavaScript-based HTML minifier"; + homepage = "https://github.com/kangax/html-minifier"; + license = lib.licenses.mit; + mainProgram = "html-minifier"; + maintainers = with lib.maintainers; [ chris-martin ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/jql/default.nix b/nixpkgs/pkgs/development/tools/jql/default.nix index 82363d0ca515..83f25c44ab25 100644 --- a/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/nixpkgs/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-lYm+zgZkt/iVJgehJM44VqWbcR4kqt8rUSEsnz07tbU="; + hash = "sha256-9VQtPYAw/MtYZxfosWPQOy29YjvzVGP/mhje42dAb8U="; }; - cargoHash = "sha256-Gav89ub4ccv/lCCqNYn9NvK4Q8udlu6YaZPhouHOVss="; + cargoHash = "sha256-erGqHW3LyXTcy6MZH24F7OKknissH4es2VmWdEFwe0Y="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ akshgpt7 figsoda ]; + mainProgram = "jql"; }; } diff --git a/nixpkgs/pkgs/development/tools/kafkactl/default.nix b/nixpkgs/pkgs/development/tools/kafkactl/default.nix index 3528777f787a..870f9b52023f 100644 --- a/nixpkgs/pkgs/development/tools/kafkactl/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkactl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H6oSkPQx5bk9VBBoeGVg0Ri5LTCv96tR4Vq4guymAbQ="; + hash = "sha256-Rehf0mbdHgfjcsRKYCAqaUKsys3rRZFJxwHk2h/aICM="; }; - vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA="; + vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/kdash/default.nix b/nixpkgs/pkgs/development/tools/kdash/default.nix index 9a95071bb480..0269598a3e90 100644 --- a/nixpkgs/pkgs/development/tools/kdash/default.nix +++ b/nixpkgs/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2Ne0wDgPkNZa68KbJ9Hke5l+tBAf7imu1Cj+r/uZUE="; + sha256 = "sha256-PjkRE4JWDxiDKpENN/yDnO45CegxLPov/EhxnUbmpOg="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoHash = "sha256-dX5p+eLhZlU1Xg2SoqtEYb8T3/lvoJa78zgQStLPZNE="; + cargoHash = "sha256-nCFXhAaVrIkm6XOSa1cDCxukbf/CVmwPEu6gk7VybVQ="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix b/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix index bdafbc3ed8cf..bf318108c430 100644 --- a/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OqBTlzHqnwu6GaNFS6cdcOoBNdSGus/piR4tXRfzpn0="; + sha256 = "sha256-strTBBpmG60H38WWLakIjZHVUgKC/ajS7ZEFDhZWnlo="; }; patches = [ ./version.patch ]; - vendorHash = "sha256-gztTF8UZ5N4mip8NIyuCfoy16kpJymtggfG0sAcZW6c="; + vendorHash = "sha256-YQfMq0p3HfLgOjAk/anZpGx/fDnvovI3HtmYdKRKq5w="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index cf458c0210dd..e681f7807083 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-Z7ovjDt7MoV0/YRDOkidTs6O4vwKAVZyioeaNaehZLQ="; + hash = "sha256-8hy+lRh6WqyjInqGD21GHdS0QWz8g0e8MdZbQblv8II="; }; - vendorHash = "sha256-dOs+CasHQt9kcjQENG2rJfTimmkGzayJyGuyE6u8Pz4="; + vendorHash = "sha256-/mfwBHaouYN8JIxPz720/7MlMVh+5EEB+ocnYe4B020="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index 9cf575ec5480..faf662981068 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.25"; + version = "3.7.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-fERsqOjuZSIPpTEAQbKZ/ZYzQENxJi8Gibb6Oi073pA="; + sha256 = "sha256-kUtiMNwJJN7ZAktSC7tZriAcTDFhvcfSwBE6KFzceMg="; fetchSubmodules = true; }; @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda sei40kr ]; + mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix b/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix index 10ff9bfd4b86..df78ed497d2f 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.0.0"; + version = "1.0.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-futBxdMEJN0UdDvlk5FLUUmcG7r7P7D81IhbC2oYn5s="; + outputHash = "sha256-AamUE6mr9fwjbDndQtzO2Yscu2T6zUW/DiXMYwv35YE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock b/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock index e9208f2e315b..de07ef3606fe 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "diagnostic", @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -66,9 +66,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -97,15 +97,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -115,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "str-util", @@ -124,11 +127,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "cm-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "lex-util", "paths", @@ -140,7 +143,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", ] @@ -157,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "serde", @@ -185,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "once_cell", @@ -222,7 +225,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "diff" @@ -239,7 +242,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "log", ] @@ -271,9 +274,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -293,7 +296,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "drop_bomb", "rowan", @@ -303,16 +306,16 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "rustc-hash", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -321,7 +324,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "form_urlencoded" @@ -343,9 +346,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -380,7 +383,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "idna" @@ -395,7 +398,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "nohash-hasher", ] @@ -412,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.9" +version = "0.13.0" dependencies = [ "cm-syntax", "config", @@ -460,7 +463,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "anyhow", @@ -488,7 +491,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.9" +version = "0.13.0" [[package]] name = "libc" @@ -508,21 +511,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-server" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ea9ae5a5082ca3b6ae824fc7666cd206b99168a4d4c769ad8fe9cc740df6a6" +checksum = "b52dccdf3302eefab8c8a1273047f0a3c3dca4b527c8458d00c09484c8371928" dependencies = [ "crossbeam-channel", "log", @@ -532,9 +535,9 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.93.2" +version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ "bitflags 1.3.2", "serde", @@ -560,7 +563,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "codespan-reporting", @@ -578,7 +581,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.9" +version = "0.13.0" dependencies = [ "anyhow", "env_logger", @@ -598,7 +601,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "paths", @@ -609,7 +612,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "diagnostic", @@ -633,7 +636,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "lex-util", "paths", @@ -651,9 +654,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -672,18 +675,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -696,7 +699,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.12.9" +version = "0.13.0" dependencies = [ "better-panic", ] @@ -704,7 +707,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", "glob", @@ -716,7 +719,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", ] @@ -766,18 +769,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -787,9 +790,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -829,11 +832,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -848,18 +851,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" dependencies = [ "proc-macro2", "quote", @@ -868,9 +871,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -879,9 +882,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", @@ -899,7 +902,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "str-util", @@ -907,14 +910,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.9" +version = "0.13.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "fmt-util", @@ -925,7 +928,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "pretty_assertions", @@ -941,7 +944,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "elapsed", @@ -955,7 +958,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "once_cell", @@ -964,7 +967,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.9" +version = "0.13.0" dependencies = [ "la-arena", "sml-lab", @@ -975,7 +978,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "cov-mark", @@ -990,14 +993,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.9" +version = "0.13.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.9" +version = "0.13.0" dependencies = [ "cov-mark", "diagnostic", @@ -1008,11 +1011,11 @@ dependencies = [ [[package]] name = "sml-libs" version = "0.1.0" -source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e58af01200af5b0" +source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f74b26074affec2a" [[package]] name = "sml-naive-fmt" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "sml-comment", @@ -1021,11 +1024,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.9" +version = "0.13.0" [[package]] name = "sml-parse" -version = "0.12.9" +version = "0.13.0" dependencies = [ "diagnostic", "event-parse", @@ -1037,14 +1040,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.9" +version = "0.13.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.9" +version = "0.13.0" dependencies = [ "num-bigint", "num-traits", @@ -1053,7 +1056,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "chain-map", "config", @@ -1076,7 +1079,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.9" +version = "0.13.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1095,7 +1098,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.9" +version = "0.13.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1103,7 +1106,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1114,7 +1117,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "sml-hir", @@ -1132,16 +1135,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.26" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1151,7 +1154,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "char-name", "fast-hash", @@ -1172,7 +1175,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "cm-syntax", @@ -1198,7 +1201,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "line-index", "text-size-util", @@ -1213,7 +1216,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "text-size", ] @@ -1236,7 +1239,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "toml" @@ -1275,7 +1278,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "ungrammar" @@ -1285,9 +1288,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -1322,7 +1325,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "url" @@ -1388,7 +1391,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1408,17 +1411,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -1429,9 +1432,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -1441,9 +1444,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -1453,9 +1456,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -1465,9 +1468,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -1477,9 +1480,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -1489,9 +1492,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -1501,22 +1504,22 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "xtask" -version = "0.12.9" +version = "0.13.0" dependencies = [ "anyhow", "flate2", diff --git a/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 8b1fc8c47745..95b7a2bc68fd 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-PGB5sgYxiXYTj6O9SY/druDpNCf4O8HsivT8zhJM62M="; + hash = "sha256-q7p3TB7YsfROW+6MCbcGCPTIekEgqQBi0MUHkIuhtHc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-mAzrBqaESZhLNozdgrGaRbOzwT+5j9nw9rRot9Xg1Ts="; - "sml-libs-0.1.0" = "sha256-q3n4UfDcpDaN8v9UewAz2G26NeDDsZFuczS7N6nkl5Q="; + "char-name-0.1.0" = "sha256-uWKoRLEwbjndrtu30H0zysHLIXBqWa0SnYm6Iy1hUko="; + "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; diff --git a/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix index fde707ec6641..b8807f0a26f8 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-wwFek9668tC+j2F12b9YiYbYJWp5z4J4F09dlj+hlq0="; + hash = "sha256-8FQFg9EV50wGnhAoK6TNL2n7BSuvJnVw73LRNdmaegw="; }; - cargoHash = "sha256-XmacBalkevCmYxWFcez/++1ng2yyURge466VX6QZC9M="; + cargoHash = "sha256-HWu+SYwjnZCv9K9Uru3YlZukpjK9+en2HBMTbRz5oW4="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 45443db84b5b..0432ef322588 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -102,7 +102,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -131,9 +131,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -202,24 +202,34 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ "serde", ] [[package]] name = "bpaf" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c359c5e742f51d3238e83af24b289903591fbce38990eb9fcc903c7f8d5d95f9" +checksum = "1dc3b1bd654a8d16eea03586c3eee8ffd25c7f242b9eae9730cc442834fe56d9" dependencies = [ "owo-colors", "supports-color", ] [[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -251,9 +261,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -313,7 +323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" dependencies = [ "comemo-macros", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -463,9 +473,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "9b101bb8960ab42ada6ae98eb82afcea4452294294c45b681295af26610d6d28" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -482,9 +492,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" [[package]] name = "dirs" @@ -515,14 +525,14 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "ecow" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" +checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" dependencies = [ "serde", ] @@ -544,9 +554,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -561,7 +571,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -661,9 +671,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -801,7 +811,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -859,15 +869,39 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "globmatch" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e82f77d5e36ce0c3941a39a6d8fff8ed9553ae13586b31640d6885f7376097" +dependencies = [ + "globset", + "log", + "walkdir", +] + +[[package]] +name = "globset" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -969,9 +1003,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1311,6 +1345,15 @@ dependencies = [ [[package]] name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" @@ -1436,9 +1479,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-types" @@ -1542,9 +1585,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1600,9 +1643,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -1645,7 +1688,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1745,7 +1788,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float 3.7.0", + "ordered-float 3.9.1", "percent-encoding", "rand", "regex", @@ -1771,9 +1814,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" dependencies = [ "num-traits", ] @@ -1851,7 +1894,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -1877,14 +1920,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1923,9 +1966,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2028,9 +2071,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2153,9 +2196,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "base64", "bytes", @@ -2245,7 +2288,7 @@ dependencies = [ "log", "roxmltree", "simplecss", - "siphasher", + "siphasher 0.3.11", "svgtypes", ] @@ -2270,7 +2313,7 @@ version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -2300,9 +2343,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -2401,29 +2444,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2438,7 +2481,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2500,15 +2543,21 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2643,7 +2692,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2681,7 +2730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ "kurbo", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -2697,9 +2746,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -2747,9 +2796,9 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", @@ -2760,22 +2809,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2823,9 +2872,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ "deranged", "itoa", @@ -2842,9 +2891,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -2903,9 +2952,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", "bytes", @@ -2926,7 +2975,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3074,7 +3123,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3104,7 +3153,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3186,7 +3235,7 @@ name = "typst" version = "0.7.0" source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "bytemuck", "comemo", "ecow", @@ -3206,7 +3255,7 @@ dependencies = [ "roxmltree", "rustybuzz", "serde", - "siphasher", + "siphasher 0.3.11", "stacker", "subsetter", "svg2pdf", @@ -3267,7 +3316,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.9.4" +version = "0.9.5" dependencies = [ "anyhow", "async-compression", @@ -3281,7 +3330,7 @@ dependencies = [ "if_chain", "indexmap 2.0.0", "internment", - "itertools", + "itertools 0.11.0", "lazy_static", "memmap2 0.7.1", "once_cell", @@ -3294,7 +3343,7 @@ dependencies = [ "same-file", "serde", "serde_json", - "siphasher", + "siphasher 1.0.0", "strum 0.25.0", "temp-dir", "thiserror", @@ -3307,6 +3356,7 @@ dependencies = [ "tracing-subscriber", "typst", "typst-library", + "typstfmt_lib", "walkdir", ] @@ -3318,7 +3368,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3338,6 +3388,21 @@ dependencies = [ ] [[package]] +name = "typstfmt_lib" +version = "0.2.0" +source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" +dependencies = [ + "globmatch", + "itertools 0.10.5", + "regex", + "serde", + "toml", + "tracing", + "typst-syntax", + "unicode-segmentation", +] + +[[package]] name = "unic-langid" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3590,7 +3655,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -3624,7 +3689,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3637,9 +3702,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -3659,23 +3724,10 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -3734,9 +3786,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -3749,62 +3801,63 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50be2474cf85af7994b8ddd153dcde06fbcf847ced8f14d2e401ac3c33df143c" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys", ] [[package]] diff --git a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix index e6f20062d39f..7abe4811ba37 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -7,22 +7,30 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-qbmNZFXg+XaDkHdBA3dU0ICKovEQrl7AAcMkElMLbMA="; + hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; + "typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM="; }; }; + patches = [ + # update typstfmt to symlink its README.md into the library crate + # without this patch, typst-lsp fails to build when dependencies are vendored + # https://github.com/astrale-sharp/typstfmt/pull/81 + ./update-typstfmt.patch + ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch new file mode 100644 index 000000000000..4c540b8257ce --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch @@ -0,0 +1,22 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3390,7 +3390,7 @@ dependencies = [ + [[package]] + name = "typstfmt_lib" + version = "0.2.0" +-source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455" ++source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" + dependencies = [ + "globmatch", + "itertools 0.10.5", +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = + "fmt", + ] } + walkdir = "2.3" +-typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" } ++typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" } + + # jaeger + opentelemetry = { version = "0.20.0", optional = true } diff --git a/nixpkgs/pkgs/development/tools/micronaut/default.nix b/nixpkgs/pkgs/development/tools/micronaut/default.nix index 43afba18773d..dea45a573d88 100644 --- a/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.0.3"; + version = "4.0.5"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-xwBeg6A39MrnQTfesfv+vD0QSIRq9CWvF4vwqf/N730="; + sha256 = "sha256-h2llX5g4f8jSU1pmvzLEn2yLZBte/EoEfYBW9lqfuWk="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index 6f9c848e0228..984e2ec346e4 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.49"; + version = "0.2.50"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dJt8XrcB1rYt6os3enLQz0YuqXNIqQTh85BIJdXwi2A="; + hash = "sha256-NVzONabM1EUsA+PUyJ7hBOZmqs5RYfE0teNO6BMBu7M="; }; - vendorHash = "sha256-QPpwYec2Y0x/VOsiTWvObKrNWGGE7dj8Cl5eM2l8ibk="; + vendorHash = "sha256-+MQofGGja4JUSWCctY0CWQ2aYpVrXj4/knqd/TW0PtI="; doCheck = false; @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix b/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix index 40924e195de5..0b0b7e47ba93 100644 --- a/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-chx37D0y05nIlXmP4SsWvsO+36BV7drTYpJCgMIl5xA="; + hash = "sha256-1ThEJ8VEcXNScY4zmmXz7BVYs6irE1h9HDxkVvmVq1k="; }; - cargoHash = "sha256-VfuBee2F2FxhcTE1JwosFgQI9+stzDuOHfpLv25rcNw="; + cargoHash = "sha256-3myUFgKktvD9S0Bp7ixsZb59p3iDwmiEKUFD7wB+7IM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 143c6ee74dd7..b3574aab3344 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.20.0"; + version = "2.21.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "zsG527W8/gr6wqbHfzOuihf/a8k4QeFdU6ajlJgGncs="; + sha256 = "k2KLrU/Oz3FjBS3ZRKiSDNBweauZSg02yY5Y286JIds="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "0ov+VJSJleI0aiMiZ+KdtQJ6nYcI6NZxZiShWGhV9N0="; + sha256 = "IECKTvbDIA5yANm9n2Y9WxZorDqURac+iSCmBQ8ECHk="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "IEyAR6C2px2C/LEHLW5ZBamhmveCBwcgmm6w7KW6Cyg="; + sha256 = "7tdXb1sPYncbbKsbSASlZsgzbcOB9EWI+XZ0JV05PUc="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "fD8iNRSY860hBiZ4uFqDO1LCa49/gyC9M2rBlvm2ZWI="; + sha256 = "Ke55JS9kYkCX69hxOvnNR6FsMEufgvNf1dOaHnzlcp0="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "E6UuLldO7N59PAkzR49FXJZYJ15yGbePtHVdacwyJ20="; + sha256 = "GAbN0GoWiw1AAwfo1BfFK0boo+QywfY0VC4SlSjADKo="; }; }; diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 1b9b0f940cc5..9774200e9b3d 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook ]; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 6904414601a3..6192322c2c34 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.28528"; + version = "0.1.28811"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y8KpJdJLYSsDLT6/z0/Nx9qByLdtNNBeiwFUupJxxCQ="; + sha256 = "sha256-HaBFKjVw6EzhH1oxSeKFmZUDZleFGrxjOegTVCGmrzI="; }; vendorHash = "sha256-OWdJ7nFR5hrKQf2H763ezjXkEh0PvtBcjjeSNvH+ca4="; diff --git a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index ad83f8f2078a..c9685d53511e 100644 --- a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage { pname = "complgen"; - version = "unstable-2023-08-17"; + version = "unstable-2023-08-22"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; - rev = "4f01c04184b31804009e0002ff6ba1c777439798"; - hash = "sha256-KQFMWVHTlkf65ghgv3oR2Jz4QtXkdz6CNIC3eeyBgBg="; + rev = "8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b"; + hash = "sha256-oYRaH3FbAFY7QujgFpUDD8gVam4+Gm9qROxCTMYBg9I="; }; - cargoHash = "sha256-m/eFpwMZOOVGVeXjQwNZheuPeGkJd0mAF903ML/Kr90="; + cargoHash = "sha256-LHnIIkQLuY+A09qhxSiyLmUpX/dES7xBE5m1uRPI0i0="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix b/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix index e856e333b33a..8783ca578a23 100644 --- a/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix @@ -19,17 +19,17 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.65.1"; + version = "1.66.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-q6UY+A7JFDYb9hzvr2SYI9GfkY9bg49fQkUM7gHKOBU="; + hash = "sha256-2bqYoWG8xGh7HGZyCPLNz/ZWXH29Be12YfYgGTCIVx8="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-nIiffqM5HwJmORdONz+RADAPTISrz/3/HxK4aOSl5cM="; + vendorHash = "sha256-YWxVpwuo97i00/F4WOn2AWiRFYSFIWbEbmxDF77gWsE="; nativeBuildInputs = [ buf diff --git a/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix index 8a44d484ddde..5c21f8a0f415 100644 --- a/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix @@ -2,17 +2,18 @@ , stdenv , cmake , fetchFromGitHub +, gitUpdater }: stdenv.mkDerivation rec { pname = "grpc-tools"; - version = "1.11.2"; + version = "1.12.4"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-node"; rev = "grpc-tools@${version}"; - sha256 = "00432y19pjcimwachjcqpzra21vzmlqchhhlqxnk98bfh25kxdcb"; + hash = "sha256-708lBIGW5+vvSTrZHl/kc+ck7JKNXElrghIGDrMSyx8="; fetchSubmodules = true; }; @@ -25,6 +26,11 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin deps/protobuf/protoc ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/grpc/grpc-node.git"; + rev-prefix = "grpc-tools@"; + }; + meta = with lib; { description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 6dd504a3cf9e..5f6113343f73 100644 --- a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.5.11"; + version = "1.5.21"; src = fetchFromGitHub { - owner = "NXPmicro"; + owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${version}"; - hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; + sha256 = "sha256-XVvGsHltlA3h9hd3C88G3s2wIZ1EVM6DmvdiwD82vTw="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix index f92e7930c4f9..d5afea351ffe 100644 --- a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix @@ -4,13 +4,13 @@ , removeReferencesTo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; - version = "1.9.5"; + version = "2.0.2"; src = fetchurl { - url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-GsFlbeuydJdWMDb3v/woFJD4P5uEV8DWC8+2OPtrYXE="; + url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; + hash = "sha256-6lol748lHrU3fsDiHHX7YYlEM8+9vwslWboz5MJmRAE="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mv ${placeholder "dev"}/share ${placeholder "out"} ''; - meta = with lib; { + meta = { homepage = "https://github.com/pkgconf/pkgconf"; description = "Package compiler and linker metadata toolkit"; longDescription = '' @@ -52,8 +52,10 @@ stdenv.mkDerivation rec { functionality, to allow other tooling such as compilers and IDEs to discover and use libraries configured by pkgconf. ''; - license = licenses.isc; - maintainers = with maintainers; [ zaninime AndersonTorres ]; - platforms = platforms.all; + changelog = "https://github.com/pkgconf/pkgconf/blob/pkgconf-${finalAttrs.version}/NEWS"; + license = lib.licenses.isc; + mainProgram = "pkgconf"; + maintainers = with lib.maintainers; [ zaninime AndersonTorres ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/nixpkgs/pkgs/development/tools/misc/premake/5.nix index 8fefb65e79be..a42d4c1a7b6e 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/5.nix +++ b/nixpkgs/pkgs/development/tools/misc/premake/5.nix @@ -14,12 +14,17 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; - patchPhase = '' + postPatch = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 + '' + lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace \ + binmodules/example/premake5.lua \ + binmodules/luasocket/premake5.lua \ + --replace SharedLib StaticLib ''; buildPhase = diff --git a/nixpkgs/pkgs/development/tools/misc/runme/default.nix b/nixpkgs/pkgs/development/tools/misc/runme/default.nix index fc61e0ae376f..dfae5be83c53 100644 --- a/nixpkgs/pkgs/development/tools/misc/runme/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/runme/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "runme"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-BoPNIaYxK4VyafNWAVDonwTfpqF1N3Ggq5GF6A7DhF0="; + hash = "sha256-3NCD9kagcxW8Ahet20imFYqo3G7nkR1iPM0C5tQX72o="; }; vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4="; diff --git a/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix index 58c3460bf556..028f2f8d5029 100644 --- a/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YVOxzxkvvW2pFDsYdDM2uiK6kIam+EP/BOF+Vs+RM2g="; + sha256 = "sha256-ENv17Az6yzUwD39HDfoD7Bmvs6LHjVp85PaYkTw6jW0="; }; - cargoHash = "sha256-Nt8t4nyfwxyX8mugQy4La3Y+nertJg9MFE1ROePISSg="; + cargoHash = "sha256-wL46QhY3Cq2KFLETPRhUWb77o1vNrRA2w1NBAtBc0yo="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix index f983d82846b6..d8d3ffd4bf53 100644 --- a/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-r9ugSs9I5K7yuAtOTWCKr3dHGBtmTQVehKqZ3ago1U4="; + hash = "sha256-byfmZQDYn76/0K/ByKePXF+eWVZNCnAqu5k6UN7Iijg="; }; - vendorHash = "sha256-A533f+FfEzU2TlNwHkD8gjeQYRATz85cCCmqLdl9290="; + vendorHash = "sha256-DASjCyOY9+USRYrnIS+Li4zhBnZNoyxUgN9LqhIAMh8="; subPackages = [ "cmd/src" diff --git a/nixpkgs/pkgs/development/tools/misc/typical/default.nix b/nixpkgs/pkgs/development/tools/misc/typical/default.nix index 12016efc53de..7944f14ca4d6 100644 --- a/nixpkgs/pkgs/development/tools/misc/typical/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/typical/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typical"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "typical"; rev = "v${version}"; - hash = "sha256-pXLOtCzdI6KspNzg1R7Zc97Dd7dX7ZzxvlvKprkLF2I="; + hash = "sha256-UoTzgYxLdlWefNLeege7+tlqWh4uzotO5EbcyqvU2Xo="; }; - cargoHash = "sha256-ckW2Hc5BRqtvzZRUAlf7Vy06cgSTY6nv2ompSDNzpi4="; + cargoHash = "sha256-GIyvwByzNKFvEdVSLo2cxuQ7JvKRFezhyKQrWjbj7Kk="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/development/tools/mongosh/package-lock.json b/nixpkgs/pkgs/development/tools/mongosh/package-lock.json index 8dc69a1d059c..f3af35f3e10f 100644 --- a/nixpkgs/pkgs/development/tools/mongosh/package-lock.json +++ b/nixpkgs/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "1.10.5", + "version": "1.10.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "1.10.5", + "version": "1.10.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "1.10.5" + "@mongosh/cli-repl": "1.10.6" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,43 +122,43 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.391.0.tgz", - "integrity": "sha512-5mlkdrLP6sTG6D+q/qFw6vPVegFGSy1XcVUdERmWo6fvR7mYlRNETGC5sNsGPcMhnN3MCviqxCJmXpwnsP7okg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.398.0.tgz", + "integrity": "sha512-Pr/S1f8R2FsJ8DwBC6g0CSdtZNNV5dMHhlIi+t8YAmCJvP4KT+UhzFjbvQRINlBRLFuGUuP7p5vRcGVELD3+wA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.391.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/client-sts": "3.398.0", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -168,40 +168,40 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.391.0.tgz", - "integrity": "sha512-aT+O1CbWIWYlCtWK6g3ZaMvFNImOgFGurOEPscuedqzG5UQc1bRtRrGYShLyzcZgfXP+s0cKYJqgGeRNoWiwqA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.398.0.tgz", + "integrity": "sha512-CygL0jhfibw4kmWXG/3sfZMFNjcXo66XUuPC4BqZBk8Rj5vFoxp1vZeMkDLzTIk97Nvo5J5Bh+QnXKhub6AckQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -211,43 +211,43 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.391.0.tgz", - "integrity": "sha512-y+KmorcUx9o5O99sXVPbhGUpsLpfhzYRaYCqxArLsyzZTCO6XDXMi8vg/xtS+b703j9lWEl5GxAv2oBaEwEnhQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.398.0.tgz", + "integrity": "sha512-/3Pa9wLMvBZipKraq3AtbmTfXW6q9kyvhwOno64f1Fz7kFb8ijQFMGoATS70B2pGEZTlxkUqJFWDiisT6Q6dFg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-sdk-sts": "3.391.0", - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-sdk-sts": "3.398.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "fast-xml-parser": "4.2.5", @@ -258,14 +258,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.391.0.tgz", - "integrity": "sha512-60B2WDGJOijluCzeTQDzPWgGuAhYKTcYnK5fNMi9xzHBqw+IhPaGYcmAx1bQGY7SuoZBqVgt1h6fiNxY8TWO5w==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.398.0.tgz", + "integrity": "sha512-MFUhy1YayHg5ypRTk4OTfDumQRP+OJBagaGv14kA8DzhKH1sNrU4HV7A7y2J4SvkN5hG/KnLJqxpakCtB2/O2g==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-cognito-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -273,13 +273,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.391.0.tgz", - "integrity": "sha512-mAzICedcg4bfL0mM5O6QTd9mQ331NLse1DMr6XL21ZZiLB48ej19L7AGV2xq5QwVbqKU3IVv1myRyhvpDM9jMg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.398.0.tgz", + "integrity": "sha512-Z8Yj5z7FroAsR6UVML+XUdlpoqEe9Dnle8c2h8/xWwIC2feTfIBhjLhRVxfbpbM1pLgBSNEcZ7U8fwq5l7ESVQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -287,19 +287,19 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.391.0.tgz", - "integrity": "sha512-DJZmbmRMqNSfSV7UF8eBVhADz16KAMCTxnFuvgioHHfYUTZQEhCxRHI8jJqYWxhLTriS7AuTBIWr+1AIbwsCTA==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.398.0.tgz", + "integrity": "sha512-AsK1lStK3nB9Cn6S6ODb1ktGh7SRejsNVQVKX3t5d3tgOaX+aX1Iwy8FzM/ZEN8uCloeRifUGIY9uQFygg5mSw==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -307,20 +307,20 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.391.0.tgz", - "integrity": "sha512-LXHQwsTw4WBwRzD9swu8254Hao5MoIaGXIzbhX4EQ84dtOkKYbwiY4pDpLfcHcw3B1lFKkVclMze8WAs4EdEww==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-ini": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.398.0.tgz", + "integrity": "sha512-odmI/DSKfuWUYeDnGTCEHBbC8/MwnF6yEq874zl6+owoVv0ZsYP8qBHfiJkYqrwg7wQ7Pi40sSAPC1rhesGwzg==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-ini": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -328,14 +328,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.391.0.tgz", - "integrity": "sha512-KMlzPlBI+hBmXDo+EoFZdLgCVRkRa9B9iEE6x0+hQQ6g9bW6HI7cDRVdceR1ZoPasSaNAZ9QOXMTIBxTpn0sPQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.398.0.tgz", + "integrity": "sha512-WrkBL1W7TXN508PA9wRXPFtzmGpVSW98gDaHEaa8GolAPHMPa5t2QcC/z/cFpglzrcVv8SA277zu9Z8tELdZhg==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -343,16 +343,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.391.0.tgz", - "integrity": "sha512-FT/WoiRHiKys+FcRwvjui0yKuzNtJdn2uGuI1hYE0gpW1wVmW02ouufLckJTmcw09THUZ4w53OoCVU5OY00p8A==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.398.0.tgz", + "integrity": "sha512-2Dl35587xbnzR/GGZqA2MnFs8+kS4wbHQO9BioU0okA+8NRueohNMdrdQmQDdSNK4BfIpFspiZmFkXFNyEAfgw==", "dependencies": { - "@aws-sdk/client-sso": "3.391.0", - "@aws-sdk/token-providers": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-sso": "3.398.0", + "@aws-sdk/token-providers": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -360,13 +360,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.391.0.tgz", - "integrity": "sha512-n0vYg82B8bc4rxKltVbVqclev7hx+elyS9pEnZs3YbnbWJq0qqsznXmDfLqd1TcWpa09PGXcah0nsRDolVThsA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.398.0.tgz", + "integrity": "sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -374,24 +374,24 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.391.0.tgz", - "integrity": "sha512-J2fh74zUC3qZnbZol95T9w9PTgmx9NfyIy5JVs43rISdvgnAkD9fXd6YbBfQOxl9Xx9HiZW7Fa3hTxma7d/zlA==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.391.0", - "@aws-sdk/client-sso": "3.391.0", - "@aws-sdk/client-sts": "3.391.0", - "@aws-sdk/credential-provider-cognito-identity": "3.391.0", - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-ini": "3.391.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.398.0.tgz", + "integrity": "sha512-355vXmImn2e85mIWSYDVb101AF2lIVHKNCaH6sV1U/8i0ZOXh2cJYNdkRYrxNt1ezDB0k97lSKvuDx7RDvJyRg==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.398.0", + "@aws-sdk/client-sso": "3.398.0", + "@aws-sdk/client-sts": "3.398.0", + "@aws-sdk/credential-provider-cognito-identity": "3.398.0", + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-ini": "3.398.0", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -399,13 +399,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.391.0.tgz", - "integrity": "sha512-+nyNr0rb2ixY7mU48nibr7L7gsw37y4oELhqgnNKhcjZDJ34imBwKIMFa64n21FdftmhcjR8IdSpzXE9xrkJ8g==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.398.0.tgz", + "integrity": "sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -413,12 +413,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.391.0.tgz", - "integrity": "sha512-KOwl5zo16b17JDhqILHBStccBQ2w35em7+/6vdkJdUII6OU8aVIFTlIQT9wOUvd4do6biIRBMZG3IK0Rg7mRDQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.398.0.tgz", + "integrity": "sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -426,13 +426,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.391.0.tgz", - "integrity": "sha512-hVR3z59G7pX4pjDQs9Ag1tMgbLeGXOzeAAaNP9fEtHSd3KBMAGQgN3K3b9WPjzE2W0EoloHRJMK4qxZErdde2g==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.398.0.tgz", + "integrity": "sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -440,13 +440,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.391.0.tgz", - "integrity": "sha512-6ZXI3Z4QU+TnT5PwKWloGmRHG81tWeI18/zxf9wWzrO2NhYFvITzEJH0vWLLiXdWtn/BYfLULXtDvkTaepbI5A==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.398.0.tgz", + "integrity": "sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==", "dependencies": { - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -454,15 +454,15 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.391.0.tgz", - "integrity": "sha512-2pAJJlZqaHc0d+cz2FTVrQmWi8ygKfqfczHUo/loCtOaMNtWXBHb/JsLEecs6cXdizy6gi3YsLz6VZYwY4Ssxw==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.398.0.tgz", + "integrity": "sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.3", + "@smithy/protocol-http": "^2.0.5", "@smithy/signature-v4": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" }, @@ -471,14 +471,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.391.0.tgz", - "integrity": "sha512-LdK9uMNA14zqRw3B79Mhy7GX36qld/GYo93xuu+lr+AQ98leZEdc6GUbrtNDI3fP1Z8TMQcyHUKBml4/B+wXpQ==", - "dependencies": { - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.398.0.tgz", + "integrity": "sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==", + "dependencies": { + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -486,42 +486,42 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.391.0.tgz", - "integrity": "sha512-kgfArsKLDJE71qQjfXiHiM5cZqgDHlMsqEx35+A65GmTWJaS1PGDqu3ZvVVU8E5mxnCCLw7vho21fsjvH6TBpg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.398.0.tgz", + "integrity": "sha512-nrYgjzavGCKJL/48Vt0EL+OlIc5UZLfNGpgyUW9cv3XZwl+kXV0QB+HH0rHZZLfpbBgZ2RBIJR9uD5ieu/6hpQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.3", + "@smithy/protocol-http": "^2.0.5", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -531,11 +531,11 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.391.0.tgz", - "integrity": "sha512-QpYVFKMOnzHz/JMj/b8wb18qxiT92U/5r5MmtRz2R3LOH6ooTO96k4ozXCrYr0qNed1PAnOj73rPrrH2wnCJKQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.398.0.tgz", + "integrity": "sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==", "dependencies": { - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -543,11 +543,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.391.0.tgz", - "integrity": "sha512-zv4sYDTQhNxyLoekcE02/nk3xvoo6yCHDy1kDJk0MFxOKaqUB+CvZdQBR4YBLSDlD4o4DUBmdYgKT58FfbM8sQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.398.0.tgz", + "integrity": "sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "tslib": "^2.5.0" }, "engines": { @@ -566,24 +566,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.391.0.tgz", - "integrity": "sha512-6ipHOB1WdCBNeAMJauN7l2qNE0WLVaTNhkD290/ElXm1FHGTL8yw6lIDIjhIFO1bmbZxDiKApwDiG7ROhaJoxQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.398.0.tgz", + "integrity": "sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.391.0.tgz", - "integrity": "sha512-PVvAK/Lf4BdB1eJIZtyFpGSslGQwKpYt9/hKs5NlR+qxBMXU9T0DnTqH4GiXZaazvXr7OUVWitIF2b7iKBMTow==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.398.0.tgz", + "integrity": "sha512-RTVQofdj961ej4//fEkppFf4KXqKGMTCqJYghx3G0C/MYXbg7MGl7LjfNGtJcboRE8pfHHQ/TUWBDA7RIAPPlQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -691,24 +691,24 @@ } }, "node_modules/@babel/core": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", - "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz", + "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.10", "@babel/generator": "^7.22.10", "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.10", - "@babel/parser": "^7.22.10", + "@babel/helpers": "^7.22.11", + "@babel/parser": "^7.22.11", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/traverse": "^7.22.11", + "@babel/types": "^7.22.11", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -879,13 +879,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", - "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz", + "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==", "dependencies": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" + "@babel/traverse": "^7.22.11", + "@babel/types": "^7.22.11" }, "engines": { "node": ">=6.9.0" @@ -969,9 +969,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz", + "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1035,9 +1035,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz", + "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==", "dependencies": { "@babel/code-frame": "^7.22.10", "@babel/generator": "^7.22.10", @@ -1045,8 +1045,8 @@ "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/parser": "^7.22.11", + "@babel/types": "^7.22.11", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1055,9 +1055,9 @@ } }, "node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz", + "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==", "dependencies": { "@babel/helper-string-parser": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.5", @@ -1162,13 +1162,22 @@ "node": ">= 14.18.0" } }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", + "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", + "optional": true, + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, "node_modules/@mongosh/arg-parser": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.5.tgz", - "integrity": "sha512-Bt40S0q9Lgcn3JGHmFndmXVPpbE3FiaiV1MF4H15EFNIr9jWav95h+GH7ECrIEf8LkPW6kN1FGYnF3vEgepYzg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.6.tgz", + "integrity": "sha512-z6rXCrsG3mvH8TyFn+j0pZwAlYPhTOYNgiG7X/Jf3YZdtGbu31HFXdG0SQcHpt+3D9AMLQDMrABSrHLDM4PqJA==", "dependencies": { - "@mongosh/errors": "1.10.5", - "@mongosh/i18n": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/i18n": "1.10.6", "mongodb-connection-string-url": "^2.6.0" }, "engines": { @@ -1176,9 +1185,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.5.tgz", - "integrity": "sha512-EO+YyzF2ZiCfA70cFNy0yhhxv8j4PwX+AOkL2IS07/j1xik4q2ipWXHIK5AHQKXUhaBqGxhwaa7/DSmSMMEABg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.6.tgz", + "integrity": "sha512-1cd08jGwxj5TWdOSaLHnh82aT3IAzE7SpdXNdPIS6x9f1bddljnW21HT7aqVyuaG5RtU9kckf8eqE0pbD65taQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1195,12 +1204,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.5.tgz", - "integrity": "sha512-580e/PdaEaBnHL31HHxVALuLWKH9Cck7BfHRfBzxnmRPH94JwbEe8SvZrOtqQJXmuLiJsXEmMYe7MpNnKiE1Qg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.6.tgz", + "integrity": "sha512-mb1KgTMyfFb/WrBvaKLuBI3GbnlEkxC4JNqWSHW91nwvsrBY0rr13lSI/ENJX3CsrjzIC1DyxcY6J2um2UC7dw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.2.2", - "@mongosh/shell-api": "1.10.5", + "@mongosh/shell-api": "1.10.6", "semver": "^7.5.4" }, "engines": { @@ -1208,24 +1217,24 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.5.tgz", - "integrity": "sha512-3M8zo027AYGsTYDEf3qEmZKwHjl7kIheJOCeqBIl/sRbUi8lqpfIWju2DgzePVX/jkKZgLEkcJcNGF22gDPZPQ==", - "dependencies": { - "@mongosh/arg-parser": "1.10.5", - "@mongosh/autocomplete": "1.10.5", - "@mongosh/editor": "1.10.5", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/i18n": "1.10.5", - "@mongosh/js-multiline-to-singleline": "1.10.5", - "@mongosh/logging": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/service-provider-server": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/shell-evaluator": "1.10.5", - "@mongosh/snippet-manager": "1.10.5", - "@mongosh/types": "1.10.5", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.6.tgz", + "integrity": "sha512-zb3LvlWsxxorgyPl18jatdVQreBtYd3A/+h1XGiNQtwjZ0eKkw4MSZudmz+z0SfTqRVPDMJ7Fgxk2m522e1HWA==", + "dependencies": { + "@mongosh/arg-parser": "1.10.6", + "@mongosh/autocomplete": "1.10.6", + "@mongosh/editor": "1.10.6", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/i18n": "1.10.6", + "@mongosh/js-multiline-to-singleline": "1.10.6", + "@mongosh/logging": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/service-provider-server": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-evaluator": "1.10.6", + "@mongosh/snippet-manager": "1.10.6", + "@mongosh/types": "1.10.6", "analytics-node": "^5.1.2", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1255,15 +1264,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.5.tgz", - "integrity": "sha512-pAN+Cu7/fIiAhqaYE2eeMtr2pN2Im3+EgdmJyz2YezjTMvBPwRg7MsS2FU1cyD5bbqMfO9aEvmtQ8AD19UPkfQ==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/shell-evaluator": "1.10.5", - "@mongosh/types": "1.10.5", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.6.tgz", + "integrity": "sha512-HcHGSuVB9Jh27fi27flMtVCj7K0hiTmA1Wauv3IRwLOm+5QsMahXRt8sDIb86kw0mYtDke/UD2lWbbg351skPQ==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-evaluator": "1.10.6", + "@mongosh/types": "1.10.6", "js-beautify": "^1.14.0" }, "engines": { @@ -1271,9 +1280,9 @@ } }, "node_modules/@mongosh/errors": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.5.tgz", - "integrity": "sha512-b9g/G/n5Oo5EOiW8i3CqC6pZUTHvFmD8fp0hG/LA0CXutvdzWHTLC3j8lEqqa6vByEj/GF12l9IPdBHs171wSw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.6.tgz", + "integrity": "sha512-QWkp+1pTbsritSk2eAgw5+6m6h+GtP9n7C+LaiVhOB7HfYSCNdI9OVvZXpBzRC9Cw0rMORUc1BwUL/OioRtaYw==", "dependencies": { "chalk": "^4.1.2", "handlebars": "^4.7.7", @@ -1284,9 +1293,9 @@ } }, "node_modules/@mongosh/history": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.5.tgz", - "integrity": "sha512-kc8QAMAT7vSYW/BvS8rftp7WD+jfvWNdNYTRKxpv8Vuo6JD8p5+L6HThyc/1IufldGYQ9J30Rvrc4x8Hxc50tg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.6.tgz", + "integrity": "sha512-lP6HauOMmmEr1TuHWbmBxFLT4ZHsEX3QxxvNU232LmH1XKNHOyr7G9oafAz/TnA49h+QNaRusKJwLEVMeI7Eaw==", "dependencies": { "mongodb-connection-string-url": "^2.6.0", "mongodb-redact": "^0.2.2" @@ -1296,11 +1305,11 @@ } }, "node_modules/@mongosh/i18n": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.5.tgz", - "integrity": "sha512-X+U+z5C41cn2ByMUSkS/k7depFiTT6bkR7/vyVPHVTS0JfrYwC1HIRTIB8O4HIhhriG9wt/nOQ8KIlGcYKezjg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.6.tgz", + "integrity": "sha512-xj9/3MV6+jzcg+9HnInmAAtYLQF+2B8WNjrs3i+QHY0zl2C/2Fr59g8lL/btArtEbhCG0S0KYerYQ+9whI8qvg==", "dependencies": { - "@mongosh/errors": "1.10.5", + "@mongosh/errors": "1.10.6", "mustache": "^4.0.0" }, "engines": { @@ -1308,9 +1317,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.5.tgz", - "integrity": "sha512-jKbDw7XmQAYtJVdAgGlh+Gepn+lzVBlBQub68UYh/nagOe0QNNDXIdwr7Av39UF7gVBRH5hoC286VutMLJRtIA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.6.tgz", + "integrity": "sha512-4kX7y6kAMCM/wwt1J6v6t6/rLQn5bZ8Xfc8HJA4bDiWVMt7FyjlrqShtkDXEzOcBpn2NMTKFrW8nmh1Bj3WZ2w==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1320,14 +1329,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.5.tgz", - "integrity": "sha512-qZQzDafW3sSAwsg8RDSwQeopZiN90J4eXmgstmEBj+qgFbBdZXfPaQNyOA5HVf6Kt9zOJXCqafa7FPXCDmgNhA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.6.tgz", + "integrity": "sha512-QHvdyo2JC+1vb4y+G6civdx6UQSih5Ze+Myi63sHTNkTTEx7wf4qkRQm6qHNf++THxEjOB6Xmiq6V2J7WSfw4Q==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/types": "1.10.6", "mongodb-log-writer": "^1.3.0", "mongodb-redact": "^0.2.2" }, @@ -1336,12 +1345,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.5.tgz", - "integrity": "sha512-CPJ0U/R6yM99lx0X4M540tPn02QLg7S0Mqw4eVNzqAjpolNJBQSeec5Gd41TMwNU9MkWjUjDgSBtaacV103Fiw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.6.tgz", + "integrity": "sha512-x91v6CnrTRr7Y61sUG5jLLqjcizggBiDHjpwxxauVvDrcziTWDXc9gEolJcgLqs2Roch3sQBc96BWfCwzJkfGw==", "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", - "@mongosh/errors": "1.10.5", + "@mongosh/errors": "1.10.6", "bson": "^5.3.0", "mongodb": "^5.7.0", "mongodb-build-info": "^1.6.2" @@ -1354,14 +1363,14 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.5.tgz", - "integrity": "sha512-7ROp+9u7PEAdlwqU5VD4zWq3Mh/mtFD7/aJ6AlNRu5qeuQx5NDOOxPCSrej4O9hjvsQGwNT7Qhj6SC90n6vW9g==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.6.tgz", + "integrity": "sha512-0L+byNyYYNORyDR64BTG5HgRBW3nle/vjJl0aSEvf2vWsUnZF9lijjTXw52JT8VQAoM8+i9xddwZodF/AMXP7Q==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/types": "1.10.6", "@types/sinon-chai": "^3.2.4", "aws4": "^1.11.0", "mongodb": "^5.7.0", @@ -1377,15 +1386,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.5.tgz", - "integrity": "sha512-SZypGBmMxrYciuBFwGCdhdTLmwbczZ3foULphLCG2g90BjRsxhMRe3dhLaZetfohVJz4jaGBITSIfFL3MHpmBw==", - "dependencies": { - "@mongosh/arg-parser": "1.10.5", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/i18n": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.6.tgz", + "integrity": "sha512-bqC4mObT0Vt2ynmqYFBmbWOmxqZlHl3JMGambpSAst1aQM3uUDWWbmf1s9icyfvUwAzbXe7698nUuOkxW+2/Vw==", + "dependencies": { + "@mongosh/arg-parser": "1.10.6", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/i18n": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1393,26 +1402,26 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.5.tgz", - "integrity": "sha512-SAaY9lPPNK//kazce9+mRuRLV2ZMcPogku7luShqF4dVlpk4+OsouLEcvfcFUDGUXbC4RKByPMfoShdhjX0L/w==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.6.tgz", + "integrity": "sha512-djFpyX5vnyivF7Sf4ywwsPDJ0xZjOFOK+lYFTqXVrO8POvoDNYbKsaXs4Y6Ktd0mA5O1Zj/bXNbPDWHirpXy6g==", "dependencies": { - "@mongosh/async-rewriter2": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/shell-api": "1.10.5" + "@mongosh/async-rewriter2": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/shell-api": "1.10.6" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.5.tgz", - "integrity": "sha512-TunA2xBclarEzaCSiv50LzdshmK0rBgYqK53qriVrnUeGEQpd6EvgTZN2F+wSpC0FJjLIkKT871amtPsjM5sJQ==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.6.tgz", + "integrity": "sha512-QcOf5XTwAQ3FDeBL9Jniew1pKTDBehLb9eq5hOmNuNtoLrNAu10gsqBkfEPrQ4x3F+TJpaIVQo3ULAahSYSitA==", "dependencies": { - "@mongosh/errors": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/types": "1.10.6", "bson": "^5.3.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1425,9 +1434,9 @@ } }, "node_modules/@mongosh/types": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.5.tgz", - "integrity": "sha512-HQ5GUV8b4gMVlPXsqcfGCVwEK8i2DXHvSevv4RHx5ZwC19q+zt0urPqBKQHXpztmyQKnDWyNb+wwyJkhP9UKzA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.6.tgz", + "integrity": "sha512-v6gRl1ek8ioWhyo8tTs1EQwGdGKSUBmUXbPSRjqFqVITkJ8kFDu0+qRoms2m4VHvIv9ml//VqHHvBTj8Mjxx9A==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1" }, @@ -1468,11 +1477,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.4.tgz", - "integrity": "sha512-3+3/xRQ0K/NFVtKSiTGsUa3muZnVaBmHrLNgxwoBLZO9rNhwZtjjjf7pFJ6aoucoul/c/w3xobRkgi8F9MWX8Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.5.tgz", + "integrity": "sha512-byVZ2KWLMPYAZGKjRpniAzLcygJO4ruClZKdJTuB0eCB76ONFTdptBHlviHpAZXknRz7skYWPfcgO9v30A1SyA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1480,11 +1489,11 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.4.tgz", - "integrity": "sha512-JtKWIKoCFeOY5JGQeEl81AKdIpzeLLSjSMmO5yoKqc58Yn3cxmteylT6Elba3FgAHjK1OthARRXz5JXaKKRB7g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.5.tgz", + "integrity": "sha512-n0c2AXz+kjALY2FQr7Zy9zhYigXzboIh1AuUUVCqFBKFtdEvTwnwPXrTDoEehLiRTUHNL+4yzZ3s+D0kKYSLSg==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-config-provider": "^2.0.0", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" @@ -1494,14 +1503,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.4.tgz", - "integrity": "sha512-vW7xoDKZwjjf/2GCwVf/uvZce/QJOAYan9r8UsqlzOrnnpeS2ffhxeZjLK0/emZu8n6qU3amGgZ/BTo3oVtEyQ==", - "dependencies": { - "@smithy/node-config-provider": "^2.0.4", - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", - "@smithy/url-parser": "^2.0.4", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.5.tgz", + "integrity": "sha512-KFcf/e0meFkQNyteJ65f1G19sgUEY1e5zL7hyAEUPz2SEfBmC9B37WyRq87G3MEEsvmAWwCRu7nFFYUKtR3svQ==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.5", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "tslib": "^2.5.0" }, "engines": { @@ -1509,34 +1518,34 @@ } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.4.tgz", - "integrity": "sha512-DkVLcQjhOxPj/4pf2hNj2kvOeoLczirHe57g7czMNJCUBvg9cpU9hNgqS37Y5sjdEtMSa2oTyCS5oeHZtKgoIw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.5.tgz", + "integrity": "sha512-iqR6OuOV3zbQK8uVs9o+9AxhVk8kW9NAxA71nugwUB+kTY9C35pUd0A5/m4PRT0Y0oIW7W4kgnSR3fdYXQjECw==", "dependencies": { "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-hex-encoding": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/fetch-http-handler": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.4.tgz", - "integrity": "sha512-1dwR8T+QMe5Gs60NpZgF7ReZp0SXz1O/aX5BdDhsOJh72fi3Bx2UZlDihCdb++9vPyBRMXFRF7I8/C4x8iIm8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.5.tgz", + "integrity": "sha512-EzFoMowdBNy1VqtvkiXgPFEdosIAt4/4bgZ8uiDiUyfhmNXq/3bV+CagPFFBsgFOR/X2XK4zFZHRsoa7PNHVVg==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", - "@smithy/querystring-builder": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/protocol-http": "^2.0.5", + "@smithy/querystring-builder": "^2.0.5", + "@smithy/types": "^2.2.2", "@smithy/util-base64": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.4.tgz", - "integrity": "sha512-vZ6a/fvEAFJKNtxJsn0I2WM8uBdypLLhLTpP4BA6fRsBAtwIl5S4wTt0Hspy6uGNn/74LmCxGmFSTMMbSd7ZDA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.5.tgz", + "integrity": "sha512-mk551hIywBITT+kXruRNXk7f8Fy7DTzBjZJSr/V6nolYKmUHIG3w5QU6nO9qPYEQGKc/yEPtkpdS28ndeG93lA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -1546,11 +1555,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.4.tgz", - "integrity": "sha512-zfbPPZFiZvhIXJYKlzQwDUnxmWK/SmyDcM6iQJRZHU2jQZAzhHUXFGIu2lKH9L02VUqysOgQi3S/HY4fhrVT8w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.5.tgz", + "integrity": "sha512-0wEi+JT0hM+UUwrJVYbqjuGFhy5agY/zXyiN7BNAJ1XoCDjU5uaNSj8ekPWsXd/d4yM6NSe8UbPd8cOc1+3oBQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" } }, @@ -1566,12 +1575,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.4.tgz", - "integrity": "sha512-Pdd+fhRbvizqsgYJ0pLWE6hjhq42wDFWzMj/1T7mEY9tG9bP6/AcdsQK8SAOckrBLURDoeSqTAwPKalsgcZBxw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.5.tgz", + "integrity": "sha512-E7VwV5H02fgZIUGRli4GevBCAPvkyEI/fgl9SU47nPPi3DAAX3nEtUb8xfGbXjOcJ5BdSUoWWZn42tEd/blOqA==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1579,13 +1588,13 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.4.tgz", - "integrity": "sha512-aLPqkqKjZQ1V718P0Ostpp53nWfwK32uD0HFKSAOT25RvL285dqzGl0PAKDXpyLsPsPmHe0Yrg0AUFkRv4CRbQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.5.tgz", + "integrity": "sha512-tyzDuoNTbsMQCq5Xkc4QOt6e2GACUllQIV8SQ5fc59FtOIV9/vbf58/GxVjZm2o8+MMbdDBANjTDZe/ijZKfyA==", "dependencies": { - "@smithy/middleware-serde": "^2.0.4", - "@smithy/types": "^2.2.1", - "@smithy/url-parser": "^2.0.4", + "@smithy/middleware-serde": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" }, @@ -1594,13 +1603,13 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.4.tgz", - "integrity": "sha512-stozO6NgH9W/OSfFMOJEtlJCsnJFSoGyV4LHzIVQeXTzZ2RHjmytQ/Ez7GngHGZ1YsB4zxE1qDTXAU0AlaKf2w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.5.tgz", + "integrity": "sha512-ulIfbFyzQTVnJbLjUl1CTSi0etg6tej/ekwaLp0Gn8ybUkDkKYa+uB6CF/m2J5B6meRwyJlsryR+DjaOVyiicg==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", + "@smithy/protocol-http": "^2.0.5", "@smithy/service-error-classification": "^2.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-middleware": "^2.0.0", "@smithy/util-retry": "^2.0.0", "tslib": "^2.5.0", @@ -1611,11 +1620,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.4.tgz", - "integrity": "sha512-oDttJMMES7yXmopjQHnqTkxu8vZOdjB9VpSj94Ff4/GXdKQH7ozKLNIPq4C568nbeQbBt/gsLb6Ttbx1+j+JPQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.5.tgz", + "integrity": "sha512-in0AA5sous74dOfTGU9rMJBXJ0bDVNxwdXtEt5lh3FVd2sEyjhI+rqpLLRF1E4ixbw3RSEf80hfRpcPdjg4vvQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1634,13 +1643,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.4.tgz", - "integrity": "sha512-s9O90cEhkpzZulvdHBBaroZ6AJ5uV6qtmycgYKP1yOCSfPHGIWYwaULdbfxraUsvzCcnMosDNkfckqXYoKI6jw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.5.tgz", + "integrity": "sha512-LRtjV9WkhONe2lVy+ipB/l1GX60ybzBmFyeRUoLUXWKdnZ3o81jsnbKzMK8hKq8eFSWPk+Lmyx6ZzCQabGeLxg==", "dependencies": { - "@smithy/property-provider": "^2.0.4", - "@smithy/shared-ini-file-loader": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/property-provider": "^2.0.5", + "@smithy/shared-ini-file-loader": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1648,14 +1657,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.4.tgz", - "integrity": "sha512-svqeqkGgQz1B2m3IurHtp1O8vfuUGbqw6vynFmOrvPirRdiIPukHTZW1GN/JuBCtDpq9mNPutSVipfz2n4sZbQ==", - "dependencies": { - "@smithy/abort-controller": "^2.0.4", - "@smithy/protocol-http": "^2.0.4", - "@smithy/querystring-builder": "^2.0.4", - "@smithy/types": "^2.2.1", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.5.tgz", + "integrity": "sha512-lZm5DZf4b3V0saUw9WTC4/du887P6cy2fUyQgQQKRRV6OseButyD5yTzeMmXE53CaXJBMBsUvvIQ0hRVxIq56w==", + "dependencies": { + "@smithy/abort-controller": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/querystring-builder": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1663,11 +1672,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.4.tgz", - "integrity": "sha512-OfaUIhnyvOkuCPHWMPkJqX++dUaDKsiZWuZqCdU04Z9dNAl2TtZAh7dw2rsZGb57vq6YH3PierNrDfQJTAKYtg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.5.tgz", + "integrity": "sha512-cAFSUhX6aiHcmpWfrCLKvwBtgN1F6A0N8qY/8yeSi0LRLmhGqsY1/YTxFE185MCVzYbqBGXVr9TBv4RUcIV4rA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1675,11 +1684,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.4.tgz", - "integrity": "sha512-I1vCZ/m1U424gA9TXkL/pJ3HlRfujY8+Oj3GfDWcrNiWVmAeyx3CTvXw+yMHp2X01BOOu5fnyAa6JwAn1O+txA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.5.tgz", + "integrity": "sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1687,11 +1696,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.4.tgz", - "integrity": "sha512-Jc7UPx1pNeisYcABkoo2Pn4kvomy1UI7uxv7R+1W3806KMAKgYHutWmZG01aPHu2XH0zY2RF2KfGiuialsxHvA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.5.tgz", + "integrity": "sha512-4DCX9krxLzATj+HdFPC3i8pb7XTAWzzKqSw8aTZMjXjtQY+vhe4azMAqIvbb6g7JKwIkmkRAjK6EXO3YWSnJVQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-uri-escape": "^2.0.0", "tslib": "^2.5.0" }, @@ -1700,11 +1709,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.4.tgz", - "integrity": "sha512-Uh6+PhGxSo17qe2g/JlyoekvTHKn7dYWfmHqUzPAvkW+dHlc3DNVG3++PV48z33lCo5YDVBBturWQ9N/TKn+EA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.5.tgz", + "integrity": "sha512-C2stCULH0r54KBksv3AWcN8CLS3u9+WsEW8nBrvctrJ5rQTNa1waHkffpVaiKvcW2nP0aIMBPCobD/kYf/q9mA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1720,11 +1729,11 @@ } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.4.tgz", - "integrity": "sha512-091yneupXnSqvAU+vLG7h0g4QRRO6TjulpECXYVU6yW/LiNp7QE533DBpaphmbtI6tTC4EfGrhn35gTa0w+GQg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.5.tgz", + "integrity": "sha512-Mvtk6FwMtfbKRC4YuSsIqRYp9WTxsSUJVVo2djgyhcacKGMqicHDWSAmgy3sDrKv+G/G6xTZCPwm6pJARtdxVg==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1732,13 +1741,13 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.4.tgz", - "integrity": "sha512-y2xblkS0hb44QJDn9YjPp5aRFYSiI7w0bI3tATE3ybOrII2fppqD0SE3zgvew/B/3rTunuiCW+frTD0W4UYb9Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.5.tgz", + "integrity": "sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.4", + "@smithy/eventstream-codec": "^2.0.5", "@smithy/is-array-buffer": "^2.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-hex-encoding": "^2.0.0", "@smithy/util-middleware": "^2.0.0", "@smithy/util-uri-escape": "^2.0.0", @@ -1750,13 +1759,13 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.4.tgz", - "integrity": "sha512-Dg1dkqyj3jwa03RFs6E4ASmfQ7CjplbGISJIJNSt3F8NfIid2RalbeCMOIHK7VagKh9qngZNyoKxObZC9LB9Lg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.5.tgz", + "integrity": "sha512-kCTFr8wfOAWKDzGvfBElc6shHigWtHNhMQ1IbosjC4jOlayFyZMSs2PysKB+Ox/dhQ41KqOzgVjgiQ+PyWqHMQ==", "dependencies": { "@smithy/middleware-stack": "^2.0.0", - "@smithy/types": "^2.2.1", - "@smithy/util-stream": "^2.0.4", + "@smithy/types": "^2.2.2", + "@smithy/util-stream": "^2.0.5", "tslib": "^2.5.0" }, "engines": { @@ -1764,9 +1773,9 @@ } }, "node_modules/@smithy/types": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.1.tgz", - "integrity": "sha512-6nyDOf027ZeJiQVm6PXmLm7dR+hR2YJUkr4VwUniXA8xZUGAu5Mk0zfx2BPFrt+e5YauvlIqQoH0CsrM4tLkfg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.2.tgz", + "integrity": "sha512-4PS0y1VxDnELGHGgBWlDksB2LJK8TG8lcvlWxIsgR+8vROI7Ms8h1P4FQUx+ftAX2QZv5g1CJCdhdRmQKyonyw==", "dependencies": { "tslib": "^2.5.0" }, @@ -1775,12 +1784,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.4.tgz", - "integrity": "sha512-puIQ6+TJpI2AAPw7IGdGG6d2DEcVP5nJqa1VjrxzUcy2Jx7LtGn+gDHY2o9Pc9vQkmoicovTEKgvv7CdqP+0gg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.5.tgz", + "integrity": "sha512-OdMBvZhpckQSkugCXNJQCvqJ71wE7Ftxce92UOQLQ9pwF6hoS5PLL7wEfpnuEXtStzBqJYkzu1C1ZfjuFGOXAA==", "dependencies": { - "@smithy/querystring-parser": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/querystring-parser": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" } }, @@ -1805,9 +1814,9 @@ } }, "node_modules/@smithy/util-body-length-node": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.0.0.tgz", - "integrity": "sha512-ZV7Z/WHTMxHJe/xL/56qZwSUcl63/5aaPAGjkfynJm4poILjdD4GmFI+V+YWabh2WJIjwTKZ5PNsuvPQKt93Mg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", "dependencies": { "tslib": "^2.5.0" }, @@ -1839,12 +1848,12 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.4.tgz", - "integrity": "sha512-wGdnPt4Ng72duUd97HrlqVkq6DKVB/yjaGkSg5n3uuQKzzHjoi3OdjXGumD/VYPHz0dYd7wpLNG2CnMm/nfDrg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.5.tgz", + "integrity": "sha512-yciP6TPttLsj731aHTvekgyuCGXQrEAJibEwEWAh3kzaDsfGAVCuZSBlyvC2Dl3TZmHKCOQwHV8mIE7KQCTPuQ==", "dependencies": { - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "bowser": "^2.11.0", "tslib": "^2.5.0" }, @@ -1853,15 +1862,15 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.4.tgz", - "integrity": "sha512-QMkNcV6x52BeeeIvhvow6UmOu7nP7DXQljY6DKOP/aAokrli53IWTP/kUTd9B0Mp9tbW3WC10O6zaM69xiMNYw==", - "dependencies": { - "@smithy/config-resolver": "^2.0.4", - "@smithy/credential-provider-imds": "^2.0.4", - "@smithy/node-config-provider": "^2.0.4", - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.5.tgz", + "integrity": "sha512-M07t99rWasXt+IaDZDyP3BkcoEm/mgIE1RIMASrE49LKSNxaVN7PVcgGc77+4uu2kzBAyqJKy79pgtezuknyjQ==", + "dependencies": { + "@smithy/config-resolver": "^2.0.5", + "@smithy/credential-provider-imds": "^2.0.5", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1903,13 +1912,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.4.tgz", - "integrity": "sha512-ZVje79afuv3DB1Ma/g5m/5v9Zda8nA0xNgvE1pOD3EnoTp/Ekch1z20AN6gfVsf7JYWK2VSMVDiqI9N8Ua4wbg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.5.tgz", + "integrity": "sha512-ylx27GwI05xLpYQ4hDIfS15vm+wYjNN0Sc2P0FxuzgRe8v0BOLHppGIQ+Bezcynk8C9nUzsUue3TmtRhjut43g==", "dependencies": { - "@smithy/fetch-http-handler": "^2.0.4", - "@smithy/node-http-handler": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/types": "^2.2.2", "@smithy/util-base64": "^2.0.0", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-hex-encoding": "^2.0.0", @@ -1986,9 +1995,9 @@ "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==" }, "node_modules/@types/node": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz", - "integrity": "sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==" + "version": "20.5.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.6.tgz", + "integrity": "sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ==" }, "node_modules/@types/sinon": { "version": "10.0.16", @@ -2459,9 +2468,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001521", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001521.tgz", - "integrity": "sha512-fnx1grfpEOvDGH+V17eccmNjucGUnCbP6KL+l5KqBIerp26WK/+RQ7CIDE37KGJjaPyqWXXlFUyKiWmvdNNKmQ==", + "version": "1.0.30001523", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001523.tgz", + "integrity": "sha512-I5q5cisATTPZ1mc588Z//pj/Ox80ERYDfR71YnvY7raS/NOk8xXlZcB0sF7JdqaV//kOaa6aus7lRfpdnt1eBA==", "funding": [ { "type": "opencollective", @@ -2751,9 +2760,9 @@ "peer": true }, "node_modules/electron-to-chromium": { - "version": "1.4.494", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.494.tgz", - "integrity": "sha512-KF7wtsFFDu4ws1ZsSOt4pdmO1yWVNWCFtijVYZPUeW4SV7/hy/AESjLn/+qIWgq7mHscNOKAwN5AIM1+YAy+Ww==" + "version": "1.4.502", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.502.tgz", + "integrity": "sha512-xqeGw3Gr6o3uyHy/yKjdnDQHY2RQvXcGC2cfHjccK1IGkH6cX1WQBN8EeC/YpwPhGkBaikDTecJ8+ssxSVRQlw==" }, "node_modules/emphasize": { "version": "4.2.0", @@ -3786,9 +3795,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.7.0.tgz", - "integrity": "sha512-zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz", + "integrity": "sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==", "dependencies": { "bson": "^5.4.0", "mongodb-connection-string-url": "^2.6.0", @@ -3798,12 +3807,12 @@ "node": ">=14.20.1" }, "optionalDependencies": { - "saslprep": "^1.0.3" + "@mongodb-js/saslprep": "^1.1.0" }, "peerDependencies": { - "@aws-sdk/credential-providers": "^3.201.0", - "@mongodb-js/zstd": "^1.1.0", - "kerberos": "^2.0.1", + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.0.0", + "kerberos": "^1.0.0 || ^2.0.0", "mongodb-client-encryption": ">=2.3.0 <3", "snappy": "^7.2.2" }, @@ -3954,9 +3963,9 @@ "optional": true }, "node_modules/node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4895,9 +4904,9 @@ } }, "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -4925,9 +4934,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/nixpkgs/pkgs/development/tools/mongosh/source.json b/nixpkgs/pkgs/development/tools/mongosh/source.json index 4ae0b069de68..5555d11e8028 100644 --- a/nixpkgs/pkgs/development/tools/mongosh/source.json +++ b/nixpkgs/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "1.10.5", - "integrity": "sha512-OAaUQv9dw/2p7Q8qIlUm8Ckv0UGFIPKHD09ApNcGU1bI3E6rGGhIMcpG8rcmdyV59mbtzoV4IeGkHbqX0KhGaw==", - "filename": "mongosh-1.10.5.tgz", - "deps": "sha256-P4JT4j2JiCIpHBODpXHcyLWd5VnOK0wXBkxtcAh2g4w=" + "version": "1.10.6", + "integrity": "sha512-rReUz89EF5eERhPZo29nYpKAux1u5iK3ug74wtsr7kE9SOJs5XGWS2gh8LKSMK9uieeDKRYX8+nFIa4bl1Ls2Q==", + "filename": "mongosh-1.10.6.tgz", + "deps": "sha256-j1l6PVPkp5Ju0uBB6dKfQP8fbwttWpPR3VPviu4a/Zg=" } diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index a09f226b3f13..02355cb9846c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper , rresult, bos, ocaml_pcre, re, camlp-streams +, legacy ? false }: if lib.versionOlder ocaml.version "4.02" @@ -7,7 +8,7 @@ then throw "camlp5 is not available for OCaml ${ocaml.version}" else let params = - if lib.versionAtLeast ocaml.version "4.12" + if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { version = "8.00.05"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix index 0a5d317cbcec..6cd8154877eb 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,7 +15,7 @@ }: let - merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.10" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -24,6 +24,8 @@ let "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0="; "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; + "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; + "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; }; ocamlVersionShorthand = lib.substring 0 3 diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index b212fffc1b1c..176881caeed1 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -2505,8 +2505,14 @@ "setuptools" ], "build": [ - "flit-core", - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.10.0" + }, + { + "buildSystem": "flit-core", + "from": "0.10.0" + } ], "buildbot": [ "setuptools" @@ -5812,11 +5818,7 @@ "setuptools" ], "flit": [ - "flit-core", - "setuptools" - ], - "flit-core": [ - "setuptools" + "flit-core" ], "flit-scm": [ "flit-core", @@ -7540,8 +7542,7 @@ "setuptools" ], "installer": [ - "flit-core", - "setuptools" + "flit-core" ], "insteon-frontend-home-assistant": [ "setuptools" @@ -10863,8 +10864,24 @@ "setuptools" ], "packaging": [ - "flit-core", - "setuptools" + { + "buildSystem": "setuptools", + "until": "20.4" + }, + { + "buildSystem": "flit-core", + "from": "20.4", + "until": "20.8" + }, + { + "buildSystem": "setuptools", + "from": "20.8", + "until": "22.0" + }, + { + "buildSystem": "flit-core", + "from": "22.0" + } ], "packbits": [ "setuptools" @@ -18088,8 +18105,14 @@ "poetry" ], "tomli": [ - "flit-core", - "setuptools" + { + "buildSystem": "poetry-core", + "until": "1.0.2" + }, + { + "buildSystem": "flit-core", + "from": "1.0.2" + } ], "tomli-w": [ "flit-core", @@ -19331,7 +19354,14 @@ "setuptools" ], "wheel": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.40.0" + }, + { + "buildSystem": "flit-core", + "from": "0.40.0" + } ], "wheel-filename": [ "setuptools" diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 14338423ec39..d96d920c7094 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -2738,15 +2738,12 @@ lib.composeManyExtensions [ } ); - wheel = (( - pkgs.python3.pkgs.override { - python = self.python; + wheel = if self.python.isPy2 then + super.wheel.override { + inherit (self) bootstrapped-pip; } - ).wheel.override { - inherit (self) buildPythonPackage bootstrapped-pip setuptools; - }).overrideAttrs (old: { - inherit (super.wheel) pname name version src; - }); + else + super.wheel; zipp = if super.zipp == null then null else super.zipp.overridePythonAttrs ( @@ -2757,20 +2754,6 @@ lib.composeManyExtensions [ } ); - packaging = - let - old = super.packaging; - in - # From 20.5 until 20.7, packaging used flit for packaging (heh) - # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 - if (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") then - addBuildSystem - { - inherit self; - drv = old; - attr = "flit-core"; - } else old; - psutil = super.psutil.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index 123573401dae..0147913cca63 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { - owner = "bufbuild"; + owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-2U5f+VUXZ8J9K27RccKvEY7FJs57XMasKMk+xgy0LuI="; + hash = "sha256-sKAocI2zT2jbw42Oe7lX8J1wLVBh7RfJe1hP8aXRCuM="; }; vendorHash = "sha256-3opkr4kUD3NQNbNYOdSWIDqKbArv9OQUkBMzae1ccVY="; @@ -20,11 +20,16 @@ buildGoModule rec { "cmd/protoc-gen-connect-go" ]; + preCheck = '' + # test all paths + unset subPackages + ''; + meta = with lib; { - description = "library for building browser and gRPC-compatible HTTP APIs"; - homepage = "https://github.com/bufbuild/connect-go"; - changelog = "https://github.com/bufbuild/connect-go/releases/tag/v${version}"; + description = "Simple, reliable, interoperable, better gRPC"; + homepage = "https://github.com/connectrpc/connect-go"; + changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ kilimnik ]; + maintainers = with maintainers; [ kilimnik jk ]; }; } diff --git a/nixpkgs/pkgs/development/tools/pyenv/default.nix b/nixpkgs/pkgs/development/tools/pyenv/default.nix index 83e5a6b667b7..a60ca4eda3f3 100644 --- a/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.24"; + version = "2.3.25"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-hIScCDm15voOamgiRrgn303x2JsWXIF6Oe5PqGUGJQI="; + hash = "sha256-804bLieYrfwzUrKSvZtC6Td4+fFPw1WrhV1NE4n49Rw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 66de800f6ed1..9c5ca6a16a32 100644 --- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { advanced code editor, a visual debugger and a GUI designer. ''; homepage = "https://wiki.qt.io/Qt_Creator"; - license = licenses.lgpl3Plus; + license = licenses.gpl3Only; # annotated with The Qt Company GPL Exception 1.0 maintainers = [ maintainers.rewine ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/tools/ruff/Cargo.lock b/nixpkgs/pkgs/development/tools/ruff/Cargo.lock index 67c2d0db0b84..261438324222 100644 --- a/nixpkgs/pkgs/development/tools/ruff/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/ruff/Cargo.lock @@ -812,7 +812,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.285" +version = "0.0.286" dependencies = [ "anyhow", "clap", @@ -876,8 +876,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2064,7 +2066,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.285" +version = "0.0.286" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2128,6 +2130,7 @@ dependencies = [ "typed-arena", "unicode-width", "unicode_names2", + "uuid", "wsl", ] @@ -2164,7 +2167,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.285" +version = "0.0.286" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2340,6 +2343,7 @@ dependencies = [ "insta", "is-macro", "itertools", + "memchr", "once_cell", "ruff_formatter", "ruff_python_ast", @@ -2399,6 +2403,7 @@ dependencies = [ "ruff_text_size", "rustc-hash", "static_assertions", + "test-case", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -3344,9 +3349,26 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", + "wasm-bindgen", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] [[package]] name = "valuable" diff --git a/nixpkgs/pkgs/development/tools/ruff/default.nix b/nixpkgs/pkgs/development/tools/ruff/default.nix index e1e39f1bfbdb..fc5520be15b8 100644 --- a/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.285"; + version = "0.0.286"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-n5FjzngdVSHHnBpVGFXzPlUAEMx96JqjYqgKwymTMzA="; + hash = "sha256-5bMfOju1uJV4+a4UTzaanpzU6PjCSK9HHMdhvKVaNcg="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index 1d53e3724b69..0868e2f7d55f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-xqY1C3ZPGY9GeyuSgV0s4+eSkm4r+jOQkNgSzqE2QUI="; + hash = "sha256-uT8nSsC8QstjbyO5Ve2jSug3Bd/DuUNoGzquDPVl++o="; }; - cargoHash = "sha256-yAda80b62WGYuKo5YtCLRtx08fmNs5HLDcNWhq+FG/I="; + cargoHash = "sha256-rxQKU73ANokxLb42u3Zom+5Wbv/ayiQJaM9NsTWW8fU="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix index f29d9aba8294..73924d1c599a 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage { pname = "cargo-bundle"; # the latest stable release fails to build on darwin - version = "unstable-2023-03-17"; + version = "unstable-2023-08-18"; src = fetchFromGitHub { owner = "burtonageo"; repo = "cargo-bundle"; - rev = "eb9fe1b0880c7c0e929a93edaddcb0a61cd3f0d4"; - hash = "sha256-alO+Q9IK5Hz09+TqHWsbjuokxISKQfQTM6QnLlUNydw="; + rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43"; + hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; }; - cargoHash = "sha256-h+QPbwYTJk6dieta/Q+VAhYe8/YH/Nik6gslzUn0YxI="; + cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock index bb7d4a06c01f..e7264f5d7f4c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -568,9 +568,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -769,9 +769,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" dependencies = [ "serde", ] @@ -1163,9 +1163,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2006,12 +2006,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -2373,9 +2373,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -2586,18 +2586,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", @@ -2659,9 +2659,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ "base64 0.21.2", "chrono", @@ -2676,9 +2676,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", @@ -2848,9 +2848,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", @@ -3171,9 +3171,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -3533,9 +3533,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -3723,11 +3723,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys", ] [[package]] @@ -3766,8 +3767,7 @@ dependencies = [ [[package]] name = "wit-bindgen" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86fe4c862e5d3d06d65ff0e9b5da8e84217af535bca6fc3acffed9eff0f5c2" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "bitflags 2.4.0", "wit-bindgen-rust-macro", @@ -3776,8 +3776,7 @@ dependencies = [ [[package]] name = "wit-bindgen-core" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed17e12f4277a1de3a33ef68e4934bd10a9c295053f4de803b5c0ba856b4c08" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "wit-component", @@ -3787,8 +3786,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6a165d93a825badf9c2db8c4033d76455807a4ab5f6890ccd01936d16b20ed" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "heck", @@ -3801,8 +3799,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-lib" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e00b553c5b5fcdabe295cb1cdb369f76f72e8c626be1930e99bb01a4e7f4dc" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "heck", "wit-bindgen-core", @@ -3811,8 +3808,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d49b81b63fa30c3b13a559cd89dc3a721ccd94736a0b375cae718da5995d64" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "proc-macro2", diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index 3fa4f826618a..4942045a4934 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,19 +9,20 @@ rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-08-19"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "4abbb89ed356887a5b7e822c507cc1d02cbe8935"; - hash = "sha256-MZQcyK8AN/TRplTNuPkNMFFdJIlWxHEB4W6z5PnFDxw="; + rev = "a4ee64625a5248234397a9c7c2a7513bb025b030"; + hash = "sha256-7fnzIzWb2f1tJfH3mLMesQtNCy4Zg7I/T+lGiorifY8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc="; + "wit-bindgen-0.10.0" = "sha256-/QZIIbUzDFUb5wAGoKFg1BbgNUEmP06ZJKVzhwlPecE="; }; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix index 1c9e073ecdd7..47e62a2c366b 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-yuBf6WgY+sGk7Y5/gZFHeawbHhsVIxabFlpiL4AUzK8="; + hash = "sha256-uHkmwmEVV3+VPvp5WIc+PbwYvhYZHStiMun1yguPelw="; }; - cargoHash = "sha256-vfpSMa3NO95SPU4jSW1qKMUy4EGZloYNC3SyGwlTGC0="; + cargoHash = "sha256-8bgb8CCkoqECyd9CW2OkPQmhqfiIOuelsXhOcm1d9kQ="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock index 63d3e165df5c..86da7d6071e9 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock @@ -10,48 +10,53 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.1" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "memchr", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 1.0.2", + "colorchoice", + "is-terminal", + "utf8parse", ] [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", - "anstyle-wincon", + "anstyle-wincon 2.1.0", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -62,32 +67,42 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "bstr", "doc-comment", @@ -103,7 +118,7 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "doc-comment", "globwalk", @@ -138,9 +153,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -155,6 +170,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -165,12 +186,11 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -189,16 +209,16 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-edit" -version = "0.12.0" +version = "0.12.1" dependencies = [ "anyhow", "assert_cmd", @@ -214,7 +234,7 @@ dependencies = [ "git2", "hex", "home", - "indexmap", + "indexmap 1.9.3", "native-tls", "pathdiff", "predicates", @@ -235,9 +255,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] @@ -245,12 +265,12 @@ dependencies = [ [[package]] name = "cargo-test-macro" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" [[package]] name = "cargo-test-support" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" dependencies = [ "anyhow", "cargo-test-macro", @@ -271,13 +291,13 @@ dependencies = [ "time", "toml", "url", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "cargo-util" -version = "0.2.4" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +version = "0.2.7" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" dependencies = [ "anyhow", "core-foundation", @@ -285,14 +305,14 @@ dependencies = [ "hex", "jobserver", "libc", - "log", "miow", "same-file", "sha2", "shell-escape", "tempfile", + "tracing", "walkdir", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -311,11 +331,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -326,9 +347,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -337,13 +358,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ - "anstream", + "anstream 0.5.0", "anstyle", - "bitflags", "clap_lex", "strsim", "terminal_size", @@ -351,9 +371,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", @@ -363,9 +383,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -380,7 +400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "concolor-query", ] @@ -392,9 +412,9 @@ checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7" [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "content_inspector" @@ -423,24 +443,23 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "crates-index" -version = "0.19.10" +version = "0.19.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65aa5fcd68f892b56202f15a18a53308b2d489b728958dbce48d2d1f3bbaa685" +checksum = "c3cab38e209d6ba8bd5b0d41c784ec63a5a9ea3adf866b820d377588960f1ded" dependencies = [ "git2", "hex", "home", "memchr", - "num_cpus", "rayon", "rustc-hash", "semver", @@ -453,14 +472,14 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.36.1" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +version = "0.39.0" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" dependencies = [ - "anyhow", "curl", "percent-encoding", "serde", "serde_json", + "thiserror", "url", ] @@ -496,9 +515,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -509,18 +528,18 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "crypto-bigint" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array", "rand_core", @@ -561,9 +580,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.61+curl-8.0.1" +version = "0.4.65+curl-8.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" +checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" dependencies = [ "cc", "libc", @@ -576,9 +595,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b14af2045fa69ed2b7a48934bebb842d0f33e73e96e78766ecb14bb5347a11" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468", @@ -586,6 +605,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] name = "difflib" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -617,15 +645,16 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" -version = "0.16.6" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a48e5d537b8a30c0b023116d981b16334be1485af7ca68db3a2b7024cbc957fd" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der", "digest", "elliptic-curve", "rfc6979", "signature", + "spki", ] [[package]] @@ -639,15 +668,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct", "crypto-bigint", @@ -675,14 +704,20 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -697,12 +732,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "ff" @@ -722,21 +754,21 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", @@ -775,9 +807,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -795,9 +827,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -808,11 +840,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -829,11 +861,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -846,7 +878,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -869,6 +901,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -885,18 +923,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -931,7 +960,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -952,9 +981,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -984,39 +1013,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] -name = "instant" -version = "0.1.12" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "cfg-if", + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "hermit-abi 0.3.2", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1030,9 +1059,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -1045,9 +1074,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1060,15 +1089,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" -version = "0.15.1+1.6.4" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -1094,9 +1123,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1111,13 +1140,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -1127,9 +1159,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1145,11 +1177,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1178,36 +1210,36 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1235,18 +1267,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.3+1.1.1t" +version = "111.27.0+1.1.1v" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c" +checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -1257,9 +1289,9 @@ dependencies = [ [[package]] name = "orion" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe74a766292f94f7e69db5a7bf010eadd944f24186c463fe578a7e637582066" +checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" dependencies = [ "fiat-crypto", "subtle", @@ -1273,7 +1305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1290,9 +1322,9 @@ dependencies = [ [[package]] name = "pasetors" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824bf633b85dc1dece2eb07161627ba5d90a951597cd5dbf8d85f4d82b7aea69" +checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" dependencies = [ "ct-codecs", "ed25519-compact", @@ -1326,9 +1358,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkcs8" @@ -1369,9 +1407,9 @@ checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfd78a1cd6926a74e7f263eb466b765c79409b176be05c3676fac27df378e96" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -1379,27 +1417,27 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8d3875361e28f7753baefef104386e7aa47642c93023356d97fdef4003bfb5" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" dependencies = [ "elliptic-curve", ] [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1437,44 +1475,41 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rfc6979" @@ -1509,35 +1544,68 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", + "rustls-webpki 0.101.4", "sct", - "webpki", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -1550,18 +1618,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -1575,9 +1643,9 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -1589,11 +1657,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1602,9 +1670,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1612,27 +1680,27 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -1641,9 +1709,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -1652,18 +1720,18 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1709,11 +1777,11 @@ dependencies = [ [[package]] name = "snapbox" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835" +checksum = "ad90eb3a2e3a8031d636d45bd4832751aefd58a291b553f7305a2bacae21aff3" dependencies = [ - "anstream", + "anstream 0.5.0", "anstyle", "content_inspector", "dunce", @@ -1726,16 +1794,16 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "snapbox-macros" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31" +checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" dependencies = [ - "anstream", + "anstream 0.5.0", ] [[package]] @@ -1767,9 +1835,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", "der", @@ -1793,15 +1861,15 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.16" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1810,9 +1878,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -1820,15 +1888,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "redox_syscall", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1846,8 +1914,8 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", - "windows-sys 0.48.0", + "rustix 0.37.23", + "windows-sys", ] [[package]] @@ -1858,18 +1926,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", @@ -1888,10 +1956,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -1906,9 +1975,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -1930,9 +1999,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -1942,20 +2011,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.9" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -1963,10 +2032,42 @@ dependencies = [ ] [[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] name = "trycmd" -version = "0.14.16" +version = "0.14.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2925e71868a12b173c1eb166018c2d2f9dfaedfcaec747bdb6ea2246785d258e" +checksum = "bc6a42f89ccf3c6ee115608a68e256c172734d525a4ac36d4a17a6d4a8108149" dependencies = [ "glob", "humantime", @@ -1992,9 +2093,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2013,28 +2114,28 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.6.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ "base64", "log", "native-tls", "once_cell", "rustls", + "rustls-webpki 0.100.2", "serde", "serde_json", "socks", "url", - "webpki", "webpki-roots", ] [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -2086,9 +2187,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2096,9 +2197,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -2111,9 +2212,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2121,9 +2222,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -2134,37 +2235,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki 0.100.2", ] [[package]] @@ -2200,156 +2291,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix index 7185d5e7cb9d..da19ac8c9d20 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-OUo007XP2B9F8ACTauiA6uls9b3KS5iq15bJDPYCONU="; + hash = "sha256-YKWJR3JgvLd43BpGHrmG3eFj9eRhwGm2e5sfrHdF90U="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-hzoQmgvAerIoz7qoT3iyY6kHnt3g1Pv4FaJoqQYU2zE="; + "cargo-test-macro-0.1.0" = "sha256-yE8BJMTRBT3P29t5ygMCybs0CYDcFLVlxi1L0LkBV9Q="; }; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 4c1399b5ff44..4227243be4f2 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.64"; + version = "1.0.65"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-8DBkF2JRrsrZTW6gNBiUyVpwFvOpoZnm2vsR4O/6c6c="; + sha256 = "sha256-fPrke89Nlr9Yj0bkB6HTwMymQsjAQ+5+o7iVPGH7Tyc="; }; - cargoHash = "sha256-r5qRxc8Jt5OBWCiBhFs8zPoxbuercsQ7gw5FfOKH3ow="; + cargoHash = "sha256-Q7nBKdwZlL/HleuiniuvErGF6Avf58xR++cJ7PP8RME="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix index dda30de0d2fa..95eb36a70dc1 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.29"; + version = "0.6.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Z3UExZghVw7Pbgh5nHuiC8cFVefBE0yZ2k5laam8myY="; + sha256 = "sha256-kb4ftO4nhQ+MykK18O5aoexuBoN+u0xobUvIEge00jU="; }; - cargoSha256 = "sha256-5X3MX2KV87mOcN/cL/lFU9K9/j04zn5C7teIXFqj7Wk="; + cargoSha256 = "sha256-+Am9w3iU2kSAIx+1tK3kpoa+oJvLQ6Ew7LeP6njYEQw="; # some necessary files are absent in the crate version doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 13536298e112..88b2f2e24406 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.30"; + version = "0.5.31"; src = fetchCrate { inherit pname version; - sha256 = "sha256-35tpMLVBLwm1aEqznUniv7J/D77CosllpgpeYsglvcs="; + sha256 = "sha256-HjnP9H1t660PJ5eXzgAhrdDEgqdzzb+9Dbk5RGUPjaQ="; }; - cargoSha256 = "sha256-7E6Biveh+fBEtQhJW346Pakimc0tTacHcSvKSJusyFs="; + cargoSha256 = "sha256-p6zpRRNX4g+jESNSwouWMjZlFhTBFJhe7LirYtFrZ1g="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index 913755b64812..af5937e328d0 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.31.3"; + version = "0.32.0"; src = fetchCrate { inherit pname version; - hash = "sha256-oSjfNbId5jEHeLiJ3FMoNqwLZg6iyr3ZqpcfKvEnpac="; + hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo="; }; - cargoHash = "sha256-VHHEQafQfRqmdscuWpN+NdcfEc1sTt+lKLg26aM9QQE="; + cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix new file mode 100644 index 000000000000..dca10dc1c42a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-run-bin"; + version = "1.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YCWjdY8feiqU4/bOn19qbY8YiKa3SvFImvH0wDKXOhI="; + }; + + cargoSha256 = "sha256-mNJZjEkuUwo/aqyotqjNj+P50dFFGaJnLQ2CyCYg/1Y="; + + # multiple impurities in tests + doCheck = false; + + meta = with lib; { + description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions"; + homepage = "https://github.com/dustinblackman/cargo-run-bin"; + changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mightyiam matthiasbeyer ]; + }; +} + diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index b8653c5cbfb0..3521b27b18f3 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "anymap2" @@ -245,9 +245,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -292,18 +292,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -642,9 +642,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.19" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -670,7 +670,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.0", "tower", "tower-layer", "tower-service", @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebbcd90f811f93fc2a993024caecc1e8270d9d1eb9d3359edb3069c2096ea6f" +checksum = "a93e433be9382c737320af3924f7d5fc6f89c155cf2bf88949d8f5126fab283f" dependencies = [ "axum", "axum-core", @@ -731,7 +731,6 @@ dependencies = [ "serde", "tokio", "tower", - "tower-http 0.4.3", "tower-layer", "tower-service", ] @@ -862,9 +861,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ "serde", ] @@ -981,7 +980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata 0.3.4", + "regex-automata 0.3.6", "serde", ] @@ -1142,7 +1141,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.24.0" +version = "0.25.1" dependencies = [ "anyhow", "assert_cmd", @@ -1180,13 +1179,12 @@ dependencies = [ "shuttle-common-tests", "shuttle-proto", "shuttle-service", - "sqlx", "strum", "tar", "tempfile", "test-context", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.19.0", "tokiotest-httpserver", "toml 0.5.11", "toml_edit 0.16.2", @@ -1214,9 +1212,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.80" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -1295,7 +1293,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1364,9 +1362,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const-random" @@ -1774,9 +1772,9 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468", @@ -1799,9 +1797,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" dependencies = [ "serde", ] @@ -1946,7 +1944,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2088,7 +2086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -2104,13 +2102,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -2128,9 +2126,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -2202,15 +2200,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f" dependencies = [ "io-lifetimes 1.0.11", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] name = "fs_at" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15550ecca96ea332ec143fb450701074143b70d358e50b32b1f847ccff2e1cf7" +checksum = "13865faf9bae9729a623b591520adb9c5b1b0ecbec8a48394f47f6801a458f9f" dependencies = [ "aligned", "cfg-if 1.0.0", @@ -2293,7 +2291,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2627,9 +2625,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -2640,9 +2638,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2815,9 +2813,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "http-serde" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ "http", "serde", @@ -2831,9 +2829,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3108,7 +3106,7 @@ dependencies = [ "socket2 0.5.3", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] @@ -3124,7 +3122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -3368,7 +3366,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3398,9 +3396,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru-cache" @@ -3452,9 +3450,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67827e6ea8ee8a7c4a72227ef4fc08957040acffdb5f122733b24fa12daff41b" +checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" [[package]] name = "maybe-owned" @@ -3567,9 +3565,9 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd85ec209a5b84fd9f54b9e381f6fa17462bc74160d018fc94fd8b9f61faa8" +checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe" dependencies = [ "async-trait", "base64 0.13.1", @@ -3834,9 +3832,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", @@ -3855,7 +3853,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3875,9 +3873,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -4050,7 +4048,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4140,7 +4138,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -4156,39 +4154,39 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -4448,9 +4446,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -4603,9 +4601,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" [[package]] name = "regex-syntax" @@ -4637,9 +4635,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -4671,15 +4669,15 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.6", - "winreg 0.10.1", + "webpki-roots 0.25.2", + "winreg", ] [[package]] name = "reqwest-middleware" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4531c89d50effe1fac90d095c8b133c20c5c714204feee0bfc3fd158e784209d" +checksum = "ff44108c7925d082f2861e683a88618b68235ad9cdc60d64d9d1188efc951cdb" dependencies = [ "anyhow", "async-trait", @@ -4853,7 +4851,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.28", + "syn 2.0.29", "walkdir", ] @@ -4948,11 +4946,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.6" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys 0.4.5", @@ -4979,7 +4977,7 @@ checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", - "rustls-webpki 0.101.2", + "rustls-webpki 0.101.3", "sct", ] @@ -5016,9 +5014,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.2" +version = "0.101.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" dependencies = [ "ring", "untrusted", @@ -5158,9 +5156,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -5176,20 +5174,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "indexmap 2.0.0", "itoa", @@ -5215,7 +5213,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -5354,7 +5352,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "clap", @@ -5371,12 +5369,12 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", "axum", - "axum-extra 0.7.5", + "axum-extra 0.7.7", "axum-sessions", "clap", "http", @@ -5400,7 +5398,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.24.0" +version = "0.25.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5410,14 +5408,14 @@ dependencies = [ "serde", "serde_json", "shuttle-common-tests", - "syn 2.0.28", + "syn 2.0.29", "tokio", "trybuild", ] [[package]] name = "shuttle-common" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5466,7 +5464,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.24.0" +version = "0.25.0" dependencies = [ "cargo-shuttle", "hyper", @@ -5479,7 +5477,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5530,7 +5528,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5588,7 +5586,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "chrono", @@ -5606,7 +5604,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.24.0" +version = "0.25.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5632,7 +5630,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.24.0" +version = "0.25.0" dependencies = [ "async-trait", "chrono", @@ -5656,7 +5654,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5689,7 +5687,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5960,7 +5958,7 @@ checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ "atoi", "base64 0.21.2", - "bitflags 2.3.3", + "bitflags 2.4.0", "byteorder", "bytes", "chrono", @@ -6004,7 +6002,7 @@ checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" dependencies = [ "atoi", "base64 0.21.2", - "bitflags 2.3.3", + "bitflags 2.4.0", "byteorder", "chrono", "crc", @@ -6136,9 +6134,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -6169,12 +6167,12 @@ version = "0.25.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10081a99cbecbc363d381b9503563785f0b02735fccbb0d4c1a2cb3d39f7e7fe" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cap-fs-ext", "cap-std", "fd-lock", "io-lifetimes 2.0.2", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", "winx 0.36.1", ] @@ -6193,9 +6191,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -6268,22 +6266,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6298,9 +6296,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b" +checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" dependencies = [ "deranged", "itoa", @@ -6319,9 +6317,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" dependencies = [ "time-core", ] @@ -6352,11 +6350,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -6365,7 +6362,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -6388,7 +6385,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6447,11 +6444,23 @@ dependencies = [ "rustls 0.21.6", "tokio", "tokio-rustls 0.24.1", - "tungstenite", + "tungstenite 0.19.0", "webpki-roots 0.23.1", ] [[package]] +name = "tokio-tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.20.0", +] + +[[package]] name = "tokio-util" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6652,7 +6661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ "base64 0.21.2", - "bitflags 2.3.3", + "bitflags 2.4.0", "bytes", "futures-core", "futures-util", @@ -6711,7 +6720,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6841,9 +6850,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84e0202ea606ba5ebee8507ab2bfbe89b98551ed9b8f0be198109275cff284b" +checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" dependencies = [ "basic-toml", "glob", @@ -6885,6 +6894,25 @@ dependencies = [ ] [[package]] +name = "tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] name = "typed-builder" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6925,9 +6953,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -7029,9 +7057,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.4.3" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c624186f22e625eb8faa777cb33d34cd595aa16d1742aa1d8b6cf35d3e4dda9" +checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a" dependencies = [ "indexmap 2.0.0", "serde", @@ -7041,22 +7069,22 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.4.4" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ce5f21ca77e010f5283fa791c6ab892c68b3668a1bdc6b7ac6cf978f5d5b30" +checksum = "05d96dcd6fc96f3df9b3280ef480770af1b7c5d14bc55192baa9b067976d920c" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "uuid", ] [[package]] name = "utoipa-swagger-ui" -version = "3.1.4" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4602d7100d3cfd8a086f30494e68532402ab662fa366c9d201d677e33cee138d" +checksum = "84614caa239fb25b2bb373a52859ffd94605ceb256eeb1d63436325cf81e3653" dependencies = [ "axum", "mime_guess", @@ -7201,7 +7229,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -7235,7 +7263,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7535,9 +7563,9 @@ dependencies = [ [[package]] name = "wast" -version = "62.0.1" +version = "63.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" +checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a" dependencies = [ "leb128", "memchr", @@ -7547,11 +7575,11 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637" +checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c" dependencies = [ - "wast 62.0.1", + "wast 63.0.0", ] [[package]] @@ -7566,9 +7594,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", "home", @@ -7615,10 +7643,16 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.2", + "rustls-webpki 0.101.3", ] [[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] name = "which" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7735,7 +7769,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -7753,7 +7787,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -7773,17 +7807,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -7794,9 +7828,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -7806,9 +7840,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -7818,9 +7852,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -7830,9 +7864,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -7842,9 +7876,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -7854,9 +7888,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -7866,30 +7900,21 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.3" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" @@ -7915,7 +7940,7 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857cedf8371f690bb6782a3e2b065c54d1b6661be068aaf3eac8b45e813fdf8" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "windows-sys 0.48.0", ] @@ -7975,9 +8000,9 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix index 13643d9799af..5e3f2cca245c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-21ImDhdT07fc+eKhOWU4z/SQWAO2meq4PITKsVSSG9Y="; + hash = "sha256-UB9S3Ougd7t+D3oAYE9i6AUY76bNKrr605W6GWh1vb0="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index b340dc338a27..3c83dd5437a5 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.28"; + version = "1.0.29"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vPOQC/bpjmjQzHZZHVMTil2XqIbKhxb7461dWCgySQk="; + sha256 = "sha256-SCxigQ6jhT+r6ixgCGwWDtvU8WUJ+5eWYe8DIWPBWhY="; }; - cargoSha256 = "sha256-SL9fIZpMG+XfNHV0xEQyrm13MphIWv6I/cFUOVrA6bA="; + cargoSha256 = "sha256-ZX2T+wKIgYJqOK6118wmsMBKigtJvPqJ2hVtyh23zUk="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 8ff6c841758e..55bf3bb36b68 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.41"; + version = "0.1.42"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LfPhs3hTM47ktDSSC5TVYQoJa4OzMfL7zKLWV4d6bAA="; + sha256 = "sha256-8CQnmUk7jMlcdtZh6046B5duKnZKaMVk2xG4D2svqVw="; }; - cargoHash = "sha256-NBxQ75J60kZX6ASk3/42N5JT6pDLEZpnZtUCgRDOvSY="; + cargoHash = "sha256-e3ku9c4VLZtnJIUDRMAcUVaJnOsMqckj3XmuJHSR364="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 85a1f1272b7d..396b3f07b17e 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.24.6"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-RHh97hwWmjV6hw+fX+fOtixX/DGedTf9cx+PYPW6/wI="; + hash = "sha256-gljICr0abKEXxJfLCJN3L2OIwUvw/QoIC6T5C7pieEA="; }; - cargoSha256 = "sha256-7G/16arXYwt7Nrs1isWyrPubm8GMi8NsjLjWAD8x6aM="; + cargoSha256 = "sha256-agBzn2MibM7158/QlLXI2HBBcYIe0p50rYSF1jBDF8U="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock new file mode 100644 index 000000000000..56b9df484a6d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock @@ -0,0 +1,553 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cargo-manifest" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce38d2d1efbe0e7180766a872570bc07cd5430a42e713b01006d4afa89912fe" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "genemichaels" +version = "0.1.21" +dependencies = [ + "anyhow", + "cargo-manifest", + "clap", + "derive_more", + "markdown", + "proc-macro2", + "quote", + "structre", + "syn", + "threadpool", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "litrs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "markdown" +version = "1.0.0-alpha.5" +source = "git+https://github.com/wooorm/markdown-rs?rev=af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7#af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7" +dependencies = [ + "log", + "unicode-id", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structre" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31eab0dcebb0d631c93629c0da9fdce1448123aa15e5e4c08fcd71d4f4fd5f4" +dependencies = [ + "anyhow", + "once_cell", + "regex", + "structre_proc_macros", +] + +[[package]] +name = "structre_proc_macros" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e7698a9d57b3a475ce1d6cc37b1be9ee8ed188ec596603c863c06c9e06cf7e" +dependencies = [ + "litrs", + "proc-macro2", + "quote", + "regex-syntax", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "toml" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-id" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix b/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix new file mode 100644 index 000000000000..673519aeabc4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "genemichaels"; + version = "0.1.21"; + src = fetchFromGitHub { + owner = "andrewbaxter"; + repo = pname; + rev = "158bb8eb705b073d84562554c1a6a63eedd44c6b"; + hash = "sha256-rAJYukxptasexZzwWgtGlUbHhyyI6OJvSzVxGLBO9vM="; + }; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes."markdown-1.0.0-alpha.5" = "sha256-pjIKzXvRKoMfFVIyIXdm+29vvUzCHiJ0rrZgr4K+Ih8="; + }; + meta = { + description = "Even formats macros"; + homepage = "https://github.com/andrewbaxter/genemichaels"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix b/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix index b4e2480d1c70..c2dbf742162a 100644 --- a/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "leptosfmt"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "bram209"; repo = "leptosfmt"; rev = version; - hash = "sha256-RR4gwmYna/mvUw5akQutWKaUCWzCjK512gynR9Pddd0="; + hash = "sha256-QitvZ0AkZcXmjv8EnewWjexQMVEHy/naUarBIrzHbBA="; }; - cargoHash = "sha256-6du44SfH0dT1gWVFluB3+AA3GUzwN7Sjh03rKhSRKCM="; + cargoHash = "sha256-Fjj4lgkdHeA/3ajNbF1vTf6/YzGvDUJsDmiXzkEpels="; meta = with lib; { description = "A formatter for the leptos view! macro"; diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 6542dacbe9e7..8780b8892fa1 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-UH+qOKKQdWXQZZMtrihbWmKaUoSy1NciGh9UTtS/W5E="; + hash = "sha256-uaDTL6dfH+zqjMbLtgLaZRe91mDuyKA0afw+3LFF+1U="; }; - cargoHash = "sha256-EGgVPRaofia+AwXSr6X4Aa8jbk5qDkXg1XvMoEp0qMQ="; + cargoHash = "sha256-DF8O3YrHr0tBStnmnUUUF4QaZcoXYCCweZoEig4etQA="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix b/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix index e5290700c310..567dfcf8d2c3 100644 --- a/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "specr-transpile"; - version = "0.1.22"; + version = "0.1.24"; src = fetchCrate { inherit pname version; - hash = "sha256-D3UdQ3L7fSSFWlVSjqjEUqNCQebMHOtZnJqO7sBjm14="; + hash = "sha256-+7NjB87pfFh8472gOV4HoKIqSiHnTCFOEVdKYBsn1qg="; }; - cargoHash = "sha256-f0Gwxr7J56Q11Rv26mycCYbCidr5bXUwo4kmnVWMCz4="; + cargoHash = "sha256-VgEyXm1uSsNJVjUYx66A35vLNxYErTrC8qBhYVlYyH4="; meta = with lib; { description = "Converts Specr lang code to Rust"; diff --git a/nixpkgs/pkgs/development/tools/rye/Cargo.lock b/nixpkgs/pkgs/development/tools/rye/Cargo.lock index 23192dcfe6bb..058cbe8ced7c 100644 --- a/nixpkgs/pkgs/development/tools/rye/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rye/Cargo.lock @@ -1697,7 +1697,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.11.0" +version = "0.13.0" dependencies = [ "age", "anyhow", diff --git a/nixpkgs/pkgs/development/tools/rye/default.nix b/nixpkgs/pkgs/development/tools/rye/default.nix index 63873b7a6798..714a54cfa23e 100644 --- a/nixpkgs/pkgs/development/tools/rye/default.nix +++ b/nixpkgs/pkgs/development/tools/rye/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "mitsuhiko"; - repo = pname; + repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-00Q+qvK1fq9CGb6umtCiUJZZ1M5LMxiSIM3/s7eOumM="; + hash = "sha256-B53oTAgy+y+FWk7y+unJPt7Mc7m4nwnTX+5wqL6AX+4="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index 7abad3b3c188..d9577377e6d7 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-X6DHRE3HIHNWVJYrQyXP3fZYK5Va0nNtpFCV1QzbBoE="; + hash = "sha256-FTPBeq/WbrYDEmS1fR8rzDBHBsjdyMHcm+tCxXtYUPg="; }; outputs = [ "out" "man" ]; @@ -36,7 +36,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index 63ff07b4ce54..274aff3f4e15 100644 --- a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -2,15 +2,20 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "2023.3.rc1"; + version = "1.3.261.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "v${version}"; - hash = "sha256-HV7jNvgTRRGnhurtT5pf5f5gzUOmr3iWNcDc8TE4ICQ="; + rev = "sdk-${version}"; + hash = "sha256-K7cv0mMNrXYOlJsxAPwz3rVX5FnsnBNvaU33k9hYnQc="; }; + # The cmake options are sufficient for turning on static building, but not + # for disabling shared building, just trim the shared lib from the CMake + # description + patches = lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ @@ -39,7 +44,7 @@ stdenv.mkDerivation rec { description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; homepage = "https://github.com/KhronosGroup/SPIRV-Tools"; license = licenses.asl20; - platforms = platforms.unix; + platforms = with platforms; unix ++ windows; maintainers = [ maintainers.ralith ]; }; } diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch b/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch new file mode 100644 index 000000000000..45d2be6ec6ac --- /dev/null +++ b/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch @@ -0,0 +1,30 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index acfa0c12..bf3eb686 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -378,16 +378,6 @@ function(spirv_tools_default_target_options target) + add_dependencies(${target} spirv-tools-build-version core_tables enum_string_mapping extinst_tables) + endfunction() + +-# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and +-# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility. +-add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) +-spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) +-set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) +-target_compile_definitions(${SPIRV_TOOLS}-shared +- PRIVATE SPIRV_TOOLS_IMPLEMENTATION +- PUBLIC SPIRV_TOOLS_SHAREDLIB +-) +- + if(SPIRV_TOOLS_BUILD_STATIC) + add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES}) + spirv_tools_default_target_options(${SPIRV_TOOLS}-static) +@@ -402,7 +392,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) + add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static) + endif() + +- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) ++ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static) + else() + add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) + spirv_tools_default_target_options(${SPIRV_TOOLS}) diff --git a/nixpkgs/pkgs/development/tools/sq/default.nix b/nixpkgs/pkgs/development/tools/sq/default.nix index eb2f96e34fd5..058c84b3c910 100644 --- a/nixpkgs/pkgs/development/tools/sq/default.nix +++ b/nixpkgs/pkgs/development/tools/sq/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: +{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, testers, sq }: -buildGoModule rec { +buildGo121Module rec { pname = "sq"; - version = "0.40.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TD9brvMxU2gdiOiJPs/M5PmiwFd99P9YohCG7bcjLas="; + hash = "sha256-IL3041R35WL+sYCpTjfPXUpd7GTcQoaILYBufwH1WoE="; }; - vendorHash = "sha256-/LsQfhU5+Wobts6R3cJDJaKSvPUqWNBpx9ILgNC2otc="; + vendorHash = "sha256-ez5qhGgK0q3oDT0L0Fs+JKJjMbNoJukzCoir2a9ro48="; proxyVendor = true; diff --git a/nixpkgs/pkgs/development/tools/sqldef/default.nix b/nixpkgs/pkgs/development/tools/sqldef/default.nix new file mode 100644 index 000000000000..6ce1d02e9f85 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/sqldef/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub, libpg_query, xxHash, postgresql }: + +buildGoModule rec { + pname = "sqldef"; + version = "0.16.4"; + + src = fetchFromGitHub { + owner = "k0kubun"; + repo = "sqldef"; + rev = "v${version}"; + hash = "sha256-HQ6WyeKYRd+pY/P2Bsu7W2eMjgpjUhbwEFE7bADrxDY="; + }; + + proxyVendor = true; + + vendorHash = "sha256-YdZo2XN+425s0K/3COqQx3g1Bpus4uWiwnzrYJ8qdOM="; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + # The test requires a running database + doCheck = false; + + meta = with lib; { + description = "Idempotent SQL schema management tool"; + license = with licenses; [ mit /* for everything except parser */ asl20 /* for parser */ ]; + homepage = "https://github.com/k0kubun/sqldef"; + changelog = "https://github.com/k0kubun/sqldef/blob/v${version}/CHANGELOG.md"; + maintainers = with maintainers; [ kgtkr ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/nixpkgs/pkgs/development/tools/supabase-cli/default.nix index 8f5f8e24add1..f54475ef6db5 100644 --- a/nixpkgs/pkgs/development/tools/supabase-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/supabase-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.86.1"; + version = "1.88.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-JAs0PScCWsE82cxhUWKjl3fB1EqwR9nh/ESbPd63mc0="; + hash = "sha256-OgeKr0xSWp83Ri3WBNsY3TL6tAWsMtsEdD6KeKdPdCw="; }; vendorSha256 = "sha256-efcgpxvhHe6KtNfNYYc5fYv93fJPf63V39d+5AcCvPQ="; @@ -51,7 +51,7 @@ buildGoModule rec { description = "A CLI for interacting with supabase"; homepage = "https://github.com/supabase/cli"; license = licenses.mit; - maintainers = with maintainers; [ gerschtli ]; + maintainers = with maintainers; [ gerschtli kashw2 ]; mainProgram = "supabase"; }; } diff --git a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index aee1a2d150a6..acae7f04f6af 100644 --- a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.7"; - vendorHash = "sha256-OXV/hTSHJvYfe2SiFamkedC01J/DOgd8I60yIpQToos="; + version = "5.5.8"; + vendorHash = "sha256-hOYVIynWsbsindNJRbXX4NkC3FW3RErORCSLlV1bCWc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-LC6QQIVHllBRu8B6XfV8SuTB3O+FmqYr+LQnVmLj2nU="; + hash = "sha256-K2DttdK8g5NI+XlGwIA9HTPTLlMGgGc1K625FquIhi4="; }; ldflags = [ diff --git a/nixpkgs/pkgs/development/tools/tabnine/default.nix b/nixpkgs/pkgs/development/tools/tabnine/default.nix index fcd00726ba77..4426e2bbf81f 100644 --- a/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/nixpkgs/pkgs/development/tools/turso-cli/default.nix index a109016cffa5..2b9d622dedd0 100644 --- a/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.79.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-5ucStAFe3lZgnGMI0fRw1E4T60+9nglNbZnzrjRmRgk="; + hash = "sha256-Ck1q3II/o7f+n0pdR5PzUXG2c6GZmQFeddofHzPTLlA="; }; - vendorHash = "sha256-+F9I6+f7Sm5qhBAoXCMKjV/jFY0fyVIk0NKBQNNI+qM="; + vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI="; # Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error. doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index d64da750c407..51b10de9c237 100644 --- a/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.12.0"; + version = "5.13.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-K8SMUT2f8pgxCP5JGFyo/gLm60t0OeCt/1fYAw2HQX0="; + sha256 = "sha256-WfaXYNaNBMcOyQshJkMgzGSmID0tmZ0TRN6N3lR275Q="; }; buildInputs = [ nodejs ]; diff --git a/nixpkgs/pkgs/development/tools/typos/default.nix b/nixpkgs/pkgs/development/tools/typos/default.nix index 877b0c824728..efd0a856226e 100644 --- a/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.8"; + version = "1.16.9"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-JEXc/yR7QbqaKGHrmc/1ZwFVL0NqAAb5JDhidS0p1Ik="; + hash = "sha256-aFP4q3Cv7ESqgpBoYW70Fsl2GGEIX8bEl3/sEG6HGpM="; }; - cargoHash = "sha256-f6BvUc5YVSRZUWEtwUMBnvXwKNFiYbcGzvlplma7Mj4="; + cargoHash = "sha256-mUcvKYe2SiuEWKXGG1jiF4YtVB72HlGc7HDHhgUhLaU="; meta = with lib; { description = "Source code spell checker"; diff --git a/nixpkgs/pkgs/development/tools/vendir/default.nix b/nixpkgs/pkgs/development/tools/vendir/default.nix index af6f8e5fcbcc..0a7ff7210505 100644 --- a/nixpkgs/pkgs/development/tools/vendir/default.nix +++ b/nixpkgs/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.34.3"; + version = "0.34.4"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-oeKzbe272Mg0pp+MW6/oBw64/OAzTSmo1qSNAoRqmOE="; + sha256 = "sha256-HdKMPXZIz1n8+170E3Aj7BYquVGgnPwRKJ5CZcqN35M="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/vsce/default.nix b/nixpkgs/pkgs/development/tools/vsce/default.nix index 6b35fb317683..7d80b364c1b6 100644 --- a/nixpkgs/pkgs/development/tools/vsce/default.nix +++ b/nixpkgs/pkgs/development/tools/vsce/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-wwSrECqCNBTfr+Hk0sO6eI64uXCiJuRdCk7HUf5oO4g="; + hash = "sha256-iBbKVfkmt8n06JJ8TSO8BDCeiird9gTkOQhlREtZ5Cw="; }; - npmDepsHash = "sha256-eTyeNvI34+x2ymyQc3qD5WTGIwL+7OjUCK3u2QZhJDQ="; + npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index 2d500eb9eba4..377f87b16453 100644 --- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -14,33 +14,16 @@ , libXrandr , spirv-headers , vulkan-headers +, vulkan-utility-libraries , wayland }: let robin-hood-hashing = callPackage ./robin-hood-hashing.nix {}; - - # Current VVL version requires a newer spirv-headers than the latest release tag. - # This should hopefully not be too common and the override should be removed after - # the next SPIRV headers release. - # FIXME: if this ever becomes common, figure out a way to pull revisions directly - # from upstream known-good.json - spirv-headers' = spirv-headers.overrideAttrs(_: { - version = "unstable-2023-04-27"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "7f1d2f4158704337aff1f739c8e494afc5716e7e"; - hash = "sha256-DHOYIZQqP5uWDYdb+vePpMBaQDOCB5Pcg8wPBMF8itk="; - }; - - postPatch = ""; - }); in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.254"; + version = "1.3.261"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -51,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "v${version}"; - hash = "sha256-hh/lCXSKq8xmygVsFFOGu79DvBvBPcc1l1e5wQskK7M="; + hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM="; }; nativeBuildInputs = [ @@ -68,12 +51,13 @@ stdenv.mkDerivation rec { libffi libxcb vulkan-headers + vulkan-utility-libraries wayland ]; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}" + "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 4a962a1585a0..16dfcd878ab6 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -1,22 +1,35 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "vultr-cli"; - version = "2.17.0"; + version = "2.18.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-z5G7oXthz1oP9h6IwKZrkG0waBurBpbOALGdcAuThnc="; + hash = "sha256-RW8t5s28eUxHKEz+UHdeHlRMYprKlA9AdtiEy661des="; }; - vendorHash = "sha256-c5FzeqC+uEnVT3TxXHzI4FFIdJvKQ2tgGQAwd1DE5eM="; + vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + installShellCompletion --cmd vultr-cli \ + --bash <($out/bin/vultr-cli completion bash) \ + --fish <($out/bin/vultr-cli completion fish) \ + --zsh <($out/bin/vultr-cli completion zsh) + ''; meta = with lib; { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; + changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "vultr-cli"; }; } diff --git a/nixpkgs/pkgs/development/tools/watchman/Cargo.lock b/nixpkgs/pkgs/development/tools/watchman/Cargo.lock index 9554b7be1f5b..d0ccfa032ade 100644 --- a/nixpkgs/pkgs/development/tools/watchman/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/watchman/Cargo.lock @@ -3,12 +3,30 @@ version = 3 [[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] name = "ahash" -version = "0.3.8" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "const-random", + "cfg-if", + "getrandom", + "once_cell", + "version_check", ] [[package]] @@ -22,9 +40,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "atty" @@ -44,6 +62,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -57,18 +90,21 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -92,32 +128,10 @@ dependencies = [ ] [[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "crossbeam" @@ -135,9 +149,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -145,9 +159,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -156,14 +170,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.9.0", "scopeguard", ] @@ -179,20 +193,14 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] name = "duct" version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -206,9 +214,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "futures" @@ -218,9 +226,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -233,9 +241,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -243,15 +251,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -260,38 +268,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -308,9 +316,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -318,6 +326,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] name = "heck" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -337,18 +351,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jwalk" @@ -368,15 +379,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -384,12 +395,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "maplit" @@ -414,68 +422,86 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", "windows-sys", ] [[package]] name = "nix" -version = "0.23.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags", - "cc", "cfg-if", "libc", "memoffset 0.6.5", + "pin-utils", ] [[package]] name = "ntapi" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "os_pipe" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", "windows-sys", @@ -493,22 +519,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -525,7 +551,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -541,34 +567,28 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -576,9 +596,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -588,30 +608,36 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -624,25 +650,35 @@ dependencies = [ "byteorder", "bytes", "serde", + "serde_bytes", "thiserror", ] [[package]] +name = "serde_bytes" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] + +[[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -661,36 +697,36 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.7" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", - "winapi", + "windows-sys", ] [[package]] @@ -720,14 +756,25 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -769,43 +816,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", + "syn 2.0.28", ] [[package]] name = "tokio" -version = "1.24.2" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -813,18 +850,19 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", + "tracing", "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -844,16 +882,36 @@ dependencies = [ ] [[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -885,7 +943,7 @@ version = "0.8.0" dependencies = [ "anyhow", "bytes", - "futures 0.3.25", + "futures 0.3.28", "maplit", "serde", "serde_bser", @@ -901,7 +959,6 @@ version = "0.1.0" dependencies = [ "ahash", "anyhow", - "atty", "duct", "jwalk", "nix", @@ -938,9 +995,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -953,42 +1019,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/nixpkgs/pkgs/development/tools/watchman/default.nix b/nixpkgs/pkgs/development/tools/watchman/default.nix index 33db2dd144d1..6bd12510c13d 100644 --- a/nixpkgs/pkgs/development/tools/watchman/default.nix +++ b/nixpkgs/pkgs/development/tools/watchman/default.nix @@ -1,7 +1,6 @@ { boost , cargo , cmake -, config , CoreServices , cpptoml , double-conversion @@ -22,9 +21,8 @@ , libunwind , lz4 , openssl -, pcre +, pcre2 , pkg-config -, python3 , rustPlatform , rustc , stateDir ? "/tmp" @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "watchman"; - version = "2023.01.30.00"; + version = "2023.08.14.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "sha256-ZtCUlxx3YgfwKa9J8o9GkdkHquJbh+EytLiGNRlABls="; + hash = "sha256-41bBPFlLYFHySyX4/GUllT1pNywSRcH7x/pnb5iN/1o="; }; cmakeFlags = [ @@ -64,9 +62,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pcre + pcre2 openssl - python3 gtest glog boost diff --git a/nixpkgs/pkgs/development/tools/wgo/default.nix b/nixpkgs/pkgs/development/tools/wgo/default.nix index bcd8cb7a0044..0213dfcf7795 100644 --- a/nixpkgs/pkgs/development/tools/wgo/default.nix +++ b/nixpkgs/pkgs/development/tools/wgo/default.nix @@ -5,7 +5,7 @@ let pname = "wgo"; - version = "0.5.1"; + version = "0.5.3"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q="; + hash = "sha256-Uny5FiMox0oIaJ+WE7p3kw4guSzktEF+WzuxjgFXh2I="; }; - vendorHash = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A="; + vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/tools/worker-build/Cargo.lock b/nixpkgs/pkgs/development/tools/worker-build/Cargo.lock new file mode 100644 index 000000000000..17c911f4146c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/worker-build/Cargo.lock @@ -0,0 +1,2415 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ + "byteorder", + "safemem", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "chrono-tz" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9cc2b23599e6d7479755f3594285efb3f74a1bdca7a7374948bc831e23a552" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "h2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-on-workers" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "hyper", + "tokio", + "wasm-bindgen-futures", + "worker", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "js-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "libc" +version = "0.2.146" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "matchit" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9376a4f0340565ad675d11fc1419227faf5f60cd7ac9cb2e7185a471f30af833" + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl" +version = "0.10.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "postgres-protocol" +version = "0.6.5" +source = "git+https://github.com/sfackler/rust-postgres?branch=master#790af54a0fdd5c487e77dc9a25d82921ee31ffe6" +dependencies = [ + "base64 0.21.2", + "byteorder", + "bytes", + "fallible-iterator", + "getrandom", + "hmac", + "md-5", + "memchr", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.5" +source = "git+https://github.com/sfackler/rust-postgres?branch=master#790af54a0fdd5c487e77dc9a25d82921ee31ffe6" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams 0.2.3", + "web-sys", + "winreg", +] + +[[package]] +name = "retry" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4" +dependencies = [ + "rand", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "serde_json" +version = "1.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "stringprep" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +dependencies = [ + "itoa", + "js-sys", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.4.9", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.8" +source = "git+https://github.com/sfackler/rust-postgres?branch=master#790af54a0fdd5c487e77dc9a25d82921ee31ffe6" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "socket2 0.5.3", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-postgres-on-workers" +version = "0.1.0" +dependencies = [ + "tokio-postgres", + "worker", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-on-workers" +version = "0.1.0" +dependencies = [ + "time", + "tracing", + "tracing-subscriber", + "tracing-web", + "worker", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "nu-ansi-term", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tracing-web" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff5efc53ed5a7c4b99b3dd24fd10f41e7aa1b284a4e64ae9167d97e31afe124" +dependencies = [ + "js-sys", + "tracing-core", + "tracing-subscriber", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "tungstenite" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand", + "sha-1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +dependencies = [ + "base64 0.13.1", + "flate2", + "log", + "once_cell", + "rustls", + "url", + "webpki", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walrus" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" +dependencies = [ + "anyhow", + "id-arena", + "leb128", + "log", + "walrus-macro", + "wasmparser", +] + +[[package]] +name = "walrus-macro" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-cli-support" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8315d6503415e5d44ff64f1ba34aefd8264c561df17e0f1c8eb8c96bde79c45e" +dependencies = [ + "anyhow", + "base64 0.9.3", + "log", + "rustc-demangle", + "serde_json", + "tempfile", + "unicode-ident", + "walrus", + "wasm-bindgen-externref-xform", + "wasm-bindgen-multi-value-xform", + "wasm-bindgen-shared", + "wasm-bindgen-threads-xform", + "wasm-bindgen-wasm-conventions", + "wasm-bindgen-wasm-interpreter", +] + +[[package]] +name = "wasm-bindgen-externref-xform" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4522bf3be16c6274c87a5a2c5d2a62efa80253b025f8e813f9682d0d6a8a8fca" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "113256596776ebb4b243512d3711e73d5475eaeff373e1ae65427c66e5aa2073" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e636f3a428ff62b3742ebc3c70e254dfe12b8c2b469d688ea59cdd4abcf502" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18c1fad2f7c4958e7bcce014fa212f59a65d5e3721d0f77e6c0b27ede936ba3" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "wasm-bindgen-threads-xform" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89106aaf83a2b80464fc8f60a074a4575135b73a491e174f35bbeae6ff0d7ec6" +dependencies = [ + "anyhow", + "walrus", + "wasm-bindgen-wasm-conventions", +] + +[[package]] +name = "wasm-bindgen-wasm-conventions" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e5ad27a7930400994cb40823d3d4a7ef235fac52d0c75ebd61fa40eba994a8" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-wasm-interpreter" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e69500063b7b20f3e9422d78c2b381dd192c7c4ebaef34d205332877cd78e0d3" +dependencies = [ + "anyhow", + "log", + "walrus", + "wasm-bindgen-wasm-conventions", +] + +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wasmparser" +version = "0.77.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" + +[[package]] +name = "web-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "worker" +version = "0.0.18" +dependencies = [ + "async-trait", + "chrono", + "chrono-tz", + "futures-channel", + "futures-util", + "http", + "js-sys", + "matchit", + "pin-project", + "serde", + "serde-wasm-bindgen", + "serde_json", + "tokio", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams 0.3.0", + "web-sys", + "worker-kv", + "worker-macros", + "worker-sys", +] + +[[package]] +name = "worker-build" +version = "0.0.10" +dependencies = [ + "anyhow", + "dirs-next", + "flate2", + "tar", + "ureq", + "wasm-bindgen-cli-support", +] + +[[package]] +name = "worker-kv" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d4b9fe1a87b7aef252fceb4f30bf6303036a5de329c81ccad9be9c35d1fdbc7" +dependencies = [ + "js-sys", + "serde", + "serde-wasm-bindgen", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "worker-macros" +version = "0.0.10" +dependencies = [ + "async-trait", + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-macro-support", + "worker-sys", +] + +[[package]] +name = "worker-sandbox" +version = "0.1.0" +dependencies = [ + "blake2", + "cfg-if", + "chrono", + "console_error_panic_hook", + "futures-channel", + "futures-util", + "getrandom", + "hex", + "http", + "md5", + "rand", + "regex", + "reqwest", + "retry", + "serde", + "serde-wasm-bindgen", + "serde_json", + "tokio", + "tungstenite", + "uuid", + "wasm-bindgen-test", + "worker", +] + +[[package]] +name = "worker-sys" +version = "0.0.10" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] diff --git a/nixpkgs/pkgs/development/tools/worker-build/default.nix b/nixpkgs/pkgs/development/tools/worker-build/default.nix index 54f5f0191b43..620fd87142ff 100644 --- a/nixpkgs/pkgs/development/tools/worker-build/default.nix +++ b/nixpkgs/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-siKIE+RHAnZ8Lj3kWg7jEVo5t10dqc59OMrro26ClWo="; + hash = "sha256-z6m14IbMzgycwnQpA28e4taokDSVpfZOKIRmFIwLjbg="; }; - cargoHash = "sha256-j6WG8pRM6fIvMeXDdkjzRREE9tIug0w+UwWdOmPao4U="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "postgres-protocol-0.6.5" = "sha256-xLyaappu7ebtKOoHY49dvjDEcuRg8IOv1bNH9RxSUcM="; + }; + }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "This is a tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project."; - homepage = "https://github.com/cloudflare/worker-rs"; + homepage = "https://github.com/cloudflare/workers-rs"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ happysalada ]; }; diff --git a/nixpkgs/pkgs/development/web/bun/default.nix b/nixpkgs/pkgs/development/web/bun/default.nix index 7b9ea612ab37..4520cbd22c13 100644 --- a/nixpkgs/pkgs/development/web/bun/default.nix +++ b/nixpkgs/pkgs/development/web/bun/default.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.7.3"; + version = "0.8.1"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -35,19 +35,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-9gs5PIbYxhhUC+lw/iEIhjdMIUYVnhP7oYrRqmE3HcU="; + hash = "sha256-R0+2MevBE98WNsjGsfBrMJyvc0jadLQ9lJIvoekGiBk="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-CFio1bgsgND54BrklkCVjfDvMDFxpYe1h77nGMOJdsc="; + hash = "sha256-fdn3yEavJUEwcUiyr9vd/0yVzkuJLwTvVeIaLcZkKhs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-j6NpHAqSBRe2Wa4ztA1Ao4JYTKTEIwlYMCMMICKqZv0="; + hash = "sha256-dGu06A/6d/OtyXcmJCVZsODkLIvP7Zd0w6vnuLWuI1I="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-05Duhv2WrYXWS6mKI3zB5QiIlitsysXwmuy+9XHBB9M="; + hash = "sha256-BZ1Ymu2WexC4Ad3cS0Zo9K6WtYL8rlqIYWprk1MyOsg="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/nixpkgs/pkgs/development/web/cypress/default.nix b/nixpkgs/pkgs/development/web/cypress/default.nix index 4532b7743045..6802f218b523 100644 --- a/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/nixpkgs/pkgs/development/web/cypress/default.nix @@ -18,7 +18,7 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-khMJRCGNIITvs56SHHKxoxptoMBb7lqA3FS293qfMys="; + checksum = "sha256-9f5Ewd63pLpMbewtQ0u4WsRnZQEn1lfh6b/jZ8yDSMU="; }; aarch64-linux = { platform = "linux-arm64"; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "12.17.3"; + version = "12.17.4"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix index abf2ff4b4327..99843767d906 100644 --- a/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.4.0"; + version = "2023.5.5"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk="; + sha256 = "sha256-/SrSpkfF3IrLl6BC4UknsTDraqN8uFKrKQSzQpBaRLY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/web/playwright-test/node-packages.json b/nixpkgs/pkgs/development/web/playwright-test/node-packages.json index 87012158d5e4..b079fb119e9e 100644 --- a/nixpkgs/pkgs/development/web/playwright-test/node-packages.json +++ b/nixpkgs/pkgs/development/web/playwright-test/node-packages.json @@ -1,3 +1,3 @@ [ - {"@playwright/test": "1.34.3"} + {"@playwright/test": "1.37.0"} ] diff --git a/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix b/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix index 329452c14bee..63abea2981b0 100644 --- a/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix +++ b/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-20.2.5" = { + "@types/node-20.5.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.2.5"; + version = "20.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz"; - sha512 = "JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz"; + sha512 = "Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q=="; }; }; "fsevents-2.3.2" = { @@ -22,30 +22,30 @@ let sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; - "playwright-core-1.34.3" = { + "playwright-core-1.37.0" = { name = "playwright-core"; packageName = "playwright-core"; - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.34.3.tgz"; - sha512 = "2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw=="; + url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz"; + sha512 = "1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA=="; }; }; }; in { - "@playwright/test-1.34.3" = nodeEnv.buildNodePackage { + "@playwright/test-1.37.0" = nodeEnv.buildNodePackage { name = "_at_playwright_slash_test"; packageName = "@playwright/test"; - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.34.3.tgz"; - sha512 = "zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw=="; + url = "https://registry.npmjs.org/@playwright/test/-/test-1.37.0.tgz"; + sha512 = "181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ=="; }; dependencies = [ - sources."@types/node-20.2.5" + sources."@types/node-20.5.0" sources."fsevents-2.3.2" - sources."playwright-core-1.34.3" + sources."playwright-core-1.37.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/development/web/playwright/driver.nix b/nixpkgs/pkgs/development/web/playwright/driver.nix index 3ee02fe402ec..1046647a277a 100644 --- a/nixpkgs/pkgs/development/web/playwright/driver.nix +++ b/nixpkgs/pkgs/development/web/playwright/driver.nix @@ -30,15 +30,15 @@ let { pname = "playwright-driver"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { url = "https://playwright.azureedge.net/builds/driver/${filename}"; sha256 = { - x86_64-linux = "1xh05v3yqa8gkwayhl4nffgjcnlakpyyi17hwzh0wqzrbwwn0cs8"; - aarch64-linux = "18jxbmhiqda5pzrv6b3n7xi14xg4zvlh6sn7hc3b3hckl77vl933"; - x86_64-darwin = "0fy5nxbvp1kxplavj832gxiznjqpvl0ww869hsfj0h1fibhly7cy"; - aarch64-darwin = "11msl4pnmr8cmlw32xq2qvfz3g3fy0azvq134a47c0fnpj2gd5zl"; + x86_64-linux = "1lkmanr402ar9njwb7dgyzparjyr1r9krz9ad7b8c6hi3fjvrj0y"; + aarch64-linux = "13nfva9jfmjyjxm1my0aq8ngn6ha0fdrpfv28gm351n0j9cjlvqh"; + x86_64-darwin = "0q1qmgypngxs9ipb6dlhk1xccyzw6frzr835ijifpypgp4xmz2gi"; + aarch64-darwin = "1mq1868s06wgfgi3nhdrzsdqi3cl08lrkiz5q06mg1s724b2sf0v"; }.${system} or throwSystem; }; |