commit 617d1d1f174b684df15cb715088e60940a800ce8 · pyrox.dev/nixpkgs

+1

nixos/tests/kernel-generic.nix

···

       29
       29
        
             linux_4_19_hardened

     

       30
       30
        
             linux_5_4_hardened

     

       31
       31
        
             linux_5_10_hardened

     

       32
       32
       +
             linux_5_15_hardened

     

       32
       33
        
       

     

       33
       34
        
             linux_testing;

     

       34
       35
        
         };

+3 -3

pkgs/applications/misc/visidata/default.nix

···

       25
       25
        
       }:

     

       26
       26
        
       buildPythonApplication rec {

     

       27
       27
        
         pname = "visidata";

     

       28
       28
       -
         version = "2.7";

     

       28
       28
       +
         version = "2.7.1";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchFromGitHub {

     

       31
       31
        
           owner = "saulpw";

     

       32
       32
        
           repo = "visidata";

     

       33
       33
        
           rev = "v${version}";

     

       34
       34
       -
           sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h";

     

       34
       34
       +
           sha256 = "13s1541n1sr2rkfk1qpsm61y2q773x6fs4cwin660qq4bzmgymhy";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         propagatedBuildInputs = [

     
···

       90
       90
        
         meta = {

     

       91
       91
        
           description = "Interactive terminal multitool for tabular data";

     

       92
       92
        
           license = lib.licenses.gpl3;

     

       93
       93
       -
           maintainers = [ lib.maintainers.raskin ];

     

       93
       93
       +
           maintainers = with lib.maintainers; [ raskin markus1189 ];

     

       94
       94
        
           homepage = "http://visidata.org/";

     

       95
       95
        
           changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md";

     

       96
       96
        
         };

+3 -3

pkgs/applications/networking/znc/modules.nix

···

       43
       43
        
       

     

       44
       44
        
         clientbuffer = zncDerivation rec {

     

       45
       45
        
           pname = "znc-clientbuffer";

     

       46
       46
       -
           version = "unstable-2020-04-24";

     

       46
       46
       +
           version = "unstable-2021-05-30";

     

       47
       47
        
           module_name = "clientbuffer";

     

       48
       48
        
       

     

       49
       49
        
           src = fetchFromGitHub {

     

       50
       50
        
             owner = "CyberShadow";

     

       51
       51
        
             repo = "znc-clientbuffer";

     

       52
       52
       -
             rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa";

     

       53
       53
       -
             sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh";

     

       52
       52
       +
             rev = "9a7465b413b53408f5d7af86e84b1d08efb6bec0";

     

       53
       53
       +
             sha256 = "0a3f4j6s5j7p53y42zrgpqyl2zm0jxb69lp24j6mni3licigh254";

     

       54
       54
        
           };

     

       55
       55
        
       

     

       56
       56
        
           meta = with lib; {

+8 -5

pkgs/applications/version-management/fossil/default.nix

···

       6
       6
        
       , zlib

     

       7
       7
        
       , openssl

     

       8
       8
        
       , readline

     

       9
       9
       +
       , withInternalSqlite ? true

     

       9
       10
        
       , sqlite

     

       10
       11
        
       , ed

     

       11
       12
        
       , which

     
···

       15
       16
        
       

     

       16
       17
        
       stdenv.mkDerivation rec {

     

       17
       18
        
         pname = "fossil";

     

       18
       18
       -
         version = "2.16";

     

       19
       19
       +
         version = "2.17";

     

       19
       20
        
       

     

       20
       21
        
         src = fetchurl {

     

       21
       22
        
           url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";

     

       22
       22
       -
           sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy";

     

       23
       23
       +
           sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       26
        
         nativeBuildInputs = [ installShellFiles tcl tcllib ];

     

       26
       27
        
       

     

       27
       27
       -
         buildInputs = [ zlib openssl readline sqlite which ed ]

     

       28
       28
       -
           ++ lib.optional stdenv.isDarwin libiconv;

     

       28
       28
       +
         buildInputs = [ zlib openssl readline which ed ]

     

       29
       29
       +
           ++ lib.optional stdenv.isDarwin libiconv

     

       30
       30
       +
           ++ lib.optional (!withInternalSqlite) sqlite;

     

       29
       31
        
       

     

       30
       32
        
         enableParallelBuilding = true;

     

       31
       33
        
       

     

       32
       34
        
         doCheck = stdenv.hostPlatform == stdenv.buildPlatform;

     

       33
       35
        
       

     

       34
       34
       -
         configureFlags = [ "--disable-internal-sqlite" ]

     

       36
       36
       +
         configureFlags =

     

       37
       37
       +
           lib.optional (!withInternalSqlite) "--disable-internal-sqlite"

     

       35
       38
        
           ++ lib.optional withJson "--json";

     

       36
       39
        
       

     

       37
       40
        
         preBuild = ''

+24 -44

pkgs/development/libraries/science/math/libtorch/bin.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchzip

     

       4
       4
        
       , lib

     

       5
       5
       +
       , libcxx

     

       5
       6
        
       

     

       6
       7
        
       , addOpenGLRunpath

     

       7
       8
        
       , patchelf

     

       8
       9
        
       , fixDarwinDylibNames

     

       9
       10
        
       

     

       10
       11
        
       , cudaSupport

     

       11
       11
       -
       , cudatoolkit_11_1

     

       12
       12
       -
       , cudnn_cudatoolkit_11_1

     

       13
       12
        
       }:

     

       14
       13
        
       

     

       15
       14
        
       let

     
···

       18
       17
        
         # this derivation. However, we should ensure on version bumps

     

       19
       18
        
         # that the CUDA toolkit for `passthru.tests` is still

     

       20
       19
        
         # up-to-date.

     

       21
       21
       -
         version = "1.9.0";

     

       20
       20
       +
         version = "1.10.0";

     

       22
       21
        
         device = if cudaSupport then "cuda" else "cpu";

     

       23
       22
        
         srcs = import ./binary-hashes.nix version;

     

       24
       23
        
         unavailable = throw "libtorch is not available for this platform";

     

       24
       24
       +
         libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib;

     

       25
       25
        
       in stdenv.mkDerivation {

     

       26
       26
        
         inherit version;

     

       27
       27
        
         pname = "libtorch";

     
···

       67
       67
        
             ''}

     

       68
       68
        
           done

     

       69
       69
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       70
       70
       -
           install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib

     

       71
       71
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib

     

       72
       72
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib

     

       73
       73
       -
           install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib

     

       74
       74
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib

     

       75
       75
       -
       

     

       76
       76
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib

     

       77
       77
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib

     

       78
       78
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib

     

       79
       79
       -
       

     

       80
       80
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib

     

       81
       81
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib

     

       82
       82
       -
           install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib

     

       83
       83
       -
       

     

       84
       84
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib

     

       85
       85
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib

     

       86
       86
       -
           install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib

     

       87
       87
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib

     

       88
       88
       -
       

     

       89
       89
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib

     

       90
       90
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib

     

       91
       91
       -
           install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib

     

       92
       92
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib

     

       93
       93
       -
       

     

       94
       94
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib

     

       95
       95
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib

     

       96
       96
       -
           install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib

     

       97
       97
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib

     

       98
       98
       -
       

     

       99
       99
       -
           install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib

     

       100
       100
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib

     

       101
       101
       -
           install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib

     

       102
       102
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib

     

       103
       103
       -
       

     

       104
       104
       -
           install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib

     

       105
       105
       -
           install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib

     

       70
       70
       +
           for f in $out/lib/*.dylib; do

     

       71
       71
       +
               otool -L $f

     

       72
       72
       +
           done

     

       73
       73
       +
           for f in $out/lib/*.dylib; do

     

       74
       74
       +
             install_name_tool -id $out/lib/$(basename $f) $f || true

     

       75
       75
       +
             for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do

     

       76
       76
       +
               install_name_tool -change $rpath $out/lib/$(basename $rpath) $f

     

       77
       77
       +
             done

     

       78
       78
       +
             if otool -L $f | grep /usr/lib/libc++ >& /dev/null; then

     

       79
       79
       +
               install_name_tool -change /usr/lib/libc++.1.dylib ${libcxx-for-libtorch.outPath}/lib/libc++.1.0.dylib $f

     

       80
       80
       +
             fi

     

       81
       81
       +
           done

     

       82
       82
       +
           for f in $out/lib/*.dylib; do

     

       83
       83
       +
               otool -L $f

     

       84
       84
       +
           done

     

       106
       85
        
         '';

     

       107
       86
        
       

     

       108
       87
        
         outputs = [ "out" "dev" ];

     

       109
       88
        
       

     

       110
       89
        
         passthru.tests.cmake = callPackage ./test {

     

       111
       90
        
           inherit cudaSupport;

     

       112
       112
       -
           cudatoolkit = cudatoolkit_11_1;

     

       113
       113
       -
           cudnn = cudnn_cudatoolkit_11_1;

     

       114
       91
        
         };

     

       115
       92
        
       

     

       116
       93
        
         meta = with lib; {

     

       117
       94
        
           description = "C++ API of the PyTorch machine learning framework";

     

       118
       95
        
           homepage = "https://pytorch.org/";

     

       119
       119
       -
           license = licenses.unfree; # Includes CUDA and Intel MKL.

     

       120
       120
       -
           maintainers = with maintainers; [ ];

     

       121
       121
       -
           platforms = with platforms; linux ++ darwin;

     

       96
       96
       +
           # Includes CUDA and Intel MKL, but redistributions of the binary are not limited.

     

       97
       97
       +
           # https://docs.nvidia.com/cuda/eula/index.html

     

       98
       98
       +
           # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html

     

       99
       99
       +
           license = licenses.bsd3;

     

       100
       100
       +
           maintainers = with maintainers; [ junjihashimoto ];

     

       101
       101
       +
           platforms = platforms.unix;

     

       122
       102
        
         };

     

       123
       103
        
       }

+17 -12

pkgs/development/libraries/science/math/libtorch/binary-hashes.nix

···

       1
       1
       -
       version: {

     

       2
       2
       -
         x86_64-darwin-cpu = {

     

       3
       3
       -
           url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip";

     

       4
       4
       -
           hash = "sha256-TOJ+iQpqazta46y4IzIbfEGMjz/fz+pRDV8fKqriB6Q=";

     

       5
       5
       -
         };

     

       6
       6
       -
         x86_64-linux-cpu = {

     

       7
       7
       -
           url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip";

     

       8
       8
       -
           hash = "sha256-gZMNLCzW3j+eplBqWo6lVvuHS5iRqtMD8NL3MoszsVg=";

     

       9
       9
       -
         };

     

       10
       10
       -
         x86_64-linux-cuda = {

     

       11
       11
       -
           url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip";

     

       12
       12
       -
           hash = "sha256-dRu4F8k2SAbtghwrPJNyX0u3tsODCbXfi9EqUdf4xYc=";

     

       1
       1
       +
       version : builtins.getAttr version {

     

       2
       2
       +
         "1.10.0" = {

     

       3
       3
       +
           x86_64-darwin-cpu = {

     

       4
       4
       +
             name = "libtorch-macos-1.10.0.zip";

     

       5
       5
       +
             url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.10.0.zip";

     

       6
       6
       +
             hash = "sha256-HSisxHs466c6XwvZEbkV/1kVNBzJOy3uVw9Bh497Vk8=";

     

       7
       7
       +
           };

     

       8
       8
       +
           x86_64-linux-cpu = {

     

       9
       9
       +
             name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cpu.zip";

     

       10
       10
       +
             url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcpu.zip";

     

       11
       11
       +
             hash = "sha256-wAtA+AZx3HjaFbsrbyfkSXjYM0BP8H5HwCgyHbgJXJ0=";

     

       12
       12
       +
           };

     

       13
       13
       +
           x86_64-linux-cuda = {

     

       14
       14
       +
             name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cu113.zip";

     

       15
       15
       +
             url = "https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcu113.zip";

     

       16
       16
       +
             hash = "sha256-jPylK4j0V8SEQ8cZU+O22P7kQ28wanIB0GkBzRGyTj8=";

     

       17
       17
       +
           };

     

       13
       18
        
         };

     

       14
       19
        
       }

+38

pkgs/development/libraries/science/math/libtorch/prefetch.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p nix-prefetch-scripts

     

       3
       3
       +
       

     

       4
       4
       +
       set -eou pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       version=$1

     

       7
       7
       +
       

     

       8
       8
       +
       bucket="https://download.pytorch.org/libtorch"

     

       9
       9
       +
       CUDA_VERSION=cu113

     

       10
       10
       +
       

     

       11
       11
       +
       url_and_key_list=(

     

       12
       12
       +
         "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip"

     

       13
       13
       +
         "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip"

     

       14
       14
       +
         "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"

     

       15
       15
       +
       )

     

       16
       16
       +
       

     

       17
       17
       +
       hashfile="binary-hashes-$version.nix"

     

       18
       18
       +
       echo "  \"$version\" = {" >> $hashfile

     

       19
       19
       +
       

     

       20
       20
       +
       for url_and_key in "${url_and_key_list[@]}"; do

     

       21
       21
       +
         key=$(echo "$url_and_key" | cut -d' ' -f1)

     

       22
       22
       +
         url=$(echo "$url_and_key" | cut -d' ' -f2)

     

       23
       23
       +
         name=$(echo "$url_and_key" | cut -d' ' -f3)

     

       24
       24
       +
       

     

       25
       25
       +
         echo "prefetching ${url}..."

     

       26
       26
       +
         hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$url" --name "$name"))

     

       27
       27
       +
       

     

       28
       28
       +
         echo "    $key = {" >> $hashfile

     

       29
       29
       +
         echo "      name = \"$name\";" >> $hashfile

     

       30
       30
       +
         echo "      url = \"$url\";" >> $hashfile

     

       31
       31
       +
         echo "      hash = \"$hash\";" >> $hashfile

     

       32
       32
       +
         echo "    };" >> $hashfile

     

       33
       33
       +
       

     

       34
       34
       +
         echo

     

       35
       35
       +
       done

     

       36
       36
       +
       

     

       37
       37
       +
       echo "  };" >> $hashfile

     

       38
       38
       +
       echo "done."

+20

pkgs/development/ocaml-modules/janestreet/0.14.nix

···

       1
       1
        
       { self

     

       2
       2
       +
       , fetchpatch

     

       2
       3
        
       , lib

     

       3
       4
        
       , openssl

     

       4
       5
        
       , zstd

     
···

       578
       579
        
           propagatedBuildInputs = [ ppxlib ];

     

       579
       580
        
         };

     

       580
       581
        
       

     

       582
       582
       +
         ppx_python = janePackage {

     

       583
       583
       +
           pname = "ppx_python";

     

       584
       584
       +
           hash = "0gk4nqz4i9v3hwjg5mvgpgwj0dfcgpyc7ikba93cafyhn6fy83zk";

     

       585
       585
       +
           meta.description = "A [@@deriving] plugin to generate Python conversion functions ";

     

       586
       586
       +
           # Compatibility with ppxlib 0.23

     

       587
       587
       +
           patches = fetchpatch {

     

       588
       588
       +
             url = "https://github.com/janestreet/ppx_python/commit/b2fe0040cc39fa6164de868f8a20edb38d81170e.patch";

     

       589
       589
       +
             sha256 = "sha256:1mrdwp0zw3dqavzx3ffrmzq5cdlninyf67ksavfzxb8gb16w6zpz";

     

       590
       590
       +
           };

     

       591
       591
       +
           propagatedBuildInputs = [ ppx_base ppxlib pyml ];

     

       592
       592
       +
         };

     

       593
       593
       +
       

     

       581
       594
        
         ppx_sexp_conv = janePackage {

     

       582
       595
        
           pname = "ppx_sexp_conv";

     

       583
       596
        
           version = "0.14.3";

     
···

       645
       658
        
           hash = "0lfblv2yqw01bl074ga6vxii0p9mqwlqw1g9b9z7pfdva9wqilrd";

     

       646
       659
        
           meta.description = "Protocol versioning";

     

       647
       660
        
           propagatedBuildInputs = [ core_kernel ];

     

       661
       661
       +
         };

     

       662
       662
       +
       

     

       663
       663
       +
         pythonlib = janePackage {

     

       664
       664
       +
           pname = "pythonlib";

     

       665
       665
       +
           hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639";

     

       666
       666
       +
           meta.description = "A library to help writing wrappers around ocaml code for python";

     

       667
       667
       +
           propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ];

     

       648
       668
        
         };

     

       649
       669
        
       

     

       650
       670
        
         re2 = janePackage {

+2 -2

pkgs/development/python-modules/aiolookin/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "aiolookin";

     

       14
       14
       -
         version = "0.0.3";

     

       14
       14
       +
         version = "0.0.4";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.8";

     
···

       20
       20
        
           owner = "ANMalko";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           sha256 = "15mdvrzvqpdvg9zkczzgzzc5v2ri3v5f17000mhxill1nhirxhqx";

     

       23
       23
       +
           sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/asyncssh/default.nix

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "asyncssh";

     

       21
       21
       -
         version = "2.8.0";

     

       21
       21
       +
         version = "2.8.1";

     

       22
       22
        
         format = "setuptools";

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.6";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchPypi {

     

       27
       27
        
           inherit pname version;

     

       28
       28
       -
           sha256 = "sha256-VWXLBpShTp1MvJ9zhP58P9ZplVMetPUucq2II+2iG6M=";

     

       28
       28
       +
           sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         propagatedBuildInputs = [

+6 -2

pkgs/development/python-modules/blocksat-cli/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "blocksat-cli";

     

       16
       16
       -
         version = "0.4.0";

     

       16
       16
       +
         version = "0.4.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-g/V1//Jo8wnoOHEotF2ElVm+vzTIwZ6EzssJg6WJw6g=";

     

       20
       20
       +
           sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

     
···

       35
       35
        
         pytestFlagsArray = [

     

       36
       36
        
           # disable tests which require being connected to the satellite

     

       37
       37
        
           "--ignore=blocksatcli/test_satip.py"

     

       38
       38
       +
           "--ignore=blocksatcli/api/test_listen.py"

     

       39
       39
       +
           "--ignore=blocksatcli/api/test_msg.py"

     

       38
       40
        
           "--ignore=blocksatcli/api/test_net.py"

     

       39
       41
        
           # disable tests which require being online

     

       40
       42
        
           "--ignore=blocksatcli/api/test_order.py"

     

       41
       43
        
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         pythonImportsCheck = [ "blocksatcli" ];

     

       42
       46
        
       

     

       43
       47
        
         meta = with lib; {

     

       44
       48
        
           description = "Blockstream Satellite CLI";

+2 -2

pkgs/development/python-modules/cogapp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "cogapp";

     

       5
       5
       -
         version = "3.1.0";

     

       5
       5
       +
         version = "3.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6";

     

       9
       9
       +
           sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # there are no tests

+2 -2

pkgs/development/python-modules/flux-led/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "flux_led";

     

       11
       11
       -
         version = "0.24.21";

     

       11
       11
       +
         version = "0.24.24";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     

       14
       14
        
       

     
···

       16
       16
        
           owner = "Danielhiversen";

     

       17
       17
        
           repo = "flux_led";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw=";

     

       19
       19
       +
           sha256 = "sha256-99EHmhyc6lAjYPHFvvqnd5r8HeEEJM6W3VK0/yLsz7I=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+5 -3

pkgs/development/python-modules/frigidaire/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "frigidaire";

     

       14
       14
       -
         version = "0.16";

     

       14
       14
       +
         version = "0.17";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.8";

     
···

       20
       20
        
           owner = "bm1549";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = version;

     

       23
       23
       -
           sha256 = "1yzwzvlxz28rhnwhwsn37v7l7fxikzr4j7m293db9452w340p0zl";

     

       23
       23
       +
           sha256 = "sha256-R3OjZyQMUDu8+QPe9y2j1SoWi1b7z/OYWY4wFXGG3zA=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

     
···

       34
       34
        
         # Project has no tests

     

       35
       35
        
         doCheck = false;

     

       36
       36
        
       

     

       37
       37
       -
         pythonImportsCheck = [ "frigidaire" ];

     

       37
       37
       +
         pythonImportsCheck = [

     

       38
       38
       +
           "frigidaire"

     

       39
       39
       +
         ];

     

       38
       40
        
       

     

       39
       41
        
         meta = with lib; {

     

       40
       42
        
           description = "Python API for the Frigidaire devices";

+2 -2

pkgs/development/python-modules/greeclimate/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "greeclimate";

     

       13
       13
       -
         version = "0.12.4";

     

       13
       13
       +
         version = "0.12.5";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.6";

     
···

       19
       19
        
           owner = "cmroche";

     

       20
       20
        
           repo = "greeclimate";

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-8mrQTRR1erqo0oi9ltuiQX947qdvJLyF/nj80LvovV8=";

     

       22
       22
       +
           sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/multitasking/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "multitasking";

     

       8
       8
       -
         version = "0.0.9";

     

       8
       8
       +
         version = "0.0.10";

     

       9
       9
        
       

     

       10
       10
        
         # GitHub source releases aren't tagged

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0";

     

       13
       13
       +
           sha256 = "810640fa6670be41f4a712b287d9307a14ad849d966f06a17d2cf1593b66c3cd";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;  # No tests included

+2 -2

pkgs/development/python-modules/nettigo-air-monitor/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "nettigo-air-monitor";

     

       15
       15
       -
         version = "1.2.0";

     

       15
       15
       +
         version = "1.2.1";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.8";

     
···

       21
       21
        
           owner = "bieniu";

     

       22
       22
        
           repo = pname;

     

       23
       23
        
           rev = version;

     

       24
       24
       -
           sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s=";

     

       24
       24
       +
           sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/normality/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "normality";

     

       12
       12
       -
         version = "2.1.3";

     

       12
       12
       +
         version = "2.2.5";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "pudo";

     

       16
       16
        
           repo = "normality";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "WvpMs02vBGnCSPkxo6r6g4Di2fKkUr2SsBflTBxlhkU=";

     

       18
       18
       +
           sha256 = "n8Ycm5DeFItmMJTolazZKGIyN7CTg2ajDCwi/UqzVe8=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+5 -4

pkgs/development/python-modules/ntc-templates/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , isPy27

     

       4
       4
       +
       , pythonOlder

     

       5
       5
        
       , poetry-core

     

       6
       6
        
       , textfsm

     

       7
       7
        
       , pytestCheckHook

     
···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "ntc-templates";

     

       14
       14
       -
         version = "2.3.2";

     

       14
       14
       +
         version = "3.0.0";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
       -
         disabled = isPy27;

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.6";

     

       17
       18
        
       

     

       18
       19
        
         src = fetchFromGitHub {

     

       19
       20
        
           owner = "networktocode";

     

       20
       21
        
           repo = pname;

     

       21
       22
        
           rev = "v${version}";

     

       22
       22
       -
           sha256 = "0sga86ajbh3a8wsb7q5mxzxhlg4fds8pr33ybjgi1sda4bvp2dvp";

     

       23
       23
       +
           sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       26
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/pwntools/default.nix

···

       27
       27
        
         debuggerName = lib.strings.getName debugger;

     

       28
       28
        
       in

     

       29
       29
        
       buildPythonPackage rec {

     

       30
       30
       -
         version = "4.6.0";

     

       30
       30
       +
         version = "4.7.0";

     

       31
       31
        
         pname = "pwntools";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchPypi {

     

       34
       34
        
           inherit pname version;

     

       35
       35
       -
           sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww=";

     

       35
       35
       +
           sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         postPatch = ''

+11 -3

pkgs/development/python-modules/pyp/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pyp";

     

       14
       14
       -
         version = "0.3.4";

     

       14
       14
       +
         version = "1.0.0";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.6";

     

       15
       18
        
       

     

       16
       19
        
         src = fetchFromGitHub {

     

       17
       20
        
           owner = "hauntsaninja";

     

       18
       21
        
           repo = pname;

     

       19
       22
        
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "sha256-K9dGmvy4siurmhqwNfg1dT0TWc6tCSaxfPyaJkYM2Vw=";

     

       23
       23
       +
           sha256 = "09k7y77h7g4dg0x6lg9pn2ga9z7xiy4vlj15fj0991ffsi4ydqgm";

     

       21
       24
        
         };

     

       22
       25
        
       

     

       23
       26
        
         propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [

     
···

       27
       30
        
         preCheck = ''

     

       28
       31
        
           export PATH=$out/bin:$PATH

     

       29
       32
        
         '';

     

       33
       33
       +
       

     

       30
       34
        
         checkInputs = [

     

       31
       35
        
           pytestCheckHook

     

       32
       36
        
           coreutils

     
···

       34
       38
        
           bc

     

       35
       39
        
         ];

     

       36
       40
        
       

     

       41
       41
       +
         pythonImportsCheck = [

     

       42
       42
       +
           "pyp"

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       37
       45
        
         meta = with lib; {

     

       38
       38
       -
           description = "Easily run Python at the shell! Magical, but never mysterious.";

     

       46
       46
       +
           description = "Easily run Python at the shell! Magical, but never mysterious";

     

       39
       47
        
           homepage = "https://github.com/hauntsaninja/pyp";

     

       40
       48
        
           license = licenses.mit;

     

       41
       49
        
           maintainers = with maintainers; [ rmcgibbo ];

+2 -2

pkgs/development/python-modules/python-socketio/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "python-socketio";

     

       17
       17
       -
         version = "5.4.1";

     

       17
       17
       +
         version = "5.5.0";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.6";

     
···

       23
       23
        
           owner = "miguelgrinberg";

     

       24
       24
        
           repo = "python-socketio";

     

       25
       25
        
           rev = "v${version}";

     

       26
       26
       -
           sha256 = "sha256-qmC7AL2ZNB0D5p3c8ozacNMKc2COzYzPJfz6KXwWsd0=";

     

       26
       26
       +
           sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+9 -4

pkgs/development/python-modules/pytibber/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "pytibber";

     

       15
       15
       -
         version = "0.20.0";

     

       15
       15
       +
         version = "0.21.0";

     

       16
       16
       +
         format = "setuptools";

     

       16
       17
        
       

     

       17
       18
        
         disabled = pythonOlder "3.7";

     

       18
       19
        
       

     
···

       20
       21
        
           owner = "Danielhiversen";

     

       21
       22
        
           repo = "pyTibber";

     

       22
       23
        
           rev = version;

     

       23
       23
       -
           sha256 = "sha256-q7DNRCJrt4B/u7QV4MocxmlfEdLmJMP7umv3+PJjIoE=";

     

       24
       24
       +
           sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU=";

     

       24
       25
        
         };

     

       25
       26
        
       

     

       26
       27
        
         propagatedBuildInputs = [

     
···

       35
       36
        
           pytestCheckHook

     

       36
       37
        
         ];

     

       37
       38
        
       

     

       38
       38
       -
         pytestFlagsArray = [ "test/test.py" ];

     

       39
       39
       +
         pytestFlagsArray = [

     

       40
       40
       +
           "test/test.py"

     

       41
       41
       +
         ];

     

       39
       42
        
       

     

       40
       43
        
         # tests access network

     

       41
       44
        
         doCheck = false;

     

       42
       45
        
       

     

       43
       43
       -
         pythonImportsCheck = [ "tibber" ];

     

       46
       46
       +
         pythonImportsCheck = [

     

       47
       47
       +
           "tibber"

     

       48
       48
       +
         ];

     

       44
       49
        
       

     

       45
       50
        
         meta = with lib; {

     

       46
       51
        
           description = "Python library to communicate with Tibber";

+8 -2

pkgs/development/python-modules/pytorch/bin.nix

···

       18
       18
        
         pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;

     

       19
       19
        
         srcs = import ./binary-hashes.nix version;

     

       20
       20
        
         unsupported = throw "Unsupported system";

     

       21
       21
       -
         version = "1.9.1";

     

       21
       21
       +
         version = "1.10.0";

     

       22
       22
        
       in buildPythonPackage {

     

       23
       23
        
         inherit version;

     

       24
       24
        
       

     
···

       59
       59
        
           done

     

       60
       60
        
         '';

     

       61
       61
        
       

     

       62
       62
       +
         # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.

     

       63
       63
       +
         dontStrip = true;

     

       64
       64
       +
       

     

       62
       65
        
         pythonImportsCheck = [ "torch" ];

     

       63
       66
        
       

     

       64
       67
        
         meta = with lib; {

     

       65
       68
        
           description = "Open source, prototype-to-production deep learning platform";

     

       66
       69
        
           homepage = "https://pytorch.org/";

     

       67
       70
        
           changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";

     

       68
       68
       -
           license = licenses.unfree; # Includes CUDA and Intel MKL.

     

       71
       71
       +
           # Includes CUDA and Intel MKL, but redistributions of the binary are not limited.

     

       72
       72
       +
           # https://docs.nvidia.com/cuda/eula/index.html

     

       73
       73
       +
           # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html

     

       74
       74
       +
           license = licenses.bsd3;

     

       69
       75
        
           platforms = platforms.linux;

     

       70
       76
        
           maintainers = with maintainers; [ junjihashimoto ];

     

       71
       77
        
         };

+10 -10

pkgs/development/python-modules/pytorch/binary-hashes.nix

···

       6
       6
        
       # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.

     

       7
       7
        
       

     

       8
       8
        
       version : builtins.getAttr version {

     

       9
       9
       -
         "1.9.1" = {

     

       9
       9
       +
         "1.10.0" = {

     

       10
       10
        
           x86_64-linux-37 = {

     

       11
       11
       -
             name = "torch-1.9.1-cp37-cp37m-linux_x86_64.whl";

     

       12
       12
       -
             url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl";

     

       13
       13
       -
             hash = "sha256-qzXbbpLX+ZlRv41oAyQRk3guU0n/6vuNzWw+nOieL6s=";

     

       11
       11
       +
             name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl";

     

       12
       12
       +
             url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";

     

       13
       13
       +
             hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg=";

     

       14
       14
        
           };

     

       15
       15
        
           x86_64-linux-38 = {

     

       16
       16
       -
             name = "torch-1.9.1-cp38-cp38-linux_x86_64.whl";

     

       17
       17
       -
             url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl";

     

       18
       18
       -
             hash = "sha256-JUbcqugax08/iN1LKfXq0ohSpejmbKhbT0by7qMGAzw=";

     

       16
       16
       +
             name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl";

     

       17
       17
       +
             url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl";

     

       18
       18
       +
             hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM=";

     

       19
       19
        
           };

     

       20
       20
        
           x86_64-linux-39 = {

     

       21
       21
       -
             name = "torch-1.9.1-cp39-cp39-linux_x86_64.whl";

     

       22
       22
       -
             url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl";

     

       23
       23
       -
             hash = "sha256-wNLLtR9ZxKkVOTzwbAikM5H83pXyH+aPHVFyfrO4c1M=";

     

       21
       21
       +
             name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl";

     

       22
       22
       +
             url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";

     

       23
       23
       +
             hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg=";

     

       24
       24
        
           };

     

       25
       25
        
         };

     

       26
       26
        
       }

+7 -6

pkgs/development/python-modules/pytorch/prefetch.sh

···

       1
       1
        
       #!/usr/bin/env nix-shell

     

       2
       2
        
       #!nix-shell -i bash -p nix-prefetch-scripts

     

       3
       3
        
       

     

       4
       4
       +
       set -eou pipefail

     

       5
       5
       +
       

     

       4
       6
        
       version=$1

     

       5
       7
        
       

     

       6
       6
       -
       bucket="https://download.pytorch.org/whl/cu111"

     

       8
       8
       +
       bucket="https://download.pytorch.org/whl/cu113"

     

       7
       9
        
       

     

       8
       10
        
       url_and_key_list=(

     

       9
       9
       -
       "x86_64-linux-37 $bucket/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"

     

       10
       10
       -
       "x86_64-linux-38 $bucket/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"

     

       11
       11
       -
       "x86_64-linux-39 $bucket/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"

     

       11
       11
       +
         "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"

     

       12
       12
       +
         "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"

     

       13
       13
       +
         "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"

     

       12
       14
        
       )

     

       13
       15
        
       

     

       14
       14
       -
       hashfile=binary-hashes-"$version".nix

     

       15
       15
       -
       rm -f $hashfile

     

       16
       16
       +
       hashfile="binary-hashes-$version.nix"

     

       16
       17
        
       echo "  \"$version\" = {" >> $hashfile

     

       17
       18
        
       

     

       18
       19
        
       for url_and_key in "${url_and_key_list[@]}"; do

+2 -2

pkgs/development/python-modules/rebulk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "rebulk";

     

       5
       5
       -
         version = "3.0.1";

     

       5
       5
       +
         version = "3.1.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc";

     

       9
       9
       +
           sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # Some kind of trickery with imports that doesn't work.

+2 -2

pkgs/development/python-modules/statsmodels/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "statsmodels";

     

       16
       16
       -
         version = "0.13.0";

     

       16
       16
       +
         version = "0.13.1";

     

       17
       17
        
         disabled = isPy27;

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "f2efc02011b7240a9e851acd76ab81150a07d35c97021cb0517887539a328f8a";

     

       21
       21
       +
           sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ cython ];

+52

pkgs/development/python-modules/torchaudio/bin.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchurl

     

       5
       5
       +
       , python

     

       6
       6
       +
       , pytorch-bin

     

       7
       7
       +
       , pythonOlder

     

       8
       8
       +
       , pythonAtLeast

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "torchaudio";

     

       13
       13
       +
         version = "0.10.0";

     

       14
       14
       +
         format = "wheel";

     

       15
       15
       +
       

     

       16
       16
       +
         src =

     

       17
       17
       +
           let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion;

     

       18
       18
       +
               unsupported = throw "Unsupported system";

     

       19
       19
       +
               srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;

     

       20
       20
       +
           in fetchurl srcs;

     

       21
       21
       +
       

     

       22
       22
       +
         disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10");

     

       23
       23
       +
       

     

       24
       24
       +
         propagatedBuildInputs = [

     

       25
       25
       +
           pytorch-bin

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.

     

       29
       29
       +
         dontStrip = true;

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [ "torchaudio" ];

     

       32
       32
       +
       

     

       33
       33
       +
         postFixup = ''

     

       34
       34
       +
           # Note: after patchelf'ing, libcudart can still not be found. However, this should

     

       35
       35
       +
           #       not be an issue, because PyTorch is loaded before torchvision and brings

     

       36
       36
       +
           #       in the necessary symbols.

     

       37
       37
       +
           patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \

     

       38
       38
       +
             "$out/${python.sitePackages}/torchaudio/_torchaudio.so"

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "PyTorch audio library";

     

       43
       43
       +
           homepage = "https://pytorch.org/";

     

       44
       44
       +
           changelog = "https://github.com/pytorch/audio/releases/tag/v${version}";

     

       45
       45
       +
           # Includes CUDA and Intel MKL, but redistributions of the binary are not limited.

     

       46
       46
       +
           # https://docs.nvidia.com/cuda/eula/index.html

     

       47
       47
       +
           # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html

     

       48
       48
       +
           license = licenses.bsd3;

     

       49
       49
       +
           platforms = platforms.linux;

     

       50
       50
       +
           maintainers = with maintainers; [ junjihashimoto ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+26

pkgs/development/python-modules/torchaudio/binary-hashes.nix

···

       1
       1
       +
       # Warning: Need to update at the same time as pytorch-bin

     

       2
       2
       +
       #

     

       3
       3
       +
       # Precompiled wheels can be found at:

     

       4
       4
       +
       # https://download.pytorch.org/whl/torch_stable.html

     

       5
       5
       +
       

     

       6
       6
       +
       # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.

     

       7
       7
       +
       

     

       8
       8
       +
       version : builtins.getAttr version {

     

       9
       9
       +
         "0.10.0" = {

     

       10
       10
       +
           x86_64-linux-37 = {

     

       11
       11
       +
             name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl";

     

       12
       12
       +
             url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";

     

       13
       13
       +
             hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw=";

     

       14
       14
       +
           };

     

       15
       15
       +
           x86_64-linux-38 = {

     

       16
       16
       +
             name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl";

     

       17
       17
       +
             url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl";

     

       18
       18
       +
             hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI=";

     

       19
       19
       +
           };

     

       20
       20
       +
           x86_64-linux-39 = {

     

       21
       21
       +
             name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl";

     

       22
       22
       +
             url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";

     

       23
       23
       +
             hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA=";

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+37

pkgs/development/python-modules/torchaudio/prefetch.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p nix-prefetch-scripts

     

       3
       3
       +
       

     

       4
       4
       +
       set -eou pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       version=$1

     

       7
       7
       +
       

     

       8
       8
       +
       bucket="https://download.pytorch.org/whl/cu113"

     

       9
       9
       +
       

     

       10
       10
       +
       url_and_key_list=(

     

       11
       11
       +
         "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl"

     

       12
       12
       +
         "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"

     

       13
       13
       +
         "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       hashfile=binary-hashes-"$version".nix

     

       17
       17
       +
       echo "  \"$version\" = {" >> $hashfile

     

       18
       18
       +
       

     

       19
       19
       +
       for url_and_key in "${url_and_key_list[@]}"; do

     

       20
       20
       +
         key=$(echo "$url_and_key" | cut -d' ' -f1)

     

       21
       21
       +
         url=$(echo "$url_and_key" | cut -d' ' -f2)

     

       22
       22
       +
         name=$(echo "$url_and_key" | cut -d' ' -f3)

     

       23
       23
       +
       

     

       24
       24
       +
         echo "prefetching ${url}..."

     

       25
       25
       +
         hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)

     

       26
       26
       +
       

     

       27
       27
       +
         echo "    $key = {" >> $hashfile

     

       28
       28
       +
         echo "      name = \"$name\";" >> $hashfile

     

       29
       29
       +
         echo "      url = \"$url\";" >> $hashfile

     

       30
       30
       +
         echo "      hash = \"$hash\";" >> $hashfile

     

       31
       31
       +
         echo "    };" >> $hashfile

     

       32
       32
       +
       

     

       33
       33
       +
         echo

     

       34
       34
       +
       done

     

       35
       35
       +
       

     

       36
       36
       +
       echo "  };" >> $hashfile

     

       37
       37
       +
       echo "done."

+7 -1

pkgs/development/python-modules/torchvision/bin.nix

···

       15
       15
        
         pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;

     

       16
       16
        
         srcs = import ./binary-hashes.nix version;

     

       17
       17
        
         unsupported = throw "Unsupported system";

     

       18
       18
       -
         version = "0.10.1";

     

       18
       18
       +
         version = "0.11.1";

     

       19
       19
        
       in buildPythonPackage {

     

       20
       20
        
         inherit version;

     

       21
       21
        
       

     
···

       36
       36
        
           pytorch-bin

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
       +
         # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.

     

       40
       40
       +
         dontStrip = true;

     

       41
       41
       +
       

     

       39
       42
        
         pythonImportsCheck = [ "torchvision" ];

     

       40
       43
        
       

     

       41
       44
        
         postFixup = let

     
···

       52
       55
        
           description = "PyTorch vision library";

     

       53
       56
        
           homepage = "https://pytorch.org/";

     

       54
       57
        
           changelog = "https://github.com/pytorch/vision/releases/tag/v${version}";

     

       58
       58
       +
           # Includes CUDA and Intel MKL, but redistributions of the binary are not limited.

     

       59
       59
       +
           # https://docs.nvidia.com/cuda/eula/index.html

     

       60
       60
       +
           # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html

     

       55
       61
        
           license = licenses.bsd3;

     

       56
       62
        
           platforms = platforms.linux;

     

       57
       63
        
           maintainers = with maintainers; [ junjihashimoto ];

+10 -10

pkgs/development/python-modules/torchvision/binary-hashes.nix

···

       6
       6
        
       # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.

     

       7
       7
        
       

     

       8
       8
        
       version : builtins.getAttr version {

     

       9
       9
       -
         "0.10.1" = {

     

       9
       9
       +
         "0.11.1" = {

     

       10
       10
        
           x86_64-linux-37 = {

     

       11
       11
       -
             name = "torchvision-0.10.1-cp37-cp37m-linux_x86_64.whl";

     

       12
       12
       -
             url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp37-cp37m-linux_x86_64.whl";

     

       13
       13
       -
             hash = "sha256-1MdsCrOLGkYpfbtv011/b6QG+yKaE+O0jUKeUVj2BJY=";

     

       11
       11
       +
             name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl";

     

       12
       12
       +
             url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl";

     

       13
       13
       +
             hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I=";

     

       14
       14
        
           };

     

       15
       15
        
           x86_64-linux-38 = {

     

       16
       16
       -
             name = "torchvision-0.10.1-cp38-cp38-linux_x86_64.whl";

     

       17
       17
       -
             url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp38-cp38-linux_x86_64.whl";

     

       18
       18
       -
             hash = "sha256-LtmsnNSa9g3tCdjW1jhu7AZlGgfyYIVh5/2R+WwcxSo=";

     

       16
       16
       +
             name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl";

     

       17
       17
       +
             url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl";

     

       18
       18
       +
             hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE=";

     

       19
       19
        
           };

     

       20
       20
        
           x86_64-linux-39 = {

     

       21
       21
       -
             name = "torchvision-0.10.1-cp39-cp39-linux_x86_64.whl";

     

       22
       22
       -
             url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp39-cp39-linux_x86_64.whl";

     

       23
       23
       -
             hash = "sha256-ZOC/angyiLeOhe+7dAs0W6XlQRKK00T/iI+aBgFNpA0=";

     

       21
       21
       +
             name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl";

     

       22
       22
       +
             url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl";

     

       23
       23
       +
             hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc=";

     

       24
       24
        
           };

     

       25
       25
        
         };

     

       26
       26
        
       }

+7 -6

pkgs/development/python-modules/torchvision/prefetch.sh

···

       1
       1
        
       #!/usr/bin/env nix-shell

     

       2
       2
        
       #!nix-shell -i bash -p nix-prefetch-scripts

     

       3
       3
        
       

     

       4
       4
       +
       set -eou pipefail

     

       5
       5
       +
       

     

       4
       6
        
       version=$1

     

       5
       7
        
       

     

       6
       6
       -
       bucket="https://download.pytorch.org/whl/cu111"

     

       8
       8
       +
       bucket="https://download.pytorch.org/whl/cu113"

     

       7
       9
        
       

     

       8
       10
        
       url_and_key_list=(

     

       9
       9
       -
       "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"

     

       10
       10
       -
       "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"

     

       11
       11
       -
       "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"

     

       11
       11
       +
         "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"

     

       12
       12
       +
         "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"

     

       13
       13
       +
         "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"

     

       12
       14
        
       )

     

       13
       15
        
       

     

       14
       14
       -
       hashfile=binary-hashes-"$version".nix

     

       15
       15
       -
       rm -f $hashfile

     

       16
       16
       +
       hashfile="binary-hashes-$version.nix"

     

       16
       17
        
       echo "  \"$version\" = {" >> $hashfile

     

       17
       18
        
       

     

       18
       19
        
       for url_and_key in "${url_and_key_list[@]}"; do

+61

pkgs/development/python-modules/vehicle/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , aiohttp

     

       3
       3
       +
       , aresponses

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , poetry-core

     

       7
       7
       +
       , pydantic

     

       8
       8
       +
       , pytest-asyncio

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       , pythonOlder

     

       11
       11
       +
       , yarl

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "vehicle";

     

       16
       16
       +
         version = "0.2.0";

     

       17
       17
       +
         format = "pyproject";

     

       18
       18
       +
       

     

       19
       19
       +
         disabled = pythonOlder "3.8";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "frenck";

     

       23
       23
       +
           repo = "python-vehicle";

     

       24
       24
       +
           rev = "v${version}";

     

       25
       25
       +
           sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           poetry-core

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           aiohttp

     

       34
       34
       +
           pydantic

     

       35
       35
       +
           yarl

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         checkInputs = [

     

       39
       39
       +
           aresponses

     

       40
       40
       +
           pytest-asyncio

     

       41
       41
       +
           pytestCheckHook

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         postPatch = ''

     

       45
       45
       +
           # Upstream doesn't set a version for the pyproject.toml

     

       46
       46
       +
           substituteInPlace pyproject.toml \

     

       47
       47
       +
             --replace "0.0.0" "${version}" \

     

       48
       48
       +
             --replace "--cov" ""

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         pythonImportsCheck = [

     

       52
       52
       +
           "vehicle"

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       55
       55
       +
         meta = with lib; {

     

       56
       56
       +
           description = "Python client providing RDW vehicle information";

     

       57
       57
       +
           homepage = "https://github.com/frenck/python-wled";

     

       58
       58
       +
           license = licenses.mit;

     

       59
       59
       +
           maintainers = with maintainers; [ fab ];

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+2

pkgs/development/python-modules/zfec/default.nix

···

       24
       24
        
           sed -i -e '/argparse/d' setup.py

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       +
         pythonImportsCheck = [ "zfec" ];

     

       28
       28
       +
       

     

       27
       29
        
         meta = with lib; {

     

       28
       30
        
           homepage = "https://github.com/tahoe-lafs/zfec";

     

       29
       31
        
           description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell";

+9 -2

pkgs/development/tools/analysis/checkov/default.nix

···

       56
       56
        
       

     

       57
       57
        
       buildPythonApplication rec {

     

       58
       58
        
         pname = "checkov";

     

       59
       59
       -
         version = "2.0.571";

     

       59
       59
       +
         version = "2.0.574";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchFromGitHub {

     

       62
       62
        
           owner = "bridgecrewio";

     

       63
       63
        
           repo = pname;

     

       64
       64
        
           rev = version;

     

       65
       65
       -
           sha256 = "sha256-cmSZHqR1BfVWXoUSJ3Et5TTdeUWklNA4egKLP4xKjw8=";

     

       65
       65
       +
           sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ=";

     

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
        
         nativeBuildInputs = with py.pkgs; [

     
···

       70
       70
        
         ];

     

       71
       71
        
       

     

       72
       72
        
         propagatedBuildInputs = with py.pkgs; [

     

       73
       73
       +
           aiodns

     

       74
       74
       +
           aiohttp

     

       75
       75
       +
           aiomultiprocess

     

       73
       76
        
           bc-python-hcl2

     

       74
       77
        
           boto3

     

       75
       78
        
           cachetools

     
···

       98
       101
        
         ];

     

       99
       102
        
       

     

       100
       103
        
         checkInputs = with py.pkgs; [

     

       104
       104
       +
           aioresponses

     

       101
       105
        
           jsonschema

     

       106
       106
       +
           mock

     

       107
       107
       +
           pytest-asyncio

     

       108
       108
       +
           pytest-mock

     

       102
       109
        
           pytest-xdist

     

       103
       110
        
           pytestCheckHook

     

       104
       111
        
         ];

+2 -2

pkgs/os-specific/linux/bluez/default.nix

···

       21
       21
        
         ];

     

       22
       22
        
       in stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "bluez";

     

       24
       24
       -
         version = "5.61";

     

       24
       24
       +
         version = "5.62";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchurl {

     

       27
       27
        
           url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";

     

       28
       28
       -
           sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs=";

     

       28
       28
       +
           sha256 = "sha256-OAkKW3UOF/wI0+UheO2NMlTF9L0sSIMNXBlVuI47wMI=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

+30 -20

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       2
       2
        
           "4.14": {

     

       3
       3
        
               "patch": {

     

       4
       4
        
                   "extra": "-hardened1",

     

       5
       5
       -
                   "name": "linux-hardened-4.14.254-hardened1.patch",

     

       6
       6
       -
                   "sha256": "1mg4zims7ckb0ddnnahk1cj73lhdh7x7xkjz4cgsvwndw0qvmhdi",

     

       7
       7
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.254-hardened1/linux-hardened-4.14.254-hardened1.patch"

     

       5
       5
       +
                   "name": "linux-hardened-4.14.255-hardened1.patch",

     

       6
       6
       +
                   "sha256": "0d84jwf9vd86qzxq8aqcyrzmwczf3qh2f7a801qsgzb96fyvakrl",

     

       7
       7
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.255-hardened1/linux-hardened-4.14.255-hardened1.patch"

     

       8
       8
        
               },

     

       9
       9
       -
               "sha256": "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz",

     

       10
       10
       -
               "version": "4.14.254"

     

       9
       9
       +
               "sha256": "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh",

     

       10
       10
       +
               "version": "4.14.255"

     

       11
       11
        
           },

     

       12
       12
        
           "4.19": {

     

       13
       13
        
               "patch": {

     

       14
       14
        
                   "extra": "-hardened1",

     

       15
       15
       -
                   "name": "linux-hardened-4.19.216-hardened1.patch",

     

       16
       16
       -
                   "sha256": "0a8rg0lc0pj6zlkbrd3fjrjgg3f18918zzs8q4nld092hqjfjbsm",

     

       17
       17
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.216-hardened1/linux-hardened-4.19.216-hardened1.patch"

     

       15
       15
       +
                   "name": "linux-hardened-4.19.217-hardened1.patch",

     

       16
       16
       +
                   "sha256": "1brx4dvh8acq1r5mbh2a5d95k3n7m4x3jnqnp0s69p3fx9gf1kxh",

     

       17
       17
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.217-hardened1/linux-hardened-4.19.217-hardened1.patch"

     

       18
       18
        
               },

     

       19
       19
       -
               "sha256": "0cs8yy5jfbvvi5j9f3kzyc4j0fjylxdj1641f53ga6gkmjmayv3d",

     

       20
       20
       -
               "version": "4.19.216"

     

       19
       19
       +
               "sha256": "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5",

     

       20
       20
       +
               "version": "4.19.217"

     

       21
       21
        
           },

     

       22
       22
        
           "5.10": {

     

       23
       23
        
               "patch": {

     
···

       32
       32
        
           "5.14": {

     

       33
       33
        
               "patch": {

     

       34
       34
        
                   "extra": "-hardened1",

     

       35
       35
       -
                   "name": "linux-hardened-5.14.17-hardened1.patch",

     

       36
       36
       -
                   "sha256": "08s26hmmaji51aczh9spbg8ngbxz5mr067dgi05djp3cgs2hl5pw",

     

       37
       37
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.17-hardened1/linux-hardened-5.14.17-hardened1.patch"

     

       35
       35
       +
                   "name": "linux-hardened-5.14.18-hardened1.patch",

     

       36
       36
       +
                   "sha256": "1mk159nwkdd1kwsp9l7328x8mk7i5k3sw4nk858zr8izgllqijlp",

     

       37
       37
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.18-hardened1/linux-hardened-5.14.18-hardened1.patch"

     

       38
       38
        
               },

     

       39
       39
       -
               "sha256": "0q7df51yk6di1m8ky0gplkyx6smlr9inxrd569qv3ww3ykg933sd",

     

       40
       40
       -
               "version": "5.14.17"

     

       39
       39
       +
               "sha256": "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis",

     

       40
       40
       +
               "version": "5.14.18"

     

       41
       41
       +
           },

     

       42
       42
       +
           "5.15": {

     

       43
       43
       +
               "patch": {

     

       44
       44
       +
                   "extra": "-hardened1",

     

       45
       45
       +
                   "name": "linux-hardened-5.15.2-hardened1.patch",

     

       46
       46
       +
                   "sha256": "15r7vkflcrj1hxfvhycqfflb3625br10qvn1ixhsv14xxdf3h39c",

     

       47
       47
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.2-hardened1/linux-hardened-5.15.2-hardened1.patch"

     

       48
       48
       +
               },

     

       49
       49
       +
               "sha256": "0xdi799k15l7l9kxlq4qbp79mp1c38vxal4z4p9l5gl194x06d2n",

     

       50
       50
       +
               "version": "5.15.2"

     

       41
       51
        
           },

     

       42
       52
        
           "5.4": {

     

       43
       53
        
               "patch": {

     

       44
       54
        
                   "extra": "-hardened1",

     

       45
       45
       -
                   "name": "linux-hardened-5.4.158-hardened1.patch",

     

       46
       46
       -
                   "sha256": "1pnxwvy5x04b95bfia63916qlrj5mrp2d54dcc4hg5k29vm0z6a5",

     

       47
       47
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.158-hardened1/linux-hardened-5.4.158-hardened1.patch"

     

       55
       55
       +
                   "name": "linux-hardened-5.4.159-hardened1.patch",

     

       56
       56
       +
                   "sha256": "1hzs6sqdyzddz0qwq4b6c7rcihbjgzq73ng6fma408c27y72d6pi",

     

       57
       57
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.159-hardened1/linux-hardened-5.4.159-hardened1.patch"

     

       48
       58
        
               },

     

       49
       49
       -
               "sha256": "0ncdkf1iz49458k3dvq3dc5b2r9dp21jsn3ffm9lbhlgvkn8y0bf",

     

       50
       50
       -
               "version": "5.4.158"

     

       59
       59
       +
               "sha256": "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p",

     

       60
       60
       +
               "version": "5.4.159"

     

       51
       61
        
           }

     

       52
       62
        
       }

+3 -3

pkgs/os-specific/linux/kernel/linux-rt-5.10.nix

···

       6
       6
        
       , ... } @ args:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         version = "5.10.73-rt54"; # updated by ./update-rt.sh

     

       9
       9
       +
         version = "5.10.78-rt55"; # updated by ./update-rt.sh

     

       10
       10
        
         branch = lib.versions.majorMinor version;

     

       11
       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
       12
        
       in buildLinux (args // {

     
···

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       21
       21
       -
           sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd";

     

       21
       21
       +
           sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         kernelPatches = let rt-patch = {

     

       25
       25
        
           name = "rt";

     

       26
       26
        
           patch = fetchurl {

     

       27
       27
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       28
       28
       -
             sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk";

     

       28
       28
       +
             sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp";

     

       29
       29
        
           };

     

       30
       30
        
         }; in [ rt-patch ] ++ kernelPatches;

     

       31
       31

-45

pkgs/os-specific/linux/kernel/linux-rt-5.11.nix

···

       1
       1
       -
       { lib, buildLinux, fetchurl

     

       2
       2
       -
       , kernelPatches ? [ ]

     

       3
       3
       -
       , structuredExtraConfig ? {}

     

       4
       4
       -
       , extraMeta ? {}

     

       5
       5
       -
       , argsOverride ? {}

     

       6
       6
       -
       , ... } @ args:

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         version = "5.11.4-rt11"; # updated by ./update-rt.sh

     

       10
       10
       -
         branch = lib.versions.majorMinor version;

     

       11
       11
       -
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
       12
       -
       in buildLinux (args // {

     

       13
       13
       -
         inherit version;

     

       14
       14
       -
       

     

       15
       15
       -
         # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.

     

       16
       16
       -
         modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version

     

       17
       17
       -
           else lib.replaceStrings ["-"] [".0-"] version;

     

       18
       18
       -
       

     

       19
       19
       -
         src = fetchurl {

     

       20
       20
       -
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       21
       21
       -
           sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8";

     

       22
       22
       -
         };

     

       23
       23
       -
       

     

       24
       24
       -
         kernelPatches = let rt-patch = {

     

       25
       25
       -
           name = "rt";

     

       26
       26
       -
           patch = fetchurl {

     

       27
       27
       -
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       28
       28
       -
             sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc";

     

       29
       29
       -
           };

     

       30
       30
       -
         }; in [ rt-patch ] ++ kernelPatches;

     

       31
       31
       -
       

     

       32
       32
       -
         structuredExtraConfig = with lib.kernel; {

     

       33
       33
       -
           PREEMPT_RT = yes;

     

       34
       34
       -
           # Fix error: unused option: PREEMPT_RT.

     

       35
       35
       -
           EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)

     

       36
       36
       -
           # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').

     

       37
       37
       -
           PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.

     

       38
       38
       -
           # Fix error: unused option: RT_GROUP_SCHED.

     

       39
       39
       -
           RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.

     

       40
       40
       -
         } // structuredExtraConfig;

     

       41
       41
       -
       

     

       42
       42
       -
         extraMeta = extraMeta // {

     

       43
       43
       -
           inherit branch;

     

       44
       44
       -
         };

     

       45
       45
       -
       } // argsOverride)

+4 -4

pkgs/os-specific/linux/zfs/default.nix

···

       215
       215
        
         # to be adapted

     

       216
       216
        
         zfsStable = common {

     

       217
       217
        
           # check the release notes for compatible kernels

     

       218
       218
       -
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";

     

       219
       219
       -
           latestCompatibleLinuxPackages = linuxPackages_5_14;

     

       218
       218
       +
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";

     

       219
       219
       +
           latestCompatibleLinuxPackages = linuxPackages_5_15;

     

       220
       220
        
       

     

       221
       221
        
           # this package should point to the latest release.

     

       222
       222
        
           version = "2.1.1";

     
···

       226
       226
        
       

     

       227
       227
        
         zfsUnstable = common {

     

       228
       228
        
           # check the release notes for compatible kernels

     

       229
       229
       -
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";

     

       230
       230
       -
           latestCompatibleLinuxPackages = linuxPackages_5_14;

     

       229
       229
       +
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";

     

       230
       230
       +
           latestCompatibleLinuxPackages = linuxPackages_5_15;

     

       231
       231
        
       

     

       232
       232
        
           # this package should point to a version / git revision compatible with the latest kernel release

     

       233
       233
        
           # IMPORTANT: Always use a tagged release candidate or commits from the

+1 -1

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "2021.11.3";

     

       5
       5
       +
         version = "2021.11.4";

     

       6
       6
        
         components = {

     

       7
       7
        
           "abode" = ps: with ps; [ abodepy ];

     

       8
       8
        
           "accuweather" = ps: with ps; [ accuweather ];

+2 -2

pkgs/servers/home-assistant/default.nix

···

       152
       152
        
         extraBuildInputs = extraPackages py.pkgs;

     

       153
       153
        
       

     

       154
       154
        
         # Don't forget to run parse-requirements.py after updating

     

       155
       155
       -
         hassVersion = "2021.11.3";

     

       155
       155
       +
         hassVersion = "2021.11.4";

     

       156
       156
        
       

     

       157
       157
        
       in with py.pkgs; buildPythonApplication rec {

     

       158
       158
        
         pname = "homeassistant";

     
···

       169
       169
        
           owner = "home-assistant";

     

       170
       170
        
           repo = "core";

     

       171
       171
        
           rev = version;

     

       172
       172
       -
           sha256 = "sha256-HycMb29niuUp7flRdWgrKSOcnr0l3PqjULCrgrwLrFw=";

     

       172
       172
       +
           sha256 = "sha256-411oqzC8VTD7CM9vM/M3m4zW0Ygf2g2hoAXAxGBv7iw=";

     

       173
       173
        
         };

     

       174
       174
        
       

     

       175
       175
        
         # leave this in, so users don't have to constantly update their downstream patch handling

+1 -1

pkgs/servers/roon-server/default.nix

···

       53
       53
        
                 makeWrapper "$dotnetDir/$binName" "${binPath}" \

     

       54
       54
        
                   --add-flags "$binDir/$binName.dll" \

     

       55
       55
        
                   --argv0 "$binName" \

     

       56
       56
       -
                   --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \

     

       56
       56
       +
                   --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib icu66 ffmpeg openssl ]}" \

     

       57
       57
        
                   --prefix PATH : "$dotnetDir" \

     

       58
       58
        
                   --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \

     

       59
       59
        
                   --run "cd $binDir" \

+5 -4

pkgs/tools/filesystems/ceph/default.nix

···

       241
       241
        
         ceph-client = runCommand "ceph-client-${version}" {

     

       242
       242
        
             meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs";

     

       243
       243
        
           } ''

     

       244
       244
       -
             mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions}

     

       244
       244
       +
             mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions}

     

       245
       245
        
             cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin

     

       246
       246
        
             cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin

     

       247
       247
        
             cp -r ${ceph}/bin/rbd-replay* $out/bin

     

       248
       248
       -
             cp -r ${ceph}/sbin/mount.ceph $out/sbin

     

       249
       249
       -
             cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin

     

       250
       250
       -
             cp -r ${ceph}/${sitePackages} $out/${sitePackages}

     

       248
       248
       +
             cp -r ${ceph}/sbin/mount.ceph $out/bin

     

       249
       249
       +
             cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin

     

       250
       250
       +
             ln -s bin $out/sbin

     

       251
       251
       +
             cp -r ${ceph}/${sitePackages}/* $out/${sitePackages}

     

       251
       252
        
             cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions

     

       252
       253
        
             # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths

     

       253
       254
        
             substituteInPlace $out/bin/ceph          --replace ${ceph} $out

+2 -2

pkgs/tools/networking/urlwatch/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3Packages.buildPythonApplication rec {

     

       7
       7
        
         pname = "urlwatch";

     

       8
       8
       -
         version = "2.23";

     

       8
       8
       +
         version = "2.24";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "thp";

     

       12
       12
        
           repo = "urlwatch";

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           sha256 = "1ryygy7lalmwnv9kc8q4920gkdx878izy33a5dgxb780sy2qq8pg";

     

       14
       14
       +
           sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = with python3Packages; [

+3

pkgs/tools/security/bpb/default.nix

···

       2
       2
        
       , lib

     

       3
       3
        
       , rustPlatform

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       +
       , Security

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       rustPlatform.buildRustPackage rec {

     
···

       19
       20
        
       

     

       20
       21
        
         # a nightly compiler is required unless we use this cheat code.

     

       21
       22
        
         RUSTC_BOOTSTRAP = 1;

     

       23
       23
       +
       

     

       24
       24
       +
         buildInputs = lib.optional stdenv.isDarwin Security;

     

       22
       25
        
       

     

       23
       26
        
         meta = with lib; {

     

       24
       27
        
           description = "Tool to automatically sign git commits, replacing gpg for that purpose";

+2 -2

pkgs/tools/security/exploitdb/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "exploitdb";

     

       5
       5
       -
         version = "2021-11-13";

     

       5
       5
       +
         version = "2021-11-16";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "offensive-security";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-0/ZKki+QJpBL+K3zQ0H5d5cfan+pKEYHwr6y4U+FKzM=";

     

       11
       11
       +
           sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

+9 -1

pkgs/tools/security/vaultwarden/default.nix

···

       19
       19
        
       

     

       20
       20
        
         cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI=";

     

       21
       21
        
       

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working

     

       24
       24
       +
           # vaultwarden when using RUSTC_BOOTSTRAP=1

     

       25
       25
       +
           sed -ri 's/^rust-version = .*//g' Cargo.toml

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       22
       28
        
         nativeBuildInputs = [ pkg-config ];

     

       23
       29
        
         buildInputs = with lib; [ openssl ]

     

       24
       30
        
           ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]

     

       25
       31
        
           ++ optional (dbBackend == "mysql") libmysqlclient

     

       26
       32
        
           ++ optional (dbBackend == "postgresql") postgresql;

     

       27
       33
        
       

     

       34
       34
       +
         # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features.

     

       35
       35
       +
         # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed.

     

       28
       36
        
         RUSTC_BOOTSTRAP = 1;

     

       29
       37
        
       

     

       30
       38
        
         cargoBuildFlags = [ featuresFlag ];

     
···

       42
       50
        
           description = "Unofficial Bitwarden compatible server written in Rust";

     

       43
       51
        
           homepage = "https://github.com/dani-garcia/vaultwarden";

     

       44
       52
        
           license = licenses.gpl3Only;

     

       45
       45
       -
           maintainers = with maintainers; [ msteen ];

     

       53
       53
       +
           maintainers = with maintainers; [ msteen ivan ];

     

       46
       54
        
         };

     

       47
       55
        
       }

-2

pkgs/top-level/aliases.nix

···

       462
       462
        
         linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

     

       463
       463
        
         linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;

     

       464
       464
        
         linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;

     

       465
       465
       -
         linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11;

     

       466
       465
        
         linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;

     

       467
       466
        
         linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;

     

       468
       467
        
         linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;

     
···

       490
       489
        
         linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;

     

       491
       490
        
         linux_5_10 = linuxKernel.kernels.linux_5_10;

     

       492
       491
        
         linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;

     

       493
       493
       -
         linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;

     

       494
       492
        
         linux_5_14 = linuxKernel.kernels.linux_5_14;

     

       495
       493
        
         linux_5_15 = linuxKernel.kernels.linux_5_15;

     

       496
       494

+3 -1

pkgs/top-level/all-packages.nix

···

       2228
       2228
        
         bozohttpd = callPackage ../servers/http/bozohttpd { };

     

       2229
       2229
        
         bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; };

     

       2230
       2230
        
       

     

       2231
       2231
       -
         bpb = callPackage ../tools/security/bpb { };

     

       2231
       2231
       +
         bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; };

     

       2232
       2232
        
       

     

       2233
       2233
        
         bpytop = callPackage ../tools/system/bpytop { };

     

       2234
       2234
        
       

     
···

       22120
       22120
        
         linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;

     

       22121
       22121
        
         linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;

     

       22122
       22122
        
         linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;

     

       22123
       22123
       +
         linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;

     

       22124
       22124
       +
         linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;

     

       22123
       22125
        
       

     

       22124
       22126
        
         # Hardkernel (Odroid) kernels.

     

       22125
       22127
        
         linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;

+3 -10

pkgs/top-level/linux-kernels.nix

···

       159
       159
        
             ];

     

       160
       160
        
           };

     

       161
       161
        
       

     

       162
       162
       -
           linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix {

     

       163
       163
       -
             kernelPatches = [

     

       164
       164
       -
               kernelPatches.bridge_stp_helper

     

       165
       165
       -
               kernelPatches.request_key_helper

     

       166
       166
       -
               kernelPatches.export-rt-sched-migrate

     

       167
       167
       -
             ];

     

       168
       168
       -
           };

     

       169
       169
       -
       

     

       170
       162
        
           linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {

     

       171
       163
        
             kernelPatches = [

     

       172
       164
        
               kernelPatches.bridge_stp_helper

     
···

       233
       225
        
           linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };

     

       234
       226
        
           linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };

     

       235
       227
        
           linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };

     

       228
       228
       +
           linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

     

       236
       229
        
       

     

       237
       230
        
         }));

     

       238
       231
        
         /*  Linux kernel modules are inherently tied to a specific kernel.  So

     
···

       482
       475
        
            # realtime kernel packages

     

       483
       476
        
            linux_rt_5_4 = packagesFor kernels.linux_rt_5_4;

     

       484
       477
        
            linux_rt_5_10 = packagesFor kernels.linux_rt_5_10;

     

       485
       485
       -
            linux_rt_5_11 = packagesFor kernels.linux_rt_5_11;

     

       486
       478
        
         };

     

       487
       479
        
       

     

       488
       480
        
         rpiPackages = {

     
···

       506
       498
        
           linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });

     

       507
       499
        
           linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });

     

       508
       500
        
           linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });

     

       501
       501
       +
           linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });

     

       509
       502
        
       

     

       510
       503
        
           linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);

     

       511
       504
        
           linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);

     
···

       524
       517
        
           linux_latest = packages.linux_5_15;

     

       525
       518
        
           linux_mptcp = packages.linux_mptcp_95;

     

       526
       519
        
           linux_rt_default = packages.linux_rt_5_4;

     

       527
       527
       -
           linux_rt_latest = packages.linux_rt_5_11;

     

       520
       520
       +
           linux_rt_latest = packages.linux_rt_5_10;

     

       528
       521
        
           linux_hardkernel_latest = packages.hardkernel_4_14;

     

       529
       522
        
         };

     

       530
       523

+1 -1

pkgs/top-level/ocaml-packages.nix

···

       1459
       1459
        
           if lib.versionOlder "4.08" ocaml.version

     

       1460
       1460
        
           then import ../development/ocaml-modules/janestreet/0.14.nix {

     

       1461
       1461
        
             inherit self;

     

       1462
       1462
       -
             inherit (pkgs) lib openssl zstd;

     

       1462
       1462
       +
             inherit (pkgs) fetchpatch lib openssl zstd;

     

       1463
       1463
        
           }

     

       1464
       1464
        
           else if lib.versionOlder "4.07" ocaml.version

     

       1465
       1465
        
           then import ../development/ocaml-modules/janestreet/0.12.nix {

+4

pkgs/top-level/python-packages.nix

···

       9342
       9342
        
       

     

       9343
       9343
        
         toposort = callPackage ../development/python-modules/toposort { };

     

       9344
       9344
        
       

     

       9345
       9345
       +
         torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { };

     

       9346
       9346
       +
       

     

       9345
       9347
        
         torchgpipe = callPackage ../development/python-modules/torchgpipe { };

     

       9346
       9348
        
       

     

       9347
       9349
        
         torchvision = callPackage ../development/python-modules/torchvision { };

     
···

       9693
       9695
        
         vdf = callPackage ../development/python-modules/vdf { };

     

       9694
       9696
        
       

     

       9695
       9697
        
         vdirsyncer = callPackage ../development/python-modules/vdirsyncer { };

     

       9698
       9698
       +
       

     

       9699
       9699
       +
         vehicle = callPackage ../development/python-modules/vehicle { };

     

       9696
       9700
        
       

     

       9697
       9701
        
         vega = callPackage ../development/python-modules/vega { };

     

       9698
       9702