diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-16 12:02:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-16 12:02:01 +0000 |
commit | 617d1d1f174b684df15cb715088e60940a800ce8 (patch) | |
tree | d50c1c9256acab46c27c855b4b41e0753ba74905 | |
parent | 112c228b4baccdf2c0f259056b17122210f84fc9 (diff) | |
parent | dbcd41b9ed813e6abc2b56011ec711c8a8be81b2 (diff) | |
download | nixlib-617d1d1f174b684df15cb715088e60940a800ce8.tar nixlib-617d1d1f174b684df15cb715088e60940a800ce8.tar.gz nixlib-617d1d1f174b684df15cb715088e60940a800ce8.tar.bz2 nixlib-617d1d1f174b684df15cb715088e60940a800ce8.tar.lz nixlib-617d1d1f174b684df15cb715088e60940a800ce8.tar.xz nixlib-617d1d1f174b684df15cb715088e60940a800ce8.tar.zst nixlib-617d1d1f174b684df15cb715088e60940a800ce8.zip |
Merge staging-next into staging
55 files changed, 485 insertions, 245 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3fdd3995b7aa..45c5c1963a0d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -29,6 +29,7 @@ let linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened + linux_5_15_hardened linux_testing; }; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 79a0758a2a5b..6c1f035dfef6 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -25,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.7"; + version = "2.7.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h"; + sha256 = "13s1541n1sr2rkfk1qpsm61y2q773x6fs4cwin660qq4bzmgymhy"; }; propagatedBuildInputs = [ @@ -90,7 +90,7 @@ buildPythonApplication rec { meta = { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.raskin ]; + maintainers = with lib.maintainers; [ raskin markus1189 ]; homepage = "http://visidata.org/"; changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index ddd94bff522a..1620c2878eea 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -43,14 +43,14 @@ in clientbuffer = zncDerivation rec { pname = "znc-clientbuffer"; - version = "unstable-2020-04-24"; + version = "unstable-2021-05-30"; module_name = "clientbuffer"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "znc-clientbuffer"; - rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa"; - sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; + rev = "9a7465b413b53408f5d7af86e84b1d08efb6bec0"; + sha256 = "0a3f4j6s5j7p53y42zrgpqyl2zm0jxb69lp24j6mni3licigh254"; }; meta = with lib; { diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ed2cf00291e2..0e6302534ad9 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -6,6 +6,7 @@ , zlib , openssl , readline +, withInternalSqlite ? true , sqlite , ed , which @@ -15,23 +16,25 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy"; + sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; - buildInputs = [ zlib openssl readline sqlite which ed ] - ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ zlib openssl readline which ed ] + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - configureFlags = [ "--disable-internal-sqlite" ] + configureFlags = + lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json"; preBuild = '' diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 712713c82be4..b00de428c8d4 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -2,14 +2,13 @@ , stdenv , fetchzip , lib +, libcxx , addOpenGLRunpath , patchelf , fixDarwinDylibNames , cudaSupport -, cudatoolkit_11_1 -, cudnn_cudatoolkit_11_1 }: let @@ -18,10 +17,11 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.9.0"; + version = "1.10.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; + libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -67,57 +67,37 @@ in stdenv.mkDerivation { ''} done '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib - install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib - - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib + for f in $out/lib/*.dylib; do + otool -L $f + done + for f in $out/lib/*.dylib; do + install_name_tool -id $out/lib/$(basename $f) $f || true + for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do + install_name_tool -change $rpath $out/lib/$(basename $rpath) $f + done + if otool -L $f | grep /usr/lib/libc++ >& /dev/null; then + install_name_tool -change /usr/lib/libc++.1.dylib ${libcxx-for-libtorch.outPath}/lib/libc++.1.0.dylib $f + fi + done + for f in $out/lib/*.dylib; do + otool -L $f + done ''; outputs = [ "out" "dev" ]; passthru.tests.cmake = callPackage ./test { inherit cudaSupport; - cudatoolkit = cudatoolkit_11_1; - cudnn = cudnn_cudatoolkit_11_1; }; meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; - license = licenses.unfree; # Includes CUDA and Intel MKL. - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; + maintainers = with maintainers; [ junjihashimoto ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 6ded62fb87c3..156515f6eb51 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,19 @@ -version: { - x86_64-darwin-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; - hash = "sha256-TOJ+iQpqazta46y4IzIbfEGMjz/fz+pRDV8fKqriB6Q="; - }; - x86_64-linux-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; - hash = "sha256-gZMNLCzW3j+eplBqWo6lVvuHS5iRqtMD8NL3MoszsVg="; - }; - x86_64-linux-cuda = { - url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip"; - hash = "sha256-dRu4F8k2SAbtghwrPJNyX0u3tsODCbXfi9EqUdf4xYc="; +version : builtins.getAttr version { + "1.10.0" = { + x86_64-darwin-cpu = { + name = "libtorch-macos-1.10.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.10.0.zip"; + hash = "sha256-HSisxHs466c6XwvZEbkV/1kVNBzJOy3uVw9Bh497Vk8="; + }; + x86_64-linux-cpu = { + name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcpu.zip"; + hash = "sha256-wAtA+AZx3HjaFbsrbyfkSXjYM0BP8H5HwCgyHbgJXJ0="; + }; + x86_64-linux-cuda = { + name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cu113.zip"; + url = "https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcu113.zip"; + hash = "sha256-jPylK4j0V8SEQ8cZU+O22P7kQ28wanIB0GkBzRGyTj8="; + }; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh new file mode 100755 index 000000000000..26b24198e235 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/libtorch" +CUDA_VERSION=cu113 + +url_and_key_list=( + "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip" + "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip" + "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip" +) + +hashfile="binary-hashes-$version.nix" +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$url" --name "$name")) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 116349746bf3..d22a87a92f3f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,4 +1,5 @@ { self +, fetchpatch , lib , openssl , zstd @@ -578,6 +579,18 @@ with self; propagatedBuildInputs = [ ppxlib ]; }; + ppx_python = janePackage { + pname = "ppx_python"; + hash = "0gk4nqz4i9v3hwjg5mvgpgwj0dfcgpyc7ikba93cafyhn6fy83zk"; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + # Compatibility with ppxlib 0.23 + patches = fetchpatch { + url = "https://github.com/janestreet/ppx_python/commit/b2fe0040cc39fa6164de868f8a20edb38d81170e.patch"; + sha256 = "sha256:1mrdwp0zw3dqavzx3ffrmzq5cdlninyf67ksavfzxb8gb16w6zpz"; + }; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + ppx_sexp_conv = janePackage { pname = "ppx_sexp_conv"; version = "0.14.3"; @@ -647,6 +660,13 @@ with self; propagatedBuildInputs = [ core_kernel ]; }; + pythonlib = janePackage { + pname = "pythonlib"; + hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; + meta.description = "A library to help writing wrappers around ocaml code for python"; + propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; + }; + re2 = janePackage { pname = "re2"; hash = "1j7dizls6lkz3i9dgf8nq2fm382mfbrmz72ci066zl3hkgdq8xwc"; diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index a81c817e4e07..0af203d8fb7b 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "15mdvrzvqpdvg9zkczzgzzc5v2ri3v5f17000mhxill1nhirxhqx"; + sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index f028fc33310c..7cdfbb66b26b 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VWXLBpShTp1MvJ9zhP58P9ZplVMetPUucq2II+2iG6M="; + sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 624d4f490e3c..1bba2b30be55 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/V1//Jo8wnoOHEotF2ElVm+vzTIwZ6EzssJg6WJw6g="; + sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603"; }; propagatedBuildInputs = [ @@ -35,11 +35,15 @@ buildPythonPackage rec { pytestFlagsArray = [ # disable tests which require being connected to the satellite "--ignore=blocksatcli/test_satip.py" + "--ignore=blocksatcli/api/test_listen.py" + "--ignore=blocksatcli/api/test_msg.py" "--ignore=blocksatcli/api/test_net.py" # disable tests which require being online "--ignore=blocksatcli/api/test_order.py" ]; + pythonImportsCheck = [ "blocksatcli" ]; + meta = with lib; { description = "Blockstream Satellite CLI"; homepage = "https://github.com/Blockstream/satellite"; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 022ab5a0b29c..16059fe3d6b5 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6"; + sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8"; }; # there are no tests diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 25ad1128d66b..58f23fba931c 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux_led"; - version = "0.24.21"; + version = "0.24.24"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw="; + sha256 = "sha256-99EHmhyc6lAjYPHFvvqnd5r8HeEEJM6W3VK0/yLsz7I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 7ec27a12db2d..fc268ba05a88 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = version; - sha256 = "1yzwzvlxz28rhnwhwsn37v7l7fxikzr4j7m293db9452w340p0zl"; + sha256 = "sha256-R3OjZyQMUDu8+QPe9y2j1SoWi1b7z/OYWY4wFXGG3zA="; }; propagatedBuildInputs = [ @@ -34,7 +34,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "frigidaire" ]; + pythonImportsCheck = [ + "frigidaire" + ]; meta = with lib; { description = "Python API for the Frigidaire devices"; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index d5cf044e4949..2fd95e676c96 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "0.12.4"; + version = "0.12.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = version; - sha256 = "sha256-8mrQTRR1erqo0oi9ltuiQX947qdvJLyF/nj80LvovV8="; + sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix index 8ea4d633f662..2784a0d2e2ee 100644 --- a/pkgs/development/python-modules/multitasking/default.nix +++ b/pkgs/development/python-modules/multitasking/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multitasking"; - version = "0.0.9"; + version = "0.0.10"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0"; + sha256 = "810640fa6670be41f4a712b287d9307a14ad849d966f06a17d2cf1593b66c3cd"; }; doCheck = false; # No tests included diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ad591163f081..ede91e7df913 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s="; + sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index ece47afad4e2..a91489f1aded 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "normality"; - version = "2.1.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "pudo"; repo = "normality"; rev = version; - sha256 = "WvpMs02vBGnCSPkxo6r6g4Di2fKkUr2SsBflTBxlhkU="; + sha256 = "n8Ycm5DeFItmMJTolazZKGIyN7CTg2ajDCwi/UqzVe8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index c04d0e2df088..a188daf6b428 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , poetry-core , textfsm , pytestCheckHook @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.3.2"; + version = "3.0.0"; format = "pyproject"; - disabled = isPy27; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "0sga86ajbh3a8wsb7q5mxzxhlg4fds8pr33ybjgi1sda4bvp2dvp"; + sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index d0ea1b198490..6241a7d86e46 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.6.0"; + version = "4.7.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww="; + sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix index 4ef79bc90716..1eeeb83a9dce 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/development/python-modules/pyp/default.nix @@ -11,13 +11,16 @@ buildPythonPackage rec { pname = "pyp"; - version = "0.3.4"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "hauntsaninja"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K9dGmvy4siurmhqwNfg1dT0TWc6tCSaxfPyaJkYM2Vw="; + sha256 = "09k7y77h7g4dg0x6lg9pn2ga9z7xiy4vlj15fj0991ffsi4ydqgm"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ @@ -27,6 +30,7 @@ buildPythonPackage rec { preCheck = '' export PATH=$out/bin:$PATH ''; + checkInputs = [ pytestCheckHook coreutils @@ -34,8 +38,12 @@ buildPythonPackage rec { bc ]; + pythonImportsCheck = [ + "pyp" + ]; + meta = with lib; { - description = "Easily run Python at the shell! Magical, but never mysterious."; + description = "Easily run Python at the shell! Magical, but never mysterious"; homepage = "https://github.com/hauntsaninja/pyp"; license = licenses.mit; maintainers = with maintainers; [ rmcgibbo ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cd41899c5810..635f9cd13daf 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.4.1"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-qmC7AL2ZNB0D5p3c8ozacNMKc2COzYzPJfz6KXwWsd0="; + sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1ca78b51e983..9b3668b59783 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-q7DNRCJrt4B/u7QV4MocxmlfEdLmJMP7umv3+PJjIoE="; + sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU="; }; propagatedBuildInputs = [ @@ -35,12 +36,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; # tests access network doCheck = false; - pythonImportsCheck = [ "tibber" ]; + pythonImportsCheck = [ + "tibber" + ]; meta = with lib; { description = "Python library to communicate with Tibber"; diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index e9bc58321df5..f570a0a5c95a 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.9.1"; + version = "1.10.0"; in buildPythonPackage { inherit version; @@ -59,13 +59,19 @@ in buildPythonPackage { done ''; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + pythonImportsCheck = [ "torch" ]; meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; - license = licenses.unfree; # Includes CUDA and Intel MKL. + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 0fbf9ae91287..dd3e5dc1ae3e 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -6,21 +6,21 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.9.1" = { + "1.10.0" = { x86_64-linux-37 = { - name = "torch-1.9.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-qzXbbpLX+ZlRv41oAyQRk3guU0n/6vuNzWw+nOieL6s="; + name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg="; }; x86_64-linux-38 = { - name = "torch-1.9.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-JUbcqugax08/iN1LKfXq0ohSpejmbKhbT0by7qMGAzw="; + name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM="; }; x86_64-linux-39 = { - name = "torch-1.9.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-wNLLtR9ZxKkVOTzwbAikM5H83pXyH+aPHVFyfrO4c1M="; + name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg="; }; }; } diff --git a/pkgs/development/python-modules/pytorch/prefetch.sh b/pkgs/development/python-modules/pytorch/prefetch.sh index 65007f11bf7b..debf26bfa20a 100755 --- a/pkgs/development/python-modules/pytorch/prefetch.sh +++ b/pkgs/development/python-modules/pytorch/prefetch.sh @@ -1,18 +1,19 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +set -eou pipefail + version=$1 -bucket="https://download.pytorch.org/whl/cu111" +bucket="https://download.pytorch.org/whl/cu113" url_and_key_list=( -"x86_64-linux-37 $bucket/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" -"x86_64-linux-38 $bucket/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" -"x86_64-linux-39 $bucket/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" ) -hashfile=binary-hashes-"$version".nix -rm -f $hashfile +hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f422934f02fb..570654dc7e15 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc"; + sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 2be02376360f..173458a634b6 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.0"; + version = "0.13.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f2efc02011b7240a9e851acd76ab81150a07d35c97021cb0517887539a328f8a"; + sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix new file mode 100644 index 000000000000..1f6ae80b0329 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchurl +, python +, pytorch-bin +, pythonOlder +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "torchaudio"; + version = "0.10.0"; + format = "wheel"; + + src = + let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; + unsupported = throw "Unsupported system"; + srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + in fetchurl srcs; + + disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10"); + + propagatedBuildInputs = [ + pytorch-bin + ]; + + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + + pythonImportsCheck = [ "torchaudio" ]; + + postFixup = '' + # Note: after patchelf'ing, libcudart can still not be found. However, this should + # not be an issue, because PyTorch is loaded before torchvision and brings + # in the necessary symbols. + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \ + "$out/${python.sitePackages}/torchaudio/_torchaudio.so" + ''; + + meta = with lib; { + description = "PyTorch audio library"; + homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ junjihashimoto ]; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix new file mode 100644 index 000000000000..764b9db426b9 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -0,0 +1,26 @@ +# Warning: Need to update at the same time as pytorch-bin +# +# Precompiled wheels can be found at: +# https://download.pytorch.org/whl/torch_stable.html + +# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. + +version : builtins.getAttr version { + "0.10.0" = { + x86_64-linux-37 = { + name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw="; + }; + x86_64-linux-38 = { + name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI="; + }; + x86_64-linux-39 = { + name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA="; + }; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh new file mode 100755 index 000000000000..4e62ab4ed359 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/whl/cu113" + +url_and_key_list=( + "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" +) + +hashfile=binary-hashes-"$version".nix +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index a69531f2d062..f7041dbb519d 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -15,7 +15,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.10.1"; + version = "0.11.1"; in buildPythonPackage { inherit version; @@ -36,6 +36,9 @@ in buildPythonPackage { pytorch-bin ]; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + pythonImportsCheck = [ "torchvision" ]; postFixup = let @@ -52,6 +55,9 @@ in buildPythonPackage { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ junjihashimoto ]; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 239db8bdb864..b608bab24409 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,21 +6,21 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.10.1" = { + "0.11.1" = { x86_64-linux-37 = { - name = "torchvision-0.10.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-1MdsCrOLGkYpfbtv011/b6QG+yKaE+O0jUKeUVj2BJY="; + name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I="; }; x86_64-linux-38 = { - name = "torchvision-0.10.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-LtmsnNSa9g3tCdjW1jhu7AZlGgfyYIVh5/2R+WwcxSo="; + name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE="; }; x86_64-linux-39 = { - name = "torchvision-0.10.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ZOC/angyiLeOhe+7dAs0W6XlQRKK00T/iI+aBgFNpA0="; + name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index f57ac96bdb63..686d1b3e6200 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -1,18 +1,19 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +set -eou pipefail + version=$1 -bucket="https://download.pytorch.org/whl/cu111" +bucket="https://download.pytorch.org/whl/cu113" url_and_key_list=( -"x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" -"x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" -"x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" ) -hashfile=binary-hashes-"$version".nix -rm -f $hashfile +hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix new file mode 100644 index 000000000000..b7b7fbc32738 --- /dev/null +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "vehicle"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-vehicle"; + rev = "v${version}"; + sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + yarl + ]; + + checkInputs = [ + 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 = [ + "vehicle" + ]; + + meta = with lib; { + description = "Python client providing RDW vehicle information"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 391e1656749a..1cb2780cc948 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { sed -i -e '/argparse/d' setup.py ''; + pythonImportsCheck = [ "zfec" ]; + meta = with lib; { homepage = "https://github.com/tahoe-lafs/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3118946c6bf0..0bf46ed1b13e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.571"; + version = "2.0.574"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-cmSZHqR1BfVWXoUSJ3Et5TTdeUWklNA4egKLP4xKjw8="; + sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ="; }; nativeBuildInputs = with py.pkgs; [ @@ -70,6 +70,9 @@ buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + aiodns + aiohttp + aiomultiprocess bc-python-hcl2 boto3 cachetools @@ -98,7 +101,11 @@ buildPythonApplication rec { ]; checkInputs = with py.pkgs; [ + aioresponses jsonschema + mock + pytest-asyncio + pytest-mock pytest-xdist pytestCheckHook ]; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 3d345e68f3c3..2c05a4aa271e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -21,11 +21,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.61"; + version = "5.62"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs="; + sha256 = "sha256-OAkKW3UOF/wI0+UheO2NMlTF9L0sSIMNXBlVuI47wMI="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f6c95acf4c6f..1c05b7b77d26 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,22 +2,22 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.254-hardened1.patch", - "sha256": "1mg4zims7ckb0ddnnahk1cj73lhdh7x7xkjz4cgsvwndw0qvmhdi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.254-hardened1/linux-hardened-4.14.254-hardened1.patch" + "name": "linux-hardened-4.14.255-hardened1.patch", + "sha256": "0d84jwf9vd86qzxq8aqcyrzmwczf3qh2f7a801qsgzb96fyvakrl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.255-hardened1/linux-hardened-4.14.255-hardened1.patch" }, - "sha256": "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz", - "version": "4.14.254" + "sha256": "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh", + "version": "4.14.255" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.216-hardened1.patch", - "sha256": "0a8rg0lc0pj6zlkbrd3fjrjgg3f18918zzs8q4nld092hqjfjbsm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.216-hardened1/linux-hardened-4.19.216-hardened1.patch" + "name": "linux-hardened-4.19.217-hardened1.patch", + "sha256": "1brx4dvh8acq1r5mbh2a5d95k3n7m4x3jnqnp0s69p3fx9gf1kxh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.217-hardened1/linux-hardened-4.19.217-hardened1.patch" }, - "sha256": "0cs8yy5jfbvvi5j9f3kzyc4j0fjylxdj1641f53ga6gkmjmayv3d", - "version": "4.19.216" + "sha256": "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5", + "version": "4.19.217" }, "5.10": { "patch": { @@ -32,21 +32,31 @@ "5.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.14.17-hardened1.patch", - "sha256": "08s26hmmaji51aczh9spbg8ngbxz5mr067dgi05djp3cgs2hl5pw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.17-hardened1/linux-hardened-5.14.17-hardened1.patch" + "name": "linux-hardened-5.14.18-hardened1.patch", + "sha256": "1mk159nwkdd1kwsp9l7328x8mk7i5k3sw4nk858zr8izgllqijlp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.18-hardened1/linux-hardened-5.14.18-hardened1.patch" }, - "sha256": "0q7df51yk6di1m8ky0gplkyx6smlr9inxrd569qv3ww3ykg933sd", - "version": "5.14.17" + "sha256": "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis", + "version": "5.14.18" + }, + "5.15": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-5.15.2-hardened1.patch", + "sha256": "15r7vkflcrj1hxfvhycqfflb3625br10qvn1ixhsv14xxdf3h39c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.2-hardened1/linux-hardened-5.15.2-hardened1.patch" + }, + "sha256": "0xdi799k15l7l9kxlq4qbp79mp1c38vxal4z4p9l5gl194x06d2n", + "version": "5.15.2" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.158-hardened1.patch", - "sha256": "1pnxwvy5x04b95bfia63916qlrj5mrp2d54dcc4hg5k29vm0z6a5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.158-hardened1/linux-hardened-5.4.158-hardened1.patch" + "name": "linux-hardened-5.4.159-hardened1.patch", + "sha256": "1hzs6sqdyzddz0qwq4b6c7rcihbjgzq73ng6fma408c27y72d6pi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.159-hardened1/linux-hardened-5.4.159-hardened1.patch" }, - "sha256": "0ncdkf1iz49458k3dvq3dc5b2r9dp21jsn3ffm9lbhlgvkn8y0bf", - "version": "5.4.158" + "sha256": "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p", + "version": "5.4.159" } } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 6ef781f6095c..c8d42ddda746 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.73-rt54"; # updated by ./update-rt.sh + version = "5.10.78-rt55"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; + sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk"; + sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix deleted file mode 100644 index 5d1b14f1d0f0..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildLinux, fetchurl -, kernelPatches ? [ ] -, structuredExtraConfig ? {} -, extraMeta ? {} -, argsOverride ? {} -, ... } @ args: - -let - version = "5.11.4-rt11"; # updated by ./update-rt.sh - branch = lib.versions.majorMinor version; - kversion = builtins.elemAt (lib.splitString "-" version) 0; -in buildLinux (args // { - inherit version; - - # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. - modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version - else lib.replaceStrings ["-"] [".0-"] version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"; - }; - - kernelPatches = let rt-patch = { - name = "rt"; - patch = fetchurl { - url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc"; - }; - }; in [ rt-patch ] ++ kernelPatches; - - structuredExtraConfig = with lib.kernel; { - PREEMPT_RT = yes; - # Fix error: unused option: PREEMPT_RT. - EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) - # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). - PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. - # Fix error: unused option: RT_GROUP_SCHED. - RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. - } // structuredExtraConfig; - - extraMeta = extraMeta // { - inherit branch; - }; -} // argsOverride) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8e2345ec3a4e..818452ba2013 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -215,8 +215,8 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_14; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to the latest release. version = "2.1.1"; @@ -226,8 +226,8 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_14; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dbd447a41f8a..37b078adefa1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.11.3"; + version = "2021.11.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c98b054e52f6..59d2ee364b23 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -152,7 +152,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.3"; + hassVersion = "2021.11.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -169,7 +169,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "sha256-HycMb29niuUp7flRdWgrKSOcnr0l3PqjULCrgrwLrFw="; + sha256 = "sha256-411oqzC8VTD7CM9vM/M3m4zW0Ygf2g2hoAXAxGBv7iw="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index ffb4bc0c7e82..96b10829d865 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { makeWrapper "$dotnetDir/$binName" "${binPath}" \ --add-flags "$binDir/$binName.dll" \ --argv0 "$binName" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib icu66 ffmpeg openssl ]}" \ --prefix PATH : "$dotnetDir" \ --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \ --run "cd $binDir" \ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 04774e851b3e..913367084ed2 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -241,13 +241,14 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs"; } '' - mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions} + mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin - cp -r ${ceph}/sbin/mount.ceph $out/sbin - cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin - cp -r ${ceph}/${sitePackages} $out/${sitePackages} + cp -r ${ceph}/sbin/mount.ceph $out/bin + cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin + ln -s bin $out/sbin + cp -r ${ceph}/${sitePackages}/* $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index b1a374f0349d..705b2397c6ac 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1ryygy7lalmwnv9kc8q4920gkdx878izy33a5dgxb780sy2qq8pg"; + sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/bpb/default.nix b/pkgs/tools/security/bpb/default.nix index 121c5674c08c..4d601aac1553 100644 --- a/pkgs/tools/security/bpb/default.nix +++ b/pkgs/tools/security/bpb/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, Security }: rustPlatform.buildRustPackage rec { @@ -20,6 +21,8 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "Tool to automatically sign git commits, replacing gpg for that purpose"; homepage = "https://github.com/withoutboats/bpb"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 06c6d0bac26c..f35eecca05a9 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-0/ZKki+QJpBL+K3zQ0H5d5cfan+pKEYHwr6y4U+FKzM="; + sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 2d2816dac0f0..6bdf428b199b 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -19,12 +19,20 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI="; + postPatch = '' + # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working + # vaultwarden when using RUSTC_BOOTSTRAP=1 + sed -ri 's/^rust-version = .*//g' Cargo.toml + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; + # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. + # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. RUSTC_BOOTSTRAP = 1; cargoBuildFlags = [ featuresFlag ]; @@ -42,6 +50,6 @@ in rustPlatform.buildRustPackage rec { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; - maintainers = with maintainers; [ msteen ]; + maintainers = with maintainers; [ msteen ivan ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fb1dfeab71b0..207072b39318 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -462,7 +462,6 @@ mapAliases ({ linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; - linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; @@ -490,7 +489,6 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; linux_5_14 = linuxKernel.kernels.linux_5_14; linux_5_15 = linuxKernel.kernels.linux_5_15; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2a8025e1d17..86048e1d7bfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,7 +2228,7 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - bpb = callPackage ../tools/security/bpb { }; + bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; bpytop = callPackage ../tools/system/bpytop { }; @@ -22120,6 +22120,8 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; + linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; + linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8c97a418b295..e109cca82077 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -159,14 +159,6 @@ in { ]; }; - linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -233,6 +225,7 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { }; + linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -482,7 +475,6 @@ in { # realtime kernel packages linux_rt_5_4 = packagesFor kernels.linux_rt_5_4; linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; - linux_rt_5_11 = packagesFor kernels.linux_rt_5_11; }; rpiPackages = { @@ -506,6 +498,7 @@ in { linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { }); + linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -524,7 +517,7 @@ in { linux_latest = packages.linux_5_15; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; - linux_rt_latest = packages.linux_rt_5_11; + linux_rt_latest = packages.linux_rt_5_10; linux_hardkernel_latest = packages.hardkernel_4_14; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 74691f1df2d2..b2d2d2415e24 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1459,7 +1459,7 @@ let if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; - inherit (pkgs) lib openssl zstd; + inherit (pkgs) fetchpatch lib openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 840a7fbe1f6c..9c5805362e50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9342,6 +9342,8 @@ in { toposort = callPackage ../development/python-modules/toposort { }; + torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { }; + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; torchvision = callPackage ../development/python-modules/torchvision { }; @@ -9694,6 +9696,8 @@ in { vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; + vehicle = callPackage ../development/python-modules/vehicle { }; + vega = callPackage ../development/python-modules/vega { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; |