commit c227fb4b17469864298087f8c9367e4cfc8dd6b9 · pyrox.dev/nixpkgs

+47

doc/builders/trivial-builders.chapter.md

···

       50
       50
        
       ## `symlinkJoin` {#trivial-builder-symlinkJoin}

     

       51
       51
        
       

     

       52
       52
        
       This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.

     

       53
       53
       +
       

     

       54
       54
       +
       ## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}

     

       55
       55
       +
       

     

       56
       56
       +
       Writes the closure of transitive dependencies to a file.

     

       57
       57
       +
       

     

       58
       58
       +
       This produces the equivalent of `nix-store -q --requisites`.

     

       59
       59
       +
       

     

       60
       60
       +
       For example,

     

       61
       61
       +
       

     

       62
       62
       +
       ```nix

     

       63
       63
       +
       writeReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'')

     

       64
       64
       +
       ```

     

       65
       65
       +
       

     

       66
       66
       +
       produces an output path `/nix/store/<hash>-runtime-deps` containing

     

       67
       67
       +
       

     

       68
       68
       +
       ```nix

     

       69
       69
       +
       /nix/store/<hash>-hello-2.10

     

       70
       70
       +
       /nix/store/<hash>-hi

     

       71
       71
       +
       /nix/store/<hash>-libidn2-2.3.0

     

       72
       72
       +
       /nix/store/<hash>-libunistring-0.9.10

     

       73
       73
       +
       /nix/store/<hash>-glibc-2.32-40

     

       74
       74
       +
       ```

     

       75
       75
       +
       

     

       76
       76
       +
       You can see that this includes `hi`, the original input path,

     

       77
       77
       +
       `hello`, which is a direct reference, but also

     

       78
       78
       +
       the other paths that are indirectly required to run `hello`.

     

       79
       79
       +
       

     

       80
       80
       +
       ## `writeDirectReferencesToFile` {#trivial-builder-writeDirectReferencesToFile}

     

       81
       81
       +
       

     

       82
       82
       +
       Writes the set of references to the output file, that is, their immediate dependencies.

     

       83
       83
       +
       

     

       84
       84
       +
       This produces the equivalent of `nix-store -q --references`.

     

       85
       85
       +
       

     

       86
       86
       +
       For example,

     

       87
       87
       +
       

     

       88
       88
       +
       ```nix

     

       89
       89
       +
       writeDirectReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'')

     

       90
       90
       +
       ```

     

       91
       91
       +
       

     

       92
       92
       +
       produces an output path `/nix/store/<hash>-runtime-references` containing

     

       93
       93
       +
       

     

       94
       94
       +
       ```nix

     

       95
       95
       +
       /nix/store/<hash>-hello-2.10

     

       96
       96
       +
       ```

     

       97
       97
       +
       

     

       98
       98
       +
       but none of `hello`'s dependencies, because those are not referenced directly

     

       99
       99
       +
       by `hi`'s output.

+7 -7

doc/languages-frameworks/dhall.section.md

···

       5
       5
        
       

     

       6
       6
        
       * [`dhall-lang.org` - Installing packages](https://docs.dhall-lang.org/tutorials/Language-Tour.html#installing-packages)

     

       7
       7
        
       

     

       8
       8
       -
       ## Remote imports

     

       8
       8
       +
       ## Remote imports {#ssec-dhall-remote-imports}

     

       9
       9
        
       

     

       10
       10
        
       Nixpkgs bypasses Dhall's support for remote imports using Dhall's

     

       11
       11
        
       semantic integrity checks.  Specifically, any Dhall import can be protected by

     
···

       32
       32
        
       to fetch Dhall code ensures that Dhall packages built using Nix remain pure and

     

       33
       33
        
       also behave well when built within a sandbox.

     

       34
       34
        
       

     

       35
       35
       -
       ## Packaging a Dhall expression from scratch

     

       35
       35
       +
       ## Packaging a Dhall expression from scratch {#ssec-dhall-packaging-expression}

     

       36
       36
        
       

     

       37
       37
        
       We can illustrate how Nixpkgs integrates Dhall by beginning from the following

     

       38
       38
        
       trivial Dhall expression with one dependency (the Prelude):

     
···

       117
       117
        
       $ nix build --file ./example.nix dhallPackages.true

     

       118
       118
        
       ```

     

       119
       119
        
       

     

       120
       120
       -
       ## Contents of a Dhall package

     

       120
       120
       +
       ## Contents of a Dhall package {#ssec-dhall-package-contents}

     

       121
       121
        
       

     

       122
       122
        
       The above package produces the following directory tree:

     

       123
       123
        
       

     
···

       224
       224
        
       …

     

       225
       225
        
       ```

     

       226
       226
        
       

     

       227
       227
       -
       ## Packaging functions

     

       227
       227
       +
       ## Packaging functions {#ssec-dhall-packaging-functions}

     

       228
       228
        
       

     

       229
       229
        
       We already saw an example of using `buildDhallPackage` to create a Dhall

     

       230
       230
        
       package from a single file, but most Dhall packages consist of more than one

     
···

       297
       297
        
       Additionally, `buildDhallGitHubPackage` accepts the same arguments as

     

       298
       298
        
       `fetchFromGitHub`, such as `sha256` or `fetchSubmodules`.

     

       299
       299
        
       

     

       300
       300
       -
       ## `dhall-to-nixpkgs`

     

       300
       300
       +
       ## `dhall-to-nixpkgs` {#ssec-dhall-dhall-to-nixpkgs}

     

       301
       301
        
       

     

       302
       302
        
       You can use the `dhall-to-nixpkgs` command-line utility to automate

     

       303
       303
        
       packaging Dhall code.  For example:

     
···

       342
       342
        
           }

     

       343
       343
        
       ```

     

       344
       344
        
       

     

       345
       345
       -
       ## Overriding dependency versions

     

       345
       345
       +
       ## Overriding dependency versions {#ssec-dhall-overriding-dependency-versions}

     

       346
       346
        
       

     

       347
       347
        
       Suppose that we change our `true.dhall` example expression to depend on an older

     

       348
       348
        
       version of the Prelude (19.0.0):

     
···

       415
       415
        
         };

     

       416
       416
        
       ```

     

       417
       417
        
       

     

       418
       418
       -
       ## Overrides

     

       418
       418
       +
       ## Overrides {#ssec-dhall-overrides}

     

       419
       419
        
       

     

       420
       420
        
       You can override any of the arguments to `buildDhallGitHubPackage` or

     

       421
       421
        
       `buildDhallDirectoryPackage` using the `overridePackage` attribute of a package.

+6

maintainers/maintainer-list.nix

···

       2511
       2511
        
           githubId = 1316469;

     

       2512
       2512
        
           name = "Naomi Morse";

     

       2513
       2513
        
         };

     

       2514
       2514
       +
         dlesl = {

     

       2515
       2515
       +
           email = "dlesl@dlesl.com";

     

       2516
       2516
       +
           github = "dlesl";

     

       2517
       2517
       +
           githubId = 28980797;

     

       2518
       2518
       +
           name = "David Leslie";

     

       2519
       2519
       +
         };

     

       2514
       2520
        
         dmalikov = {

     

       2515
       2521
        
           email = "malikov.d.y@gmail.com";

     

       2516
       2522
        
           github = "dmalikov";

+2

nixos/modules/programs/dconf.nix

···

       54
       54
        
       

     

       55
       55
        
           services.dbus.packages = [ pkgs.dconf ];

     

       56
       56
        
       

     

       57
       57
       +
           systemd.packages = [ pkgs.dconf ];

     

       58
       58
       +
       

     

       57
       59
        
           # For dconf executable

     

       58
       60
        
           environment.systemPackages = [ pkgs.dconf ];

     

       59
       61

+4 -9

nixos/modules/security/ca.nix

···

       10
       10
        
           blacklist = cfg.caCertificateBlacklist;

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         caCertificates = pkgs.runCommand "ca-certificates.crt"

     

       14
       14
       -
           { files =

     

       15
       15
       -
               cfg.certificateFiles ++

     

       16
       16
       -
               [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ];

     

       17
       17
       -
             preferLocalBuild = true;

     

       18
       18
       -
            }

     

       19
       19
       -
           ''

     

       20
       20
       -
             cat $files > $out

     

       21
       21
       -
           '';

     

       13
       13
       +
         caCertificates = pkgs.runCommand "ca-certificates.crt" {

     

       14
       14
       +
           files = cfg.certificateFiles ++ [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ];

     

       15
       15
       +
           preferLocalBuild = true;

     

       16
       16
       +
         } "awk 1 $files > $out";  # awk ensures a newline between each pair of consecutive files

     

       22
       17
        
       

     

       23
       18
        
       in

     

       24
       19

+1 -1

nixos/modules/services/databases/postgresql.nix

···

       159
       159
        
                       For more information on how to specify the target

     

       160
       160
        
                       and on which privileges exist, see the

     

       161
       161
        
                       <link xlink:href="https://www.postgresql.org/docs/current/sql-grant.html">GRANT syntax</link>.

     

       162
       162
       -
                       The attributes are used as <code>GRANT ''${attrName} ON ''${attrValue}</code>.

     

       162
       162
       +
                       The attributes are used as <code>GRANT ''${attrValue} ON ''${attrName}</code>.

     

       163
       163
        
                     '';

     

       164
       164
        
                     example = literalExample ''

     

       165
       165
        
                       {

+1 -1

nixos/modules/services/databases/redis.nix

···

       331
       331
        
               PrivateMounts = true;

     

       332
       332
        
               # System Call Filtering

     

       333
       333
        
               SystemCallArchitectures = "native";

     

       334
       334
       -
               SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @raw-io @reboot @resources @setuid @swap";

     

       334
       334
       +
               SystemCallFilter = "~@cpu-emulation @debug @keyring @memlock @mount @obsolete @privileged @resources @setuid";

     

       335
       335
        
             };

     

       336
       336
        
           };

     

       337
       337
        
         };

+1 -1

nixos/modules/services/development/jupyter/default.nix

···

       131
       131
        
                   env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [

     

       132
       132
        
                           ipykernel

     

       133
       133
        
                           pandas

     

       134
       134
       -
                           scikitlearn

     

       134
       134
       +
                           scikit-learn

     

       135
       135
        
                         ]));

     

       136
       136
        
                 in {

     

       137
       137
        
                   displayName = "Python 3 for machine learning";

+1 -1

nixos/modules/services/development/jupyterhub/default.nix

···

       117
       117
        
                   env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [

     

       118
       118
        
                           ipykernel

     

       119
       119
        
                           pandas

     

       120
       120
       -
                           scikitlearn

     

       120
       120
       +
                           scikit-learn

     

       121
       121
        
                         ]));

     

       122
       122
        
                 in {

     

       123
       123
        
                   displayName = "Python 3 for machine learning";

-12

nixos/modules/services/hardware/fancontrol.nix

···

       31
       31
        
       

     

       32
       32
        
         config = mkIf cfg.enable {

     

       33
       33
        
       

     

       34
       34
       -
           users = {

     

       35
       35
       -
             groups.lm_sensors = {};

     

       36
       36
       -
       

     

       37
       37
       -
             users.fancontrol = {

     

       38
       38
       -
               isSystemUser = true;

     

       39
       39
       -
               group = "lm_sensors";

     

       40
       40
       -
               description = "fan speed controller";

     

       41
       41
       -
             };

     

       42
       42
       -
           };

     

       43
       43
       -
       

     

       44
       34
        
           systemd.services.fancontrol = {

     

       45
       35
        
             documentation = [ "man:fancontrol(8)" ];

     

       46
       36
        
             description = "software fan control";

     
···

       49
       39
        
       

     

       50
       40
        
             serviceConfig = {

     

       51
       41
        
               ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}";

     

       52
       52
       -
               Group = "lm_sensors";

     

       53
       53
       -
               User = "fancontrol";

     

       54
       42
        
             };

     

       55
       43
        
           };

     

       56
       44
        
         };

+1 -3

nixos/modules/services/misc/jellyfin.nix

···

       92
       92
        
               SystemCallErrorNumber = "EPERM";

     

       93
       93
        
               SystemCallFilter = [

     

       94
       94
        
                 "@system-service"

     

       95
       95
       -
       

     

       96
       96
       -
                 "~@chown" "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@module"

     

       97
       97
       -
                 "~@obsolete" "~@privileged" "~@setuid"

     

       95
       95
       +
                 "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"

     

       98
       96
        
               ];

     

       99
       97
        
             };

     

       100
       98
        
           };

+1 -1

nixos/modules/services/network-filesystems/samba-wsdd.nix

···

       117
       117
        
               PrivateMounts = true;

     

       118
       118
        
               # System Call Filtering

     

       119
       119
        
               SystemCallArchitectures = "native";

     

       120
       120
       -
               SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap";

     

       120
       120
       +
               SystemCallFilter = "~@cpu-emulation @debug @mount @obsolete @privileged @resources";

     

       121
       121
        
             };

     

       122
       122
        
           };

     

       123
       123
        
         };

+1 -3

nixos/modules/services/networking/croc.nix

···

       72
       72
        
               RuntimeDirectoryMode = "700";

     

       73
       73
        
               SystemCallFilter = [

     

       74
       74
        
                 "@system-service"

     

       75
       75
       -
                 "~@aio" "~@chown" "~@keyring" "~@memlock"

     

       76
       76
       -
                 "~@privileged" "~@resources" "~@setuid"

     

       77
       77
       -
                 "~@sync" "~@timer"

     

       75
       75
       +
                 "~@aio" "~@keyring" "~@memlock" "~@privileged" "~@resources" "~@setuid" "~@sync" "~@timer"

     

       78
       76
        
               ];

     

       79
       77
        
               SystemCallArchitectures = "native";

     

       80
       78
        
               SystemCallErrorNumber = "EPERM";

+1 -4

nixos/modules/services/web-apps/shiori.nix

···

       86
       86
        
               SystemCallErrorNumber = "EPERM";

     

       87
       87
        
               SystemCallFilter = [

     

       88
       88
        
                 "@system-service"

     

       89
       89
       -
       

     

       90
       90
       -
                 "~@chown" "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock"

     

       91
       91
       -
                 "~@module" "~@obsolete" "~@privileged" "~@raw-io"

     

       92
       92
       -
                 "~@resources" "~@setuid"

     

       89
       89
       +
                 "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@resources" "~@setuid"

     

       93
       90
        
               ];

     

       94
       91
        
             };

     

       95
       92
        
           };

-1

nixos/modules/services/web-servers/molly-brown.nix

···

       41
       41
        
       

     

       42
       42
        
               As an example:

     

       43
       43
        
               <programlisting>

     

       44
       44
       -
               security.acme.certs."example.com".allowKeysForGroup = true;

     

       45
       44
        
               systemd.services.molly-brown.serviceConfig.SupplementaryGroups =

     

       46
       45
        
                 [ config.security.acme.certs."example.com".group ];

     

       47
       46
        
               </programlisting>

+4 -3

nixos/modules/services/web-servers/nginx/default.nix

···

       859
       859
        
               PrivateMounts = true;

     

       860
       860
        
               # System Call Filtering

     

       861
       861
        
               SystemCallArchitectures = "native";

     

       862
       862
       -
               SystemCallFilter = "~@chown @cpu-emulation @debug @keyring @ipc @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap";

     

       862
       862
       +
               SystemCallFilter = "~@cpu-emulation @debug @keyring @ipc @mount @obsolete @privileged @setuid";

     

       863
       863
        
             };

     

       864
       864
        
           };

     

       865
       865
        
       

     
···

       867
       867
        
             source = configFile;

     

       868
       868
        
           };

     

       869
       869
        
       

     

       870
       870
       -
           # postRun hooks on cert renew can't be used to restart Nginx since renewal

     

       871
       871
       -
           # runs as the unprivileged acme user. sslTargets are added to wantedBy + before

     

       870
       870
       +
           # This service waits for all certificates to be available

     

       871
       871
       +
           # before reloading nginx configuration.

     

       872
       872
       +
           # sslTargets are added to wantedBy + before

     

       872
       873
        
           # which allows the acme-finished-$cert.target to signify the successful updating

     

       873
       874
        
           # of certs end-to-end.

     

       874
       875
        
           systemd.services.nginx-config-reload = let

+1 -1

nixos/modules/tasks/filesystems.nix

···

       309
       309
        
               "mount-pstore" = {

     

       310
       310
        
                 serviceConfig = {

     

       311
       311
        
                   Type = "oneshot";

     

       312
       312
       -
                   ExecStart = "${pkgs.utillinux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore";

     

       312
       312
       +
                   ExecStart = "${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore";

     

       313
       313
        
                   ExecStartPost = pkgs.writeShellScript "wait-for-pstore.sh" ''

     

       314
       314
        
                     set -eu

     

       315
       315
        
                     TRIES=0

+2 -2

pkgs/applications/audio/spotify-qt/default.nix

···

       9
       9
        
       

     

       10
       10
        
       mkDerivation rec {

     

       11
       11
        
          pname = "spotify-qt";

     

       12
       12
       -
          version = "3.5";

     

       12
       12
       +
          version = "3.6";

     

       13
       13
        
       

     

       14
       14
        
          src = fetchFromGitHub {

     

       15
       15
        
             owner = "kraxarn";

     

       16
       16
        
             repo = pname;

     

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

     

       18
       18
       -
             sha256 = "1bgd0q4sbbww3lbrx2zwgaz0sl7qh195s4kvgsq16gv7ij82bskn";

     

       18
       18
       +
             sha256 = "mKHyE6ZffMYYRLMpzMX53chyJyWxhTAaGvtBI3l6wkI=";

     

       19
       19
        
          };

     

       20
       20
        
       

     

       21
       21
        
          buildInputs = [ libxcb qtbase qtsvg ];

+2 -2

pkgs/applications/editors/ghostwriter/default.nix

···

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "ghostwriter";

     

       5
       5
       -
         version = "2.0.0";

     

       5
       5
       +
         version = "2.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "wereturtle";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-5O2W7ZQeDkNzwi6t9MfNbv4fmNvak1AcMnzJTE1F9L8=";

     

       11
       11
       +
           sha256 = "sha256-bNVhYwX60F3lrP9UmZSntfz83vbmHe9tu/4nUgzUWR4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ qmake pkg-config qttools ];

+16 -7

pkgs/applications/misc/keepassx/community.nix

···

       23
       23
        
       , qtsvg

     

       24
       24
        
       , qtx11extras

     

       25
       25
        
       , quazip

     

       26
       26
       +
       , readline

     

       26
       27
        
       , wrapQtAppsHook

     

       27
       28
        
       , yubikey-personalization

     

       28
       29
        
       , zlib

     
···

       51
       52
        
           sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3";

     

       52
       53
        
         };

     

       53
       54
        
       

     

       54
       54
       -
         NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [

     

       55
       55
       +
         NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [

     

       55
       56
        
           "-Wno-old-style-cast"

     

       56
       57
        
           "-Wno-error"

     

       57
       58
        
           "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"

     

       58
       59
        
         ];

     

       59
       60
        
       

     

       60
       60
       -
         NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";

     

       61
       61
       +
         NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";

     

       61
       62
        
       

     

       62
       63
        
         patches = [

     

       63
       64
        
           ./darwin.patch

     
···

       108
       109
        
           qtbase

     

       109
       110
        
           qtsvg

     

       110
       111
        
           qtx11extras

     

       112
       112
       +
           readline

     

       111
       113
        
           yubikey-personalization

     

       112
       114
        
           zlib

     

       113
       115
        
         ]

     

       114
       114
       -
         ++ lib.optional withKeePassKeeShareSecure quazip

     

       115
       115
       -
         ++ lib.optional stdenv.isDarwin qtmacextras

     

       116
       116
       -
         ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;

     

       116
       116
       +
         ++ optional withKeePassKeeShareSecure quazip

     

       117
       117
       +
         ++ optional stdenv.isDarwin qtmacextras

     

       118
       118
       +
         ++ optional (stdenv.isDarwin && withKeePassTouchID)

     

       119
       119
       +
           darwin.apple_sdk.frameworks.LocalAuthentication;

     

       117
       120
        
       

     

       118
       121
        
         preFixup = optionalString stdenv.isDarwin ''

     

       119
       122
        
           # Make it work without Qt in PATH.

     
···

       123
       126
        
         passthru.tests = nixosTests.keepassxc;

     

       124
       127
        
       

     

       125
       128
        
         meta = {

     

       126
       126
       -
           description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications";

     

       127
       127
       -
           longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser).";

     

       129
       129
       +
           description = "Offline password manager with many features.";

     

       130
       130
       +
           longDescription = ''

     

       131
       131
       +
             A community fork of KeePassX, which is itself a port of KeePass Password Safe.

     

       132
       132
       +
             The goal is to extend and improve KeePassX with new features and bugfixes,

     

       133
       133
       +
             to provide a feature-rich, fully cross-platform and modern open-source password manager.

     

       134
       134
       +
             Accessible via native cross-platform GUI, CLI, has browser integration

     

       135
       135
       +
             using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)

     

       136
       136
       +
           '';

     

       128
       137
        
           homepage = "https://keepassxc.org/";

     

       129
       138
        
           license = licenses.gpl2Plus;

     

       130
       139
        
           maintainers = with maintainers; [ jonafato turion ];

+24 -6

pkgs/applications/misc/slade/git.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub

     

       2
       2
       +
       , cmake

     

       3
       3
       +
       , pkg-config

     

       4
       4
       +
       , wxGTK

     

       5
       5
       +
       , sfml

     

       6
       6
       +
       , fluidsynth

     

       7
       7
       +
       , curl

     

       8
       8
       +
       , freeimage

     

       9
       9
       +
       , ftgl

     

       10
       10
       +
       , glew

     

       11
       11
       +
       , zip

     

       12
       12
       +
       , lua

     

       13
       13
       +
       , fmt

     

       14
       14
       +
       , mpg123

     

       15
       15
       +
       }:

     

       2
       16
        
       

     

       3
       17
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "slade-git-3.1.2.2018.01.29";

     

       18
       18
       +
         name = "slade-git-3.2.0.2021.05.13";

     

       5
       19
        
       

     

       6
       20
        
         src = fetchFromGitHub {

     

       7
       21
        
           owner = "sirjuddington";

     

       8
       22
        
           repo = "SLADE";

     

       9
       9
       -
           rev = "f7409c504b40c4962f419038db934c32688ddd2e";

     

       10
       10
       -
           sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld";

     

       23
       23
       +
           rev = "d2e249c89062a44c912a9b86951526edc8735ba0";

     

       24
       24
       +
           sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg";

     

       11
       25
        
         };

     

       12
       26
        
       

     

       13
       13
       -
         cmakeFlags = ["-DNO_WEBVIEW=1"];

     

       27
       27
       +
         cmakeFlags = [

     

       28
       28
       +
           "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config"

     

       29
       29
       +
           "-DWX_GTK3=OFF"

     

       30
       30
       +
           "-DNO_WEBVIEW=1"

     

       31
       31
       +
         ];

     

       14
       32
        
         nativeBuildInputs = [ cmake pkg-config zip ];

     

       15
       15
       -
         buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];

     

       33
       33
       +
         buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ];

     

       16
       34
        
       

     

       17
       35
        
         meta = with lib; {

     

       18
       36
        
           description = "Doom editor";

+10 -3

pkgs/applications/networking/appgate-sdp/default.nix

···

       33
       33
        
       , libXrandr

     

       34
       34
        
       , libXrender

     

       35
       35
        
       , libXtst

     

       36
       36
       +
       , libxkbcommon

     

       36
       37
        
       , libsecret

     

       37
       38
        
       , libuuid

     

       38
       39
        
       , libxcb

     
···

       81
       82
        
           libXrandr

     

       82
       83
        
           libXrender

     

       83
       84
        
           libXtst

     

       85
       85
       +
           libxkbcommon

     

       84
       86
        
           libsecret

     

       85
       87
        
           libuuid

     

       86
       88
        
           libxcb

     
···

       97
       99
        
       in

     

       98
       100
        
       stdenv.mkDerivation rec {

     

       99
       101
        
         pname = "appgate-sdp";

     

       100
       100
       -
         version = "5.3.3";

     

       102
       102
       +
         version = "5.4.0";

     

       101
       103
        
       

     

       102
       104
        
         src = fetchurl {

     

       103
       105
        
           url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";

     

       104
       104
       -
           sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8";

     

       106
       106
       +
           sha256 = "sha256-2DzZ5JnFGBeaHtDf7CAXb/qv6kVI+sYMW5Nc25E3eNA=";

     

       105
       107
        
         };

     

       106
       108
        
       

     

       107
       109
        
         dontConfigure = true;

     
···

       170
       172
        
             patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary

     

       171
       173
        
           done

     

       172
       174
        
       

     

       175
       175
       +
           # fail if there are missing dependencies

     

       176
       176
       +
           ldd $out/opt/appgate/appgate | grep -i 'not found' && exit 1

     

       177
       177
       +
           ldd $out/opt/appgate/service/appgateservice.bin | grep -i 'not found' && exit 1

     

       178
       178
       +
           ldd $out/opt/appgate/appgate-driver | grep -i 'not found' && exit 1

     

       179
       179
       +
       

     

       173
       180
        
           wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]}

     

       174
       181
        
           wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH

     

       175
       175
       -
           wrapProgram $out/bin/appgate --prefix PATH : ${xdg-utils}/bin

     

       182
       182
       +
           wrapProgram $out/bin/appgate --prefix PATH : ${lib.makeBinPath [ xdg-utils ]}

     

       176
       183
        
         '';

     

       177
       184
        
         meta = with lib; {

     

       178
       185
        
           description = "Appgate SDP (Software Defined Perimeter) desktop client";

+9

pkgs/applications/networking/cluster/hetzner-kube/default.nix

···

       11
       11
        
           sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           # Use $HOME instead of the OS user database.

     

       16
       16
       +
           # Upstream PR: https://github.com/xetys/hetzner-kube/pull/346

     

       17
       17
       +
           # Unfortunately, the PR patch does not apply against release.

     

       18
       18
       +
           ./fix-home.patch

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       14
       21
        
         vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h";

     

       15
       22
        
       

     

       16
       23
        
         doCheck = false;

     
···

       25
       32
        
         ];

     

       26
       33
        
       

     

       27
       34
        
         postInstall = ''

     

       35
       35
       +
           # Need a writable home, because it fails if unable to write config.

     

       36
       36
       +
           export HOME=$TMP

     

       28
       37
        
           $out/bin/hetzner-kube completion bash > hetzner-kube

     

       29
       38
        
           $out/bin/hetzner-kube completion zsh > _hetzner-kube

     

       30
       39
        
           installShellCompletion --zsh _hetzner-kube

+53

pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch

···

       1
       1
       +
       diff --git a/cmd/cluster_kubeconfig.go b/cmd/cluster_kubeconfig.go

     

       2
       2
       +
       index 54cc0c9..fab288a 100644

     

       3
       3
       +
       --- a/cmd/cluster_kubeconfig.go

     

       4
       4
       +
       +++ b/cmd/cluster_kubeconfig.go

     

       5
       5
       +
       @@ -6,7 +6,7 @@ import (

     

       6
       6
       +
        	"io/ioutil"

     

       7
       7
       +
        	"log"

     

       8
       8
       +
        	"os"

     

       9
       9
       +
       -	"os/user"

     

       10
       10
       +
       +	"path/filepath"

     

       11
       11
       +
        	"strings"

     

       12
       12
       +
        

     

       13
       13
       +
        	"github.com/spf13/cobra"

     

       14
       14
       +
       @@ -52,9 +52,8 @@ Example 4: hetzner-kube cluster kubeconfig -n my-cluster -p > my-conf.yaml # pri

     

       15
       15
       +
        		} else {

     

       16
       16
       +
        			fmt.Println("create file")

     

       17
       17
       +
        

     

       18
       18
       +
       -			usr, _ := user.Current()

     

       19
       19
       +
       -			dir := usr.HomeDir

     

       20
       20
       +
       -			path := fmt.Sprintf("%s/.kube", dir)

     

       21
       21
       +
       +			dir, _ := os.UserHomeDir()

     

       22
       22
       +
       +			path := filepath.Join(dir, ".kube")

     

       23
       23
       +
        

     

       24
       24
       +
        			if _, err := os.Stat(path); os.IsNotExist(err) {

     

       25
       25
       +
        				os.MkdirAll(path, 0755)

     

       26
       26
       +
       diff --git a/cmd/config.go b/cmd/config.go

     

       27
       27
       +
       index ce0f3e5..a03c4ba 100644

     

       28
       28
       +
       --- a/cmd/config.go

     

       29
       29
       +
       +++ b/cmd/config.go

     

       30
       30
       +
       @@ -8,7 +8,6 @@ import (

     

       31
       31
       +
        	"io/ioutil"

     

       32
       32
       +
        	"log"

     

       33
       33
       +
        	"os"

     

       34
       34
       +
       -	"os/user"

     

       35
       35
       +
        	"path/filepath"

     

       36
       36
       +
        

     

       37
       37
       +
        	"github.com/hetznercloud/hcloud-go/hcloud"

     

       38
       38
       +
       @@ -28,13 +27,8 @@ type AppSSHClient struct {

     

       39
       39
       +
        // NewAppConfig creates a new AppConfig struct using the locally saved configuration file. If no local

     

       40
       40
       +
        // configuration file is found a new config will be created.

     

       41
       41
       +
        func NewAppConfig() AppConfig {

     

       42
       42
       +
       -	usr, err := user.Current()

     

       43
       43
       +
       -	if err != nil {

     

       44
       44
       +
       -		return AppConfig{}

     

       45
       45
       +
       -	}

     

       46
       46
       +
       -	if usr.HomeDir != "" {

     

       47
       47
       +
       -		DefaultConfigPath = filepath.Join(usr.HomeDir, ".hetzner-kube")

     

       48
       48
       +
       -	}

     

       49
       49
       +
       +	dir, _ := os.UserHomeDir()

     

       50
       50
       +
       +	DefaultConfigPath = filepath.Join(dir, ".hetzner-kube")

     

       51
       51
       +
        

     

       52
       52
       +
        	appConf := AppConfig{

     

       53
       53
       +
        		Context: context.Background(),

+9

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       436
       436
        
           "sha256": "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg",

     

       437
       437
        
           "version": "1.2.0"

     

       438
       438
        
         },

     

       439
       439
       +
         "hydra": {

     

       440
       440
       +
           "owner": "DeterminateSystems",

     

       441
       441
       +
           "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra",

     

       442
       442
       +
           "repo": "terraform-provider-hydra",

     

       443
       443
       +
           "rev": "v0.1.0",

     

       444
       444
       +
           "sha256": "18c9j54fy1f2sfz317rlv8z7fb18bpc1a0baw1bgl72x5sgil5kv",

     

       445
       445
       +
           "vendorSha256": null,

     

       446
       446
       +
           "version": "0.1.0"

     

       447
       447
       +
         },

     

       439
       448
        
         "ibm": {

     

       440
       449
        
           "owner": "IBM-Cloud",

     

       441
       450
        
           "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",

+2 -2

pkgs/applications/networking/nextdns/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "nextdns";

     

       5
       5
       -
         version = "1.10.1";

     

       5
       5
       +
         version = "1.11.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nextdns";

     

       9
       9
        
           repo = "nextdns";

     

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

     

       11
       11
       -
           sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow=";

     

       11
       11
       +
           sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc=";

+1

pkgs/applications/science/electronics/gnucap/default.nix

···

       21
       21
        
           changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}";

     

       22
       22
        
           license = licenses.gpl3Plus;

     

       23
       23
        
           platforms = platforms.all;

     

       24
       24
       +
           broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH

     

       24
       25
        
           maintainers = [ maintainers.raboof ];

     

       25
       26
        
         };

     

       26
       27
        
       }

+3 -1

pkgs/applications/terminal-emulators/foot/default.nix

···

       104
       104
        
           tllist

     

       105
       105
        
           wayland-protocols

     

       106
       106
        
           pkg-config

     

       107
       107
       -
         ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm;

     

       107
       107
       +
         ] ++ lib.optionals (compilerName == "clang") [

     

       108
       108
       +
           stdenv.cc.cc.libllvm.out

     

       109
       109
       +
         ];

     

       108
       110
        
       

     

       109
       111
        
         buildInputs = [

     

       110
       112
        
           fontconfig

+2 -2

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

···

       13
       13
        
       in

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "gitkraken";

     

       16
       16
       -
         version = "7.5.5";

     

       16
       16
       +
         version = "7.6.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchzip {

     

       19
       19
        
           url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";

     

       20
       20
       -
           sha256 = "0l40ap0ck2ywjarmn7lmpw4qbsdkx717d9kmx67p4qlmbwpimqhg";

     

       20
       20
       +
           sha256 = "11818d8ph9qqisdpkv46afhr79qq128gaz5d0n7b48dx25ih1jb9";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         dontBuild = true;

+29

pkgs/build-support/trivial-builders.nix

···

       438
       438
        
             done < graph

     

       439
       439
        
           '';

     

       440
       440
        
       

     

       441
       441
       +
         /*

     

       442
       442
       +
           Write the set of references to a file, that is, their immediate dependencies.

     

       443
       443
       +
       

     

       444
       444
       +
           This produces the equivalent of `nix-store -q --references`.

     

       445
       445
       +
          */

     

       446
       446
       +
         writeDirectReferencesToFile = path: runCommand "runtime-references"

     

       447
       447
       +
           {

     

       448
       448
       +
             exportReferencesGraph = ["graph" path];

     

       449
       449
       +
             inherit path;

     

       450
       450
       +
           }

     

       451
       451
       +
           ''

     

       452
       452
       +
             touch ./references

     

       453
       453
       +
             while read p; do

     

       454
       454
       +
               read dummy

     

       455
       455
       +
               read nrRefs

     

       456
       456
       +
               if [[ $p == $path ]]; then

     

       457
       457
       +
                 for ((i = 0; i < nrRefs; i++)); do

     

       458
       458
       +
                   read ref;

     

       459
       459
       +
                   echo $ref >>./references

     

       460
       460
       +
                 done

     

       461
       461
       +
               else

     

       462
       462
       +
                 for ((i = 0; i < nrRefs; i++)); do

     

       463
       463
       +
                   read ref;

     

       464
       464
       +
                 done

     

       465
       465
       +
               fi

     

       466
       466
       +
             done < graph

     

       467
       467
       +
             sort ./references >$out

     

       468
       468
       +
           '';

     

       469
       469
       +
       

     

       441
       470
        
       

     

       442
       471
        
         /* Print an error message if the file with the specified name and

     

       443
       472
        
          * hash doesn't exist in the Nix store. This function should only

+20

pkgs/build-support/trivial-builders/test.nix

···

       1
       1
       +
       { lib, nixosTest, path, writeText, hello, figlet, stdenvNoCC }:

     

       2
       2
       +
       

     

       3
       3
       +
       nixosTest {

     

       4
       4
       +
         name = "nixpkgs-trivial-builders";

     

       5
       5
       +
         nodes.machine = { ... }: {

     

       6
       6
       +
           virtualisation.writableStore = true;

     

       7
       7
       +
       

     

       8
       8
       +
           # Test runs without network, so we don't substitute and prepare our deps

     

       9
       9
       +
           nix.binaryCaches = lib.mkForce [];

     

       10
       10
       +
           environment.etc."pre-built-paths".source = writeText "pre-built-paths" (

     

       11
       11
       +
             builtins.toJSON [hello figlet stdenvNoCC]

     

       12
       12
       +
           );

     

       13
       13
       +
         };

     

       14
       14
       +
         testScript = ''

     

       15
       15
       +
           machine.succeed("""

     

       16
       16
       +
             cd ${lib.cleanSource path}

     

       17
       17
       +
             ./pkgs/build-support/trivial-builders/test.sh 2>/dev/console

     

       18
       18
       +
           """)

     

       19
       19
       +
         '';

     

       20
       20
       +
       }

+57

pkgs/build-support/trivial-builders/test.sh

···

       1
       1
       +
       #!/usr/bin/env bash

     

       2
       2
       +
       

     

       3
       3
       +
       # -------------------------------------------------------------------------- #

     

       4
       4
       +
       #

     

       5
       5
       +
       #                         trivial-builders test

     

       6
       6
       +
       #

     

       7
       7
       +
       # -------------------------------------------------------------------------- #

     

       8
       8
       +
       #

     

       9
       9
       +
       #  This file can be run independently (quick):

     

       10
       10
       +
       #

     

       11
       11
       +
       #      $ pkgs/build-support/trivial-builders/test.sh

     

       12
       12
       +
       #

     

       13
       13
       +
       #  or in the build sandbox with a ~20s VM overhead

     

       14
       14
       +
       #

     

       15
       15
       +
       #      $ nix-build -A tests.trivial-builders

     

       16
       16
       +
       #

     

       17
       17
       +
       # -------------------------------------------------------------------------- #

     

       18
       18
       +
       

     

       19
       19
       +
       # strict bash

     

       20
       20
       +
       set -euo pipefail

     

       21
       21
       +
       

     

       22
       22
       +
       # debug

     

       23
       23
       +
       # set -x

     

       24
       24
       +
       # PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'

     

       25
       25
       +
       

     

       26
       26
       +
       cd "$(dirname ${BASH_SOURCE[0]})"  # nixpkgs root

     

       27
       27
       +
       

     

       28
       28
       +
       testDirectReferences() {

     

       29
       29
       +
         expr="$1"

     

       30
       30
       +
         diff -U3 \

     

       31
       31
       +
           <(sort <$(nix-build --no-out-link --expr "with import ../../.. {}; writeDirectReferencesToFile ($expr)")) \

     

       32
       32
       +
           <(nix-store -q --references $(nix-build --no-out-link --expr "with import ../../.. {}; ($expr)") | sort)

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       testDirectReferences 'hello'

     

       36
       36
       +
       testDirectReferences 'figlet'

     

       37
       37
       +
       testDirectReferences 'writeText "hi" "hello"'

     

       38
       38
       +
       testDirectReferences 'writeText "hi" "hello ${hello}"'

     

       39
       39
       +
       testDirectReferences 'writeText "hi" "hello ${hello} ${figlet}"'

     

       40
       40
       +
       

     

       41
       41
       +
       

     

       42
       42
       +
       

     

       43
       43
       +
       testClosure() {

     

       44
       44
       +
         expr="$1"

     

       45
       45
       +
         diff -U3 \

     

       46
       46
       +
           <(sort <$(nix-build --no-out-link --expr "with import ../../.. {}; writeReferencesToFile ($expr)")) \

     

       47
       47
       +
           <(nix-store -q --requisites $(nix-build --no-out-link --expr "with import ../../.. {}; ($expr)") | sort)

     

       48
       48
       +
       }

     

       49
       49
       +
       

     

       50
       50
       +
       testClosure 'hello'

     

       51
       51
       +
       testClosure 'figlet'

     

       52
       52
       +
       testClosure 'writeText "hi" "hello"'

     

       53
       53
       +
       testClosure 'writeText "hi" "hello ${hello}"'

     

       54
       54
       +
       testClosure 'writeText "hi" "hello ${hello} ${figlet}"'

     

       55
       55
       +
       

     

       56
       56
       +
       

     

       57
       57
       +
       echo 'OK!'

+40 -10

pkgs/development/arduino/platformio/core.nix

···

       1
       1
       -
       { stdenv, lib, buildPythonApplication, bottle

     

       2
       2
       -
       , click, click-completion, colorama, semantic-version

     

       3
       3
       -
       , lockfile, pyserial, requests

     

       4
       4
       -
       , tabulate, pyelftools, marshmallow

     

       5
       5
       -
       , pytest, tox, jsondiff

     

       6
       6
       -
       , git, spdx-license-list-data

     

       1
       1
       +
       { stdenv, lib, buildPythonApplication

     

       2
       2
       +
       , ajsonrpc

     

       3
       3
       +
       , bottle

     

       4
       4
       +
       , click

     

       5
       5
       +
       , click-completion

     

       6
       6
       +
       , colorama

     

       7
       7
       +
       , git

     

       8
       8
       +
       , jsondiff

     

       9
       9
       +
       , lockfile

     

       10
       10
       +
       , marshmallow

     

       11
       11
       +
       , pyelftools

     

       12
       12
       +
       , pyserial

     

       13
       13
       +
       , pytest

     

       14
       14
       +
       , requests

     

       15
       15
       +
       , semantic-version

     

       16
       16
       +
       , spdx-license-list-data

     

       17
       17
       +
       , starlette

     

       18
       18
       +
       , tabulate

     

       19
       19
       +
       , tox

     

       20
       20
       +
       , uvicorn

     

       21
       21
       +
       , wsproto

     

       22
       22
       +
       , zeroconf

     

       7
       23
        
       , version, src

     

       8
       24
        
       }:

     

       9
       25
        
       

     
···

       78
       94
        
         pname = "platformio";

     

       79
       95
        
         inherit version src;

     

       80
       96
        
       

     

       81
       81
       -
         propagatedBuildInputs =  [

     

       82
       82
       -
           bottle click click-completion colorama git

     

       83
       83
       -
           lockfile pyserial requests semantic-version

     

       84
       84
       -
           tabulate pyelftools marshmallow

     

       97
       97
       +
         propagatedBuildInputs = [

     

       98
       98
       +
           ajsonrpc

     

       99
       99
       +
           bottle

     

       100
       100
       +
           click

     

       101
       101
       +
           click-completion

     

       102
       102
       +
           colorama

     

       103
       103
       +
           git

     

       104
       104
       +
           lockfile

     

       105
       105
       +
           marshmallow

     

       106
       106
       +
           pyelftools

     

       107
       107
       +
           pyserial

     

       108
       108
       +
           requests

     

       109
       109
       +
           semantic-version

     

       110
       110
       +
           starlette

     

       111
       111
       +
           tabulate

     

       112
       112
       +
           uvicorn

     

       113
       113
       +
           wsproto

     

       114
       114
       +
           zeroconf

     

       85
       115
        
         ];

     

       86
       116
        
       

     

       87
       117
        
         HOME = "/tmp";

+2 -2

pkgs/development/arduino/platformio/default.nix

···

       4
       4
        
       let

     

       5
       5
        
         callPackage = newScope self;

     

       6
       6
        
       

     

       7
       7
       -
         version = "5.0.4";

     

       7
       7
       +
         version = "5.1.1";

     

       8
       8
        
       

     

       9
       9
        
         # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "platformio";

     

       12
       12
        
           repo = "platformio-core";

     

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

     

       14
       14
       -
           sha256 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84";

     

       14
       14
       +
           sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         self = {

+7 -3

pkgs/development/arduino/platformio/use-local-spdx-license-list.patch

···

       1
       1
        
       diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py

     

       2
       2
       -
       index f293ba5a..a818271f 100644

     

       2
       2
       +
       index addc4c5..514b0ad 100644

     

       3
       3
        
       --- a/platformio/package/manifest/schema.py

     

       4
       4
        
       +++ b/platformio/package/manifest/schema.py

     

       5
       5
       -
       @@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema):

     

       5
       5
       +
       @@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema):

     

       6
       6
        
            @staticmethod

     

       7
       7
        
            @memoized(expire="1h")

     

       8
       8
        
            def load_spdx_licenses():

     

       9
       9
       -
       -        spdx_data_url = "https://dl.bintray.com/platformio/dl-misc/spdx-licenses-3.json"

     

       9
       9
       +
       -        version = "3.12"

     

       10
       10
       +
       -        spdx_data_url = (

     

       11
       11
       +
       -            "https://raw.githubusercontent.com/spdx/license-list-data/"

     

       12
       12
       +
       -            "v%s/json/licenses.json" % version

     

       13
       13
       +
       -        )

     

       10
       14
        
       -        return json.loads(fetch_remote_content(spdx_data_url))

     

       11
       15
        
       +        return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json"))

+1

pkgs/development/beam-modules/default.nix

···

       23
       23
        
       

     

       24
       24
        
             # rebar3 port compiler plugin is required by buildRebar3

     

       25
       25
        
             pc = callPackage ./pc { };

     

       26
       26
       +
             rebar3-nix = callPackage ./rebar3-nix { };

     

       26
       27
        
       

     

       27
       28
        
             fetchHex = callPackage ./fetch-hex.nix { };

     

       28
       29

+18

pkgs/development/beam-modules/rebar3-nix/default.nix

···

       1
       1
       +
       { lib, buildRebar3, fetchFromGitHub }:

     

       2
       2
       +
       buildRebar3 rec {

     

       3
       3
       +
         name = "rebar3_nix";

     

       4
       4
       +
         version = "0.1.0";

     

       5
       5
       +
         src = fetchFromGitHub {

     

       6
       6
       +
           owner = "erlang-nix";

     

       7
       7
       +
           repo = name;

     

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

     

       9
       9
       +
           sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         meta = {

     

       13
       13
       +
           description = "nix integration for rebar3";

     

       14
       14
       +
           license = lib.licenses.bsd3;

     

       15
       15
       +
           homepage = "https://github.com/erlang-nix/rebar3_nix";

     

       16
       16
       +
           maintainers = with lib.maintainers; [ dlesl gleber ];

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+72

pkgs/development/compilers/julia/1.0-bin.nix

···

       1
       1
       +
       { autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "julia-bin";

     

       5
       5
       +
         version = "1.0.5";

     

       6
       6
       +
       

     

       7
       7
       +
         src = {

     

       8
       8
       +
           x86_64-linux = fetchurl {

     

       9
       9
       +
             url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";

     

       10
       10
       +
             sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx";

     

       11
       11
       +
           };

     

       12
       12
       +
         }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       13
       13
       +
       

     

       14
       14
       +
         # Julia’s source files are in different locations for source and binary

     

       15
       15
       +
         # releases. Thus we temporarily create symlinks to allow us to share patches

     

       16
       16
       +
         # with source releases.

     

       17
       17
       +
         prePatch = ''

     

       18
       18
       +
           ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib

     

       19
       19
       +
           ln -s share/julia/test

     

       20
       20
       +
         '';

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           # Source release Nix patch(es) relevant for binary releases as well.

     

       23
       23
       +
           ./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch

     

       24
       24
       +
         ];

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           # Revert symlink hack.

     

       27
       27
       +
           rm stdlib test

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [ makeWrapper ];

     

       31
       31
       +
         nativeBuildInputs = [ autoPatchelfHook ];

     

       32
       32
       +
       

     

       33
       33
       +
         installPhase = ''

     

       34
       34
       +
           runHook preInstall

     

       35
       35
       +
           cp -r . $out

     

       36
       36
       +
           # Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is

     

       37
       37
       +
           # only necessary on v1.0.x and a cleaner solution is welcome, but after

     

       38
       38
       +
           # staring at `strace` for a few hours this is as clean as I could make it.

     

       39
       39
       +
           wrapProgram $out/bin/julia \

     

       40
       40
       +
             --suffix LD_LIBRARY_PATH : $out/lib

     

       41
       41
       +
           runHook postInstall

     

       42
       42
       +
         '';

     

       43
       43
       +
       

     

       44
       44
       +
         # Breaks backtraces, etc.

     

       45
       45
       +
         dontStrip = true;

     

       46
       46
       +
       

     

       47
       47
       +
         doInstallCheck = true;

     

       48
       48
       +
         installCheckInputs = [ openssl ];

     

       49
       49
       +
         preInstallCheck = ''

     

       50
       50
       +
           # Some tests require read/write access to $HOME.

     

       51
       51
       +
           export HOME="$TMPDIR"

     

       52
       52
       +
         '';

     

       53
       53
       +
         installCheckPhase = ''

     

       54
       54
       +
           runHook preInstallCheck

     

       55
       55
       +
           # Command lifted from `test/Makefile`.

     

       56
       56
       +
           $out/bin/julia \

     

       57
       57
       +
             --check-bounds=yes \

     

       58
       58
       +
             --startup-file=no \

     

       59
       59
       +
             --depwarn=error \

     

       60
       60
       +
             $out/share/julia/test/runtests.jl

     

       61
       61
       +
           runHook postInstallCheck

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         meta = {

     

       65
       65
       +
           description = "High-level, high-performance dynamic language for technical computing";

     

       66
       66
       +
           homepage = "https://julialang.org";

     

       67
       67
       +
           # Bundled and linked with various GPL code, although Julia itself is MIT.

     

       68
       68
       +
           license = lib.licenses.gpl2Plus;

     

       69
       69
       +
           maintainers = with lib.maintainers; [ ninjin raskin ];

     

       70
       70
       +
           platforms = [ "x86_64-linux" ];

     

       71
       71
       +
         };

     

       72
       72
       +
       }

+73

pkgs/development/compilers/julia/1.6-bin.nix

···

       1
       1
       +
       { autoPatchelfHook, fetchurl, lib, stdenv }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "julia-bin";

     

       5
       5
       +
         version = "1.6.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = {

     

       8
       8
       +
           x86_64-linux = fetchurl {

     

       9
       9
       +
             url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";

     

       10
       10
       +
             sha256 = "01i5sm4vqb0y5qznql571zap19b42775drrcxnzsyhpaqgg8m23w";

     

       11
       11
       +
           };

     

       12
       12
       +
         }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       13
       13
       +
       

     

       14
       14
       +
         # Julia’s source files are in different locations for source and binary

     

       15
       15
       +
         # releases. Thus we temporarily create a symlink to allow us to share patches

     

       16
       16
       +
         # with source releases.

     

       17
       17
       +
         prePatch = ''

     

       18
       18
       +
           ln -s share/julia/test

     

       19
       19
       +
         '';

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           # Source release Nix patch(es) relevant for binary releases as well.

     

       22
       22
       +
           ./patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch

     

       23
       23
       +
           ./patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch

     

       24
       24
       +
           ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch

     

       25
       25
       +
         ];

     

       26
       26
       +
         postPatch = ''

     

       27
       27
       +
           # Revert symlink hack.

     

       28
       28
       +
           rm test

     

       29
       29
       +
       

     

       30
       30
       +
           # Julia fails to pick up our Certification Authority root certificates, but

     

       31
       31
       +
           # it provides its own so we can simply disable the test. Patching in the

     

       32
       32
       +
           # dynamic path to ours require us to rebuild the Julia system image.

     

       33
       33
       +
           substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \

     

       34
       34
       +
             --replace '@test ca_roots_path() != bundled_ca_roots()' \

     

       35
       35
       +
               '@test_skip ca_roots_path() != bundled_ca_roots()'

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         nativeBuildInputs = [ autoPatchelfHook ];

     

       39
       39
       +
       

     

       40
       40
       +
         installPhase = ''

     

       41
       41
       +
           runHook preInstall

     

       42
       42
       +
           cp -r . $out

     

       43
       43
       +
           runHook postInstall

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         # Breaks backtraces, etc.

     

       47
       47
       +
         dontStrip = true;

     

       48
       48
       +
       

     

       49
       49
       +
         doInstallCheck = true;

     

       50
       50
       +
         preInstallCheck = ''

     

       51
       51
       +
           # Some tests require read/write access to $HOME.

     

       52
       52
       +
           export HOME="$TMPDIR"

     

       53
       53
       +
         '';

     

       54
       54
       +
         installCheckPhase = ''

     

       55
       55
       +
           runHook preInstallCheck

     

       56
       56
       +
           # Command lifted from `test/Makefile`.

     

       57
       57
       +
           $out/bin/julia \

     

       58
       58
       +
             --check-bounds=yes \

     

       59
       59
       +
             --startup-file=no \

     

       60
       60
       +
             --depwarn=error \

     

       61
       61
       +
             $out/share/julia/test/runtests.jl

     

       62
       62
       +
           runHook postInstallCheck

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       65
       65
       +
         meta = {

     

       66
       66
       +
           description = "High-level, high-performance dynamic language for technical computing.";

     

       67
       67
       +
           homepage = "https://julialang.org";

     

       68
       68
       +
           # Bundled and linked with various GPL code, although Julia itself is MIT.

     

       69
       69
       +
           license = lib.licenses.gpl2Plus;

     

       70
       70
       +
           maintainers = with lib.maintainers; [ ninjin raskin ];

     

       71
       71
       +
           platforms = [ "x86_64-linux" ];

     

       72
       72
       +
         };

     

       73
       73
       +
       }

+87

pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch

···

       1
       1
       +
       From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Pontus Stenetorp <pontus@stenetorp.se>

     

       3
       3
       +
       Date: Mon, 15 Mar 2021 05:55:18 +0000

     

       4
       4
       +
       Subject: [PATCH 2/3] nix: Skip tests that require network access

     

       5
       5
       +
       

     

       6
       6
       +
       Necessary as the Nix build sandbox does not permit network access.

     

       7
       7
       +
       ---

     

       8
       8
       +
        stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++-----------------

     

       9
       9
       +
        test/file.jl                    |  4 ++--

     

       10
       10
       +
        2 files changed, 22 insertions(+), 22 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl

     

       13
       13
       +
       index 6145f87616..9cc7a001e5 100644

     

       14
       14
       +
       --- a/stdlib/Sockets/test/runtests.jl

     

       15
       15
       +
       +++ b/stdlib/Sockets/test/runtests.jl

     

       16
       16
       +
       @@ -151,33 +151,33 @@ defaultport = rand(2000:4000)

     

       17
       17
       +
        end

     

       18
       18
       +
        

     

       19
       19
       +
        @testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin

     

       20
       20
       +
       -    @test getnameinfo(ip"192.0.2.1") == "192.0.2.1"

     

       21
       21
       +
       -    @test getnameinfo(ip"198.51.100.1") == "198.51.100.1"

     

       22
       22
       +
       -    @test getnameinfo(ip"203.0.113.1") == "203.0.113.1"

     

       23
       23
       +
       -    @test getnameinfo(ip"0.1.1.1") == "0.1.1.1"

     

       24
       24
       +
       -    @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1"

     

       25
       25
       +
       -    @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1"

     

       26
       26
       +
       -    @test getnameinfo(ip"2001:db8::1") == "2001:db8::1"

     

       27
       27
       +
       +    @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1"

     

       28
       28
       +
       +    @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1"

     

       29
       29
       +
       +    @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1"

     

       30
       30
       +
       +    @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1"

     

       31
       31
       +
       +    @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1"

     

       32
       32
       +
       +    @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1"

     

       33
       33
       +
       +    @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1"

     

       34
       34
       +
        end

     

       35
       35
       +
        

     

       36
       36
       +
        @testset "getnameinfo on some valid IP addresses" begin

     

       37
       37
       +
            @test !isempty(getnameinfo(ip"::")::String)

     

       38
       38
       +
       -    @test !isempty(getnameinfo(ip"0.0.0.0")::String)

     

       39
       39
       +
       -    @test !isempty(getnameinfo(ip"10.1.0.0")::String)

     

       40
       40
       +
       -    @test !isempty(getnameinfo(ip"10.1.0.255")::String)

     

       41
       41
       +
       -    @test !isempty(getnameinfo(ip"10.1.255.1")::String)

     

       42
       42
       +
       -    @test !isempty(getnameinfo(ip"255.255.255.255")::String)

     

       43
       43
       +
       -    @test !isempty(getnameinfo(ip"255.255.255.0")::String)

     

       44
       44
       +
       -    @test !isempty(getnameinfo(ip"192.168.0.1")::String)

     

       45
       45
       +
       -    @test !isempty(getnameinfo(ip"::1")::String)

     

       46
       46
       +
       +    @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String)

     

       47
       47
       +
       +    @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String)

     

       48
       48
       +
       +    @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String)

     

       49
       49
       +
       +    @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String)

     

       50
       50
       +
       +    @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String)

     

       51
       51
       +
       +    @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String)

     

       52
       52
       +
       +    @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String)

     

       53
       53
       +
       +    @test_skip !isempty(getnameinfo(ip"::1")::String)

     

       54
       54
       +
        end

     

       55
       55
       +
        

     

       56
       56
       +
        @testset "getaddrinfo" begin

     

       57
       57
       +
       -    let localhost = getnameinfo(ip"127.0.0.1")::String

     

       58
       58
       +
       -        @test !isempty(localhost) && localhost != "127.0.0.1"

     

       59
       59
       +
       -        @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr})

     

       60
       60
       +
       -        @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0"

     

       61
       61
       +
       -        @test try

     

       62
       62
       +
       +    let localhost = getnameinfo(ip"::")::String

     

       63
       63
       +
       +        @test_skip !isempty(localhost) && localhost != "127.0.0.1"

     

       64
       64
       +
       +        @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr})

     

       65
       65
       +
       +        @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0"

     

       66
       66
       +
       +        @test_skip try

     

       67
       67
       +
                    getaddrinfo(localhost, IPv6)::IPv6 != ip"::"

     

       68
       68
       +
                catch ex

     

       69
       69
       +
                    isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost

     

       70
       70
       +
       diff --git a/test/file.jl b/test/file.jl

     

       71
       71
       +
       index e86476f975..579276f82c 100644

     

       72
       72
       +
       --- a/test/file.jl

     

       73
       73
       +
       +++ b/test/file.jl

     

       74
       74
       +
       @@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER)

     

       75
       75
       +
        else

     

       76
       76
       +
            @test_throws ErrorException symlink(file, "ba\0d")

     

       77
       77
       +
        end

     

       78
       78
       +
       -@test_throws ArgumentError download("good", "ba\0d")

     

       79
       79
       +
       -@test_throws ArgumentError download("ba\0d", "good")

     

       80
       80
       +
       +@test_skip @test_throws ArgumentError download("good", "ba\0d")

     

       81
       81
       +
       +@test_skip @test_throws ArgumentError download("ba\0d", "good")

     

       82
       82
       +
        

     

       83
       83
       +
        ###################

     

       84
       84
       +
        #     walkdir     #

     

       85
       85
       +
       -- 

     

       86
       86
       +
       2.29.3

     

       87
       87
       +

+28

pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch

···

       1
       1
       +
       From ffe227676352a910754d96d92e9b06e475f28ff1 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Pontus Stenetorp <pontus@stenetorp.se>

     

       3
       3
       +
       Date: Thu, 8 Apr 2021 04:25:19 +0000

     

       4
       4
       +
       Subject: [PATCH 2/6] nix: Skip `tempname` test broken in sandbox

     

       5
       5
       +
       

     

       6
       6
       +
       Reported upstream:

     

       7
       7
       +
       

     

       8
       8
       +
           https://github.com/JuliaLang/julia/issues/38873

     

       9
       9
       +
       ---

     

       10
       10
       +
        test/file.jl | 2 +-

     

       11
       11
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/test/file.jl b/test/file.jl

     

       14
       14
       +
       index 0f39bc7c14..bd4dd78f62 100644

     

       15
       15
       +
       --- a/test/file.jl

     

       16
       16
       +
       +++ b/test/file.jl

     

       17
       17
       +
       @@ -95,7 +95,7 @@ end

     

       18
       18
       +
            @test dirname(t) == tempdir()

     

       19
       19
       +
            mktempdir() do d

     

       20
       20
       +
                t = tempname(d)

     

       21
       21
       +
       -        @test dirname(t) == d

     

       22
       22
       +
       +        @test_skip dirname(t) == d

     

       23
       23
       +
            end

     

       24
       24
       +
            @test_throws ArgumentError tempname(randstring())

     

       25
       25
       +
        end

     

       26
       26
       +
       -- 

     

       27
       27
       +
       2.29.3

     

       28
       28
       +

+27

pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch

···

       1
       1
       +
       From b20357fb1044d2c100172b1d5cbdf6c6d9bd3590 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Pontus Stenetorp <pontus@stenetorp.se>

     

       3
       3
       +
       Date: Thu, 8 Apr 2021 05:10:39 +0000

     

       4
       4
       +
       Subject: [PATCH 3/6] nix: Skip `chown` tests broken in sandbox

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        test/file.jl | 4 ++--

     

       8
       8
       +
        1 file changed, 2 insertions(+), 2 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/test/file.jl b/test/file.jl

     

       11
       11
       +
       index bd4dd78f62..06fd4e49da 100644

     

       12
       12
       +
       --- a/test/file.jl

     

       13
       13
       +
       +++ b/test/file.jl

     

       14
       14
       +
       @@ -503,8 +503,8 @@ if !Sys.iswindows()

     

       15
       15
       +
                @test stat(file).gid == 0

     

       16
       16
       +
                @test stat(file).uid == 0

     

       17
       17
       +
            else

     

       18
       18
       +
       -        @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1)  # Non-root user cannot change ownership to another user

     

       19
       19
       +
       -        @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2)  # Non-root user cannot change group to a group they are not a member of (eg: nogroup)

     

       20
       20
       +
       +        @test_skip @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1)  # Non-root user cannot change ownership to another user

     

       21
       21
       +
       +        @test_skip @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2)  # Non-root user cannot change group to a group they are not a member of (eg: nogroup)

     

       22
       22
       +
            end

     

       23
       23
       +
        else

     

       24
       24
       +
            # test that chown doesn't cause any errors for Windows

     

       25
       25
       +
       -- 

     

       26
       26
       +
       2.29.3

     

       27
       27
       +

+30

pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch

···

       1
       1
       +
       From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Pontus Stenetorp <pontus@stenetorp.se>

     

       3
       3
       +
       Date: Thu, 8 Apr 2021 04:37:44 +0000

     

       4
       4
       +
       Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox

     

       5
       5
       +
       

     

       6
       6
       +
       Disabled by default due to lack of networking in the Nix sandbox. This

     

       7
       7
       +
       greatly speeds up the build process on a multi-core system.

     

       8
       8
       +
       ---

     

       9
       9
       +
        test/runtests.jl | 5 +++--

     

       10
       10
       +
        1 file changed, 3 insertions(+), 2 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/test/runtests.jl b/test/runtests.jl

     

       13
       13
       +
       index 2f9cd058bb..2f8c19fa32 100644

     

       14
       14
       +
       --- a/test/runtests.jl

     

       15
       15
       +
       +++ b/test/runtests.jl

     

       16
       16
       +
       @@ -83,8 +83,9 @@ prepend!(tests, linalg_tests)

     

       17
       17
       +
        import LinearAlgebra

     

       18
       18
       +
        cd(@__DIR__) do

     

       19
       19
       +
            n = 1

     

       20
       20
       +
       -    if net_on

     

       21
       21
       +
       -        n = min(Sys.CPU_THREADS, length(tests))

     

       22
       22
       +
       +    if net_on || haskey(ENV, "NIX_BUILD_CORES")

     

       23
       23
       +
       +        x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS

     

       24
       24
       +
       +        n = min(x, Sys.CPU_THREADS, length(tests))

     

       25
       25
       +
                n > 1 && addprocs_with_testenv(n)

     

       26
       26
       +
                LinearAlgebra.BLAS.set_num_threads(1)

     

       27
       27
       +
            end

     

       28
       28
       +
       -- 

     

       29
       29
       +
       2.29.3

     

       30
       30
       +

+46

pkgs/development/coq-modules/aac-tactics/default.nix

···

       1
       1
       +
       { lib, mkCoqDerivation, coq, version ? null }:

     

       2
       2
       +
       with lib;

     

       3
       3
       +
       

     

       4
       4
       +
       mkCoqDerivation {

     

       5
       5
       +
         pname = "aac-tactics";

     

       6
       6
       +
       

     

       7
       7
       +
         releaseRev = v: "v${v}";

     

       8
       8
       +
       

     

       9
       9
       +
         release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY=";

     

       10
       10
       +
         release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM=";

     

       11
       11
       +
         release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU=";

     

       12
       12
       +
         release."8.10.0".sha256 = "sha256-Ny3AgfLAzrz3FnoUqejXLApW+krlkHBmYlo3gAG0JsM=";

     

       13
       13
       +
         release."8.9.0".sha256 = "sha256-6Pp0dgYEnVaSnkJR/2Cawt5qaxWDpBI4m0WAbQboeWY=";

     

       14
       14
       +
         release."8.8.0".sha256 = "sha256-mwIKp3kf/6i9IN3cyIWjoRtW8Yf8cc3MV744zzFM3u4=";

     

       15
       15
       +
         release."8.6.1".sha256 = "sha256-PfovQ9xJnzr0eh/tO66yJ3Yp7A5E1SQG46jLIrrbZFg=";

     

       16
       16
       +
         release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4=";

     

       17
       17
       +
       

     

       18
       18
       +
         inherit version;

     

       19
       19
       +
         defaultVersion = with versions; switch coq.coq-version [

     

       20
       20
       +
           { case = "8.13"; out = "8.13.0"; }

     

       21
       21
       +
           { case = "8.12"; out = "8.12.0"; }

     

       22
       22
       +
           { case = "8.11"; out = "8.11.0"; }

     

       23
       23
       +
           { case = "8.10"; out = "8.10.0"; }

     

       24
       24
       +
           { case = "8.9"; out = "8.9.0"; }

     

       25
       25
       +
           { case = "8.8"; out = "8.8.0"; }

     

       26
       26
       +
           { case = "8.6"; out = "8.6.1"; }

     

       27
       27
       +
           { case = "8.5"; out = "8.5.0"; }

     

       28
       28
       +
         ] null;

     

       29
       29
       +
       

     

       30
       30
       +
         mlPlugin = true;

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "Coq plugin providing tactics for rewriting universally quantified equations";

     

       34
       34
       +
           longDescription = ''

     

       35
       35
       +
             This Coq plugin provides tactics for rewriting universally quantified

     

       36
       36
       +
             equations, modulo associativity and commutativity of some operator.

     

       37
       37
       +
             The tactics can be applied for custom operators by registering the

     

       38
       38
       +
             operators and their properties as type class instances. Many common

     

       39
       39
       +
             operator instances, such as for Z binary arithmetic and booleans, are

     

       40
       40
       +
             provided with the plugin.

     

       41
       41
       +
           '';

     

       42
       42
       +
           maintainers = with maintainers; [ siraben ];

     

       43
       43
       +
           license = licenses.gpl3Plus;

     

       44
       44
       +
           platforms = platforms.unix;

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+35

pkgs/development/coq-modules/relation-algebra/default.nix

···

       1
       1
       +
       { lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }:

     

       2
       2
       +
       with lib;

     

       3
       3
       +
       

     

       4
       4
       +
       mkCoqDerivation {

     

       5
       5
       +
         pname = "relation-algebra";

     

       6
       6
       +
         owner = "damien-pous";

     

       7
       7
       +
       

     

       8
       8
       +
         releaseRev = v: "v${v}";

     

       9
       9
       +
       

     

       10
       10
       +
         release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU=";

     

       11
       11
       +
         release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM=";

     

       12
       12
       +
         release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos=";

     

       13
       13
       +
         release."1.7.2".sha256 = "sha256-f4oNjXspNMEz3AvhIeYO3avbUa1AThoC9DbcHMb5A2o=";

     

       14
       14
       +
         release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA=";

     

       15
       15
       +
       

     

       16
       16
       +
         inherit version;

     

       17
       17
       +
         defaultVersion = with versions; switch coq.coq-version [

     

       18
       18
       +
           { case = isGe "8.13"; out = "1.7.5"; }

     

       19
       19
       +
           { case = isGe "8.12"; out = "1.7.4"; }

     

       20
       20
       +
           { case = isGe "8.11"; out = "1.7.3"; }

     

       21
       21
       +
           { case = isGe "8.10"; out = "1.7.2"; }

     

       22
       22
       +
           { case = isGe "8.9"; out = "1.7.1"; }

     

       23
       23
       +
         ] null;

     

       24
       24
       +
       

     

       25
       25
       +
         mlPlugin = true;

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = {

     

       30
       30
       +
           description = "Relation algebra library for Coq";

     

       31
       31
       +
           maintainers = with maintainers; [ siraben ];

     

       32
       32
       +
           license = licenses.gpl3Plus;

     

       33
       33
       +
           platforms = platforms.unix;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+2 -2

pkgs/development/libraries/alembic/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec

     

       4
       4
        
       {

     

       5
       5
        
         pname = "alembic";

     

       6
       6
       -
         version = "1.8.0";

     

       6
       6
       +
         version = "1.8.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "alembic";

     

       10
       10
        
           repo = "alembic";

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "sha256-c4SN3kNY8415+O/2AYuHNQFEmuTBtLaWj5fsj0yJ2vs=";

     

       12
       12
       +
           sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         outputs = [ "bin" "dev" "out" "lib" ];

+12 -4

pkgs/development/libraries/libical/default.nix

···

       12
       12
        
       , libical

     

       13
       13
        
       , python3

     

       14
       14
        
       , tzdata

     

       15
       15
       +
       , fixDarwinDylibNames

     

       15
       16
        
       , introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform

     

       16
       16
       -
       , gobject-introspection ? null

     

       17
       17
       -
       , vala ? null

     

       17
       17
       +
       , gobject-introspection

     

       18
       18
       +
       , vala

     

       18
       19
        
       }:

     

       19
       19
       -
       

     

       20
       20
       -
       assert introspectionSupport -> gobject-introspection != null && vala != null;

     

       21
       20
        
       

     

       22
       21
        
       stdenv.mkDerivation rec {

     

       23
       22
        
         pname = "libical";

     
···

       47
       46
        
         ] ++ lib.optionals introspectionSupport [

     

       48
       47
        
           gobject-introspection

     

       49
       48
        
           vala

     

       49
       49
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       50
       50
       +
           fixDarwinDylibNames

     

       50
       51
        
         ];

     

       51
       52
        
         installCheckInputs = [

     

       52
       53
        
           # running libical-glib tests

     
···

       80
       81
        
         # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables

     

       81
       82
        
         doInstallCheck = true;

     

       82
       83
        
         enableParallelChecking = false;

     

       84
       84
       +
         preInstallCheck = if stdenv.isDarwin then ''

     

       85
       85
       +
           for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do

     

       86
       86
       +
             for lib in $(cd lib && ls *.3.dylib); do

     

       87
       87
       +
               install_name_tool -change $lib $out/lib/$lib $testexe

     

       88
       88
       +
             done

     

       89
       89
       +
           done

     

       90
       90
       +
         '' else null;

     

       83
       91
        
         installCheckPhase = ''

     

       84
       92
        
           runHook preInstallCheck

     

       85
       93

+26 -4

pkgs/development/libraries/v8/default.nix

···

       1
       1
        
       { stdenv, lib, fetchgit, fetchFromGitHub

     

       2
       2
       -
       , gn, ninja, python, glib, pkg-config, icu

     

       2
       2
       +
       , gn, ninja, python, pythonPackages, glib, pkg-config, icu

     

       3
       3
        
       , xcbuild, darwin

     

       4
       4
        
       , fetchpatch

     

       5
       5
        
       }:

     
···

       55
       55
        
         doCheck = true;

     

       56
       56
        
       

     

       57
       57
        
         patches = [

     

       58
       58
       +
           # Remove unrecognized clang debug flags

     

       59
       59
       +
           (fetchpatch {

     

       60
       60
       +
             url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch";

     

       61
       61
       +
             sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1";

     

       62
       62
       +
           })

     

       58
       63
        
           ./darwin.patch

     

       59
       64
        
           ./gcc_arm.patch  # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149

     

       60
       65
        
         ];

     
···

       78
       83
        
         postPatch = lib.optionalString stdenv.isAarch64 ''

     

       79
       84
        
           substituteInPlace build/toolchain/linux/BUILD.gn \

     

       80
       85
        
             --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

     

       86
       86
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       87
       87
       +
           substituteInPlace build/config/compiler/compiler.gni \

     

       88
       88
       +
             --replace 'strip_absolute_paths_from_debug_symbols = true' \

     

       89
       89
       +
                       'strip_absolute_paths_from_debug_symbols = false'

     

       90
       90
       +
           substituteInPlace build/config/compiler/BUILD.gn \

     

       91
       91
       +
             --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \

     

       92
       92
       +
                       'false'

     

       81
       93
        
         '';

     

       82
       94
        
       

     

       83
       95
        
         gnFlags = [

     
···

       85
       97
        
           "is_clang=${lib.boolToString stdenv.cc.isClang}"

     

       86
       98
        
           "use_sysroot=false"

     

       87
       99
        
           # "use_system_icu=true"

     

       100
       100
       +
           "clang_use_chrome_plugins=false"

     

       88
       101
        
           "is_component_build=false"

     

       89
       102
        
           "v8_use_external_startup_data=false"

     

       90
       103
        
           "v8_monolithic=true"

     
···

       93
       106
        
           "treat_warnings_as_errors=false"

     

       94
       107
        
           "v8_enable_i18n_support=true"

     

       95
       108
        
           "use_gold=false"

     

       96
       96
       -
           "use_system_xcode=true"

     

       109
       109
       +
           "init_stack_vars=false"

     

       97
       110
        
           # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''

     

       98
       111
        
           ''host_toolchain="//build/toolchain/linux/unbundle:default"''

     

       99
       112
        
           ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''

     

       100
       113
        
         ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';

     

       101
       114
        
       

     

       102
       115
        
         NIX_CFLAGS_COMPILE = "-O2";

     

       116
       116
       +
         FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";

     

       103
       117
        
       

     

       104
       104
       -
         nativeBuildInputs = [ gn ninja pkg-config python ]

     

       105
       105
       -
           ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];

     

       118
       118
       +
         nativeBuildInputs = [

     

       119
       119
       +
           gn

     

       120
       120
       +
           ninja

     

       121
       121
       +
           pkg-config

     

       122
       122
       +
           python

     

       123
       123
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       124
       124
       +
           xcbuild

     

       125
       125
       +
           darwin.DarwinTools

     

       126
       126
       +
           pythonPackages.setuptools

     

       127
       127
       +
         ];

     

       106
       128
        
         buildInputs = [ glib icu ];

     

       107
       129
        
       

     

       108
       130
        
         ninjaFlags = [ ":d8" "v8_monolith" ];

+8 -3

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       4
       5
        
       , pyyaml

     

       5
       6
        
       , prance

     

       6
       7
        
       , marshmallow

     
···

       11
       12
        
       

     

       12
       13
        
       buildPythonPackage rec {

     

       13
       14
        
         pname = "apispec";

     

       14
       14
       -
         version = "4.3.0";

     

       15
       15
       +
         version = "4.4.1";

     

       16
       16
       +
         disabled = pythonOlder "3.6";

     

       15
       17
        
       

     

       16
       18
        
         src = fetchPypi {

     

       17
       19
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "5ec0fe72f1422a1198973fcbb48d0eb5c7390f4b0fbe55474fce999ad6826a9b";

     

       20
       20
       +
           sha256 = "sha256-qt7UrkUXUsWLcOV5kj2Nt9rwtx9i3vjI/noqUr18BqI=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       21
       -
         checkInputs = [

     

       23
       23
       +
         propagatedBuildInputs = [

     

       22
       24
        
           pyyaml

     

       23
       25
        
           prance

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         checkInputs = [

     

       24
       29
        
           openapi-spec-validator

     

       25
       30
        
           marshmallow

     

       26
       31
        
           mock

+2 -2

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

···

       8
       8
        
       , numpy

     

       9
       9
        
       , pillow

     

       10
       10
        
       , scipy

     

       11
       11
       -
       , scikitlearn

     

       11
       11
       +
       , scikit-learn

     

       12
       12
        
       , scikitimage

     

       13
       13
        
       , threadpoolctl

     

       14
       14
        
       }:

     
···

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [

     

       31
       31
       -
           future numpy pillow scipy scikitlearn scikitimage threadpoolctl

     

       31
       31
       +
           future numpy pillow scipy scikit-learn scikitimage threadpoolctl

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         checkInputs = [ pytestCheckHook unittest2 ];

+2 -2

pkgs/development/python-modules/bayesian-optimization/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , python

     

       5
       5
       -
       , scikitlearn

     

       5
       5
       +
       , scikit-learn

     

       6
       6
        
       , scipy

     

       7
       7
        
       , pytest

     

       8
       8
        
       , isPy27

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

     

       24
       24
       -
           scikitlearn

     

       24
       24
       +
           scikit-learn

     

       25
       25
        
           scipy

     

       26
       26
        
         ];

     

       27
       27

+2 -2

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

···

       6
       6
        
       , biopython

     

       7
       7
        
       , numpy

     

       8
       8
        
       , scipy

     

       9
       9
       -
       , scikitlearn

     

       9
       9
       +
       , scikit-learn

     

       10
       10
        
       , pandas

     

       11
       11
        
       , matplotlib

     

       12
       12
        
       , reportlab

     
···

       42
       42
        
           biopython

     

       43
       43
        
           numpy

     

       44
       44
        
           scipy

     

       45
       45
       -
           scikitlearn

     

       45
       45
       +
           scikit-learn

     

       46
       46
        
           pandas

     

       47
       47
        
           matplotlib

     

       48
       48
        
           reportlab

+2 -2

pkgs/development/python-modules/dask-glm/default.nix

···

       7
       7
        
       , multipledispatch

     

       8
       8
        
       , setuptools-scm

     

       9
       9
        
       , scipy

     

       10
       10
       -
       , scikitlearn

     

       10
       10
       +
       , scikit-learn

     

       11
       11
        
       , pytestCheckHook

     

       12
       12
        
       }:

     

       13
       13
        
       

     
···

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ setuptools-scm ];

     

       24
       24
        
         checkInputs = [ pytestCheckHook ];

     

       25
       25
       -
         propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];

     

       25
       25
       +
         propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikit-learn ];

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

     

       28
       28
        
           homepage = "https://github.com/dask/dask-glm/";

+2 -2

pkgs/development/python-modules/dask-ml/default.nix

···

       6
       6
        
       , numpy, toolz # dask[array]

     

       7
       7
        
       , numba

     

       8
       8
        
       , pandas

     

       9
       9
       -
       , scikitlearn

     

       9
       9
       +
       , scikit-learn

     

       10
       10
        
       , scipy

     

       11
       11
        
       , dask-glm

     

       12
       12
        
       , six

     
···

       39
       39
        
           numpy

     

       40
       40
        
           packaging

     

       41
       41
        
           pandas

     

       42
       42
       -
           scikitlearn

     

       42
       42
       +
           scikit-learn

     

       43
       43
        
           scipy

     

       44
       44
        
           six

     

       45
       45
        
           toolz

+2 -2

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

···

       8
       8
        
       , pandas

     

       9
       9
        
       , scipy

     

       10
       10
        
       , numpy

     

       11
       11
       -
       , scikitlearn

     

       11
       11
       +
       , scikit-learn

     

       12
       12
        
       , lammps-cython

     

       13
       13
        
       , pymatgen-lammps

     

       14
       14
        
       , pytestrunner

     
···

       34
       34
        
           pandas

     

       35
       35
        
           scipy

     

       36
       36
        
           numpy

     

       37
       37
       -
           scikitlearn

     

       37
       37
       +
           scikit-learn

     

       38
       38
        
           lammps-cython

     

       39
       39
        
           pymatgen-lammps

     

       40
       40
        
         ];

+2 -2

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

···

       5
       5
        
       , six

     

       6
       6
        
       , scipy

     

       7
       7
        
       , smart_open

     

       8
       8
       -
       , scikitlearn, testfixtures, unittest2

     

       8
       8
       +
       , scikit-learn, testfixtures, unittest2

     

       9
       9
        
       , isPy3k

     

       10
       10
        
       }:

     

       11
       11
        
       

     
···

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ smart_open numpy six scipy ];

     

       23
       23
        
       

     

       24
       24
       -
         checkInputs = [ scikitlearn testfixtures unittest2 ];

     

       24
       24
       +
         checkInputs = [ scikit-learn testfixtures unittest2 ];

     

       25
       25
        
       

     

       26
       26
        
         # Two tests fail.

     

       27
       27
        
         #

+2 -2

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

···

       8
       8
        
       , matplotlib

     

       9
       9
        
       , networkx

     

       10
       10
        
       , numpy

     

       11
       11
       -
       , scikitlearn

     

       11
       11
       +
       , scikit-learn

     

       12
       12
        
       , scipy

     

       13
       13
        
       , seaborn

     

       14
       14
        
       }:

     
···

       31
       31
        
           matplotlib

     

       32
       32
        
           networkx

     

       33
       33
        
           numpy

     

       34
       34
       -
           scikitlearn

     

       34
       34
       +
           scikit-learn

     

       35
       35
        
           scipy

     

       36
       36
        
           seaborn

     

       37
       37
        
         ];

+2 -2

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

···

       5
       5
        
       , numpy

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       , scipy

     

       8
       8
       -
       , scikitlearn

     

       8
       8
       +
       , scikit-learn

     

       9
       9
        
       , fetchPypi

     

       10
       10
        
       , joblib

     

       11
       11
        
       , six

     
···

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ cython ];

     

       32
       32
       -
         propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ];

     

       32
       32
       +
         propagatedBuildInputs = [ numpy scipy scikit-learn joblib six ];

     

       33
       33
        
         preCheck = ''

     

       34
       34
        
           cd hdbscan/tests

     

       35
       35
        
           rm __init__.py

+2 -2

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

···

       1
       1
       -
       { lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }:

     

       1
       1
       +
       { lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "hmmlearn";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ setuptools_scm cython ];

     

       13
       13
       -
         propagatedBuildInputs = [ numpy scikitlearn ];

     

       13
       13
       +
         propagatedBuildInputs = [ numpy scikit-learn ];

     

       14
       14
        
         checkInputs = [ pytest ];

     

       15
       15
        
       

     

       16
       16
        
         checkPhase = ''

+2 -2

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

···

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , pytestCheckHook , pytestcov , numba

     

       6
       6
        
       , numpy

     

       7
       7
       -
       , scikitlearn

     

       7
       7
       +
       , scikit-learn

     

       8
       8
        
       , scipy

     

       9
       9
        
       , matplotlib

     

       10
       10
        
       , seaborn

     
···

       26
       26
        
         propagatedBuildInputs = [

     

       27
       27
        
           numba

     

       28
       28
        
           numpy

     

       29
       29
       -
           scikitlearn

     

       29
       29
       +
           scikit-learn

     

       30
       30
        
           scipy

     

       31
       31
        
         ];

     

       32
       32

+2 -2

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

···

       8
       8
        
       , mock

     

       9
       9
        
       , pytorch

     

       10
       10
        
       , pynvml

     

       11
       11
       -
       , scikitlearn

     

       11
       11
       +
       , scikit-learn

     

       12
       12
        
       , tqdm

     

       13
       13
        
       }:

     

       14
       14
        
       

     
···

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ];

     

       27
       27
       -
         propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];

     

       27
       27
       +
         propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ];

     

       28
       28
        
       

     

       29
       29
        
         # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.

     

       30
       30
        
         doCheck = pythonOlder "3.9";

+2 -2

pkgs/development/python-modules/imbalanced-learn/0.4.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, scikit-learn, pandas, nose, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "imbalanced-learn";

     
···

       9
       9
        
           sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ scikitlearn ];

     

       12
       12
       +
         propagatedBuildInputs = [ scikit-learn ];

     

       13
       13
        
         checkInputs = [ nose pytest pandas ];

     

       14
       14
        
         checkPhase = ''

     

       15
       15
        
           export HOME=$PWD

+2 -2

pkgs/development/python-modules/imbalanced-learn/default.nix

···

       4
       4
        
       , isPy27

     

       5
       5
        
       , pandas

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
       -
       , scikitlearn

     

       7
       7
       +
       , scikit-learn

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     
···

       17
       17
        
           sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         propagatedBuildInputs = [ scikitlearn ];

     

       20
       20
       +
         propagatedBuildInputs = [ scikit-learn ];

     

       21
       21
        
         checkInputs = [ pytestCheckHook pandas ];

     

       22
       22
        
         preCheck = ''

     

       23
       23
        
           export HOME=$TMPDIR

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , scikitlearn

     

       4
       4
       +
       , scikit-learn

     

       5
       5
        
       , numpy

     

       6
       6
        
       , scipy

     

       7
       7
        
       , jinja2

     
···

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

     

       28
       28
       -
           scikitlearn

     

       28
       28
       +
           scikit-learn

     

       29
       29
        
           numpy

     

       30
       30
        
           scipy

     

       31
       31
        
           jinja2

+2 -2

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

···

       4
       4
        
       , joblib

     

       5
       5
        
       , matplotlib

     

       6
       6
        
       , six

     

       7
       7
       -
       , scikitlearn

     

       7
       7
       +
       , scikit-learn

     

       8
       8
        
       , decorator

     

       9
       9
        
       , audioread

     

       10
       10
        
       , resampy

     
···

       21
       21
        
           sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ];

     

       24
       24
       +
         propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ];

     

       25
       25
        
       

     

       26
       26
        
         # No tests

     

       27
       27
        
         # 1. Internet connection is required

+2 -2

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

···

       4
       4
        
       , cmake

     

       5
       5
        
       , numpy

     

       6
       6
        
       , scipy

     

       7
       7
       -
       , scikitlearn

     

       7
       7
       +
       , scikit-learn

     

       8
       8
        
       , llvmPackages ? null

     

       9
       9
        
       }:

     

       10
       10
        
       

     
···

       39
       39
        
         propagatedBuildInputs = [

     

       40
       40
        
           numpy

     

       41
       41
        
           scipy

     

       42
       42
       -
           scikitlearn

     

       42
       42
       +
           scikit-learn

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
        
         postConfigure = ''

+2 -2

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

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , fetchpatch

     

       6
       6
       -
       , scikitlearn

     

       6
       6
       +
       , scikit-learn

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       , pytest-randomly

     

       9
       9
        
       }:

     
···

       28
       28
        
           })

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
       -
         propagatedBuildInputs = [ scikitlearn ];

     

       31
       31
       +
         propagatedBuildInputs = [ scikit-learn ];

     

       32
       32
        
         checkInputs = [ pytest-randomly pytestCheckHook ];

     

       33
       33
        
       

     

       34
       34
        
         postPatch = ''

+3 -3

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

···

       5
       5
        
       , pytestCheckHook

     

       6
       6
        
       , scipy

     

       7
       7
        
       , numpy

     

       8
       8
       -
       , scikitlearn

     

       8
       8
       +
       , scikit-learn

     

       9
       9
        
       , pandas

     

       10
       10
        
       , matplotlib

     

       11
       11
        
       , joblib

     
···

       33
       33
        
         propagatedBuildInputs = [

     

       34
       34
        
           scipy

     

       35
       35
        
           numpy

     

       36
       36
       -
           scikitlearn

     

       36
       36
       +
           scikit-learn

     

       37
       37
        
           pandas

     

       38
       38
        
           matplotlib

     

       39
       39
        
           joblib

     
···

       45
       45
        
           license= licenses.bsd3;

     

       46
       46
        
           maintainers = with maintainers; [ evax ];

     

       47
       47
        
           platforms = platforms.unix;

     

       48
       48
       -
           # incompatible with nixpkgs scikitlearn version

     

       48
       48
       +
           # incompatible with nixpkgs scikit-learn version

     

       49
       49
        
           broken = true;

     

       50
       50
        
         };

     

       51
       51
        
       }

+2 -2

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

···

       11
       11
        
       , matplotlib

     

       12
       12
        
       , nibabel

     

       13
       13
        
       , pandas

     

       14
       14
       -
       , scikitlearn

     

       14
       14
       +
       , scikit-learn

     

       15
       15
        
       }:

     

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     
···

       40
       40
        
           matplotlib

     

       41
       41
        
           nibabel

     

       42
       42
        
           pandas

     

       43
       43
       -
           scikitlearn

     

       43
       43
       +
           scikit-learn

     

       44
       44
        
         ];

     

       45
       45
        
         preCheck = ''

     

       46
       46
        
           export HOME=$TMP

+3 -3

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

···

       13
       13
        
       , advancedProcessing ? false

     

       14
       14
        
       , opencv3 ? null

     

       15
       15
        
       , scikitimage ? null

     

       16
       16
       -
       , scikitlearn ? null

     

       16
       16
       +
       , scikit-learn ? null

     

       17
       17
        
       , scipy ? null

     

       18
       18
        
       , matplotlib ? null

     

       19
       19
        
       , youtube-dl ? null

     

       20
       20
        
       }:

     

       21
       21
        
       

     

       22
       22
        
       assert advancedProcessing -> (

     

       23
       23
       -
         opencv3 != null && scikitimage != null && scikitlearn != null

     

       23
       23
       +
         opencv3 != null && scikitimage != null && scikit-learn != null

     

       24
       24
        
         && scipy != null && matplotlib != null && youtube-dl != null);

     

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     
···

       40
       40
        
         propagatedBuildInputs = [

     

       41
       41
        
           numpy decorator imageio imageio-ffmpeg tqdm requests proglog

     

       42
       42
        
         ] ++ (lib.optionals advancedProcessing [

     

       43
       43
       -
           opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl

     

       43
       43
       +
           opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl

     

       44
       44
        
         ]);

     

       45
       45
        
       

     

       46
       46
        
         meta = with lib; {

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib

     

       2
       2
       -
       , nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }:

     

       2
       2
       +
       , nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "nilearn";

     
···

       20
       20
        
           numpy

     

       21
       21
        
           pandas

     

       22
       22
        
           requests

     

       23
       23
       -
           scikitlearn

     

       23
       23
       +
           scikit-learn

     

       24
       24
        
           scipy

     

       25
       25
        
         ];

     

       26
       26

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy

     

       2
       2
       -
       , pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}:

     

       2
       2
       +
       , pandas, requests, Rtree, shapely, folium, scikit-learn, scipy}:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "osmnx";

     
···

       12
       12
        
           sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];

     

       15
       15
       +
         propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy ];

     

       16
       16
        
       

     

       17
       17
        
         # requires network

     

       18
       18
        
         doCheck = false;

+2 -2

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

···

       6
       6
        
       , joblib

     

       7
       7
        
       , matplotlib

     

       8
       8
        
       , numpy

     

       9
       9
       -
       , scikitlearn

     

       9
       9
       +
       , scikit-learn

     

       10
       10
        
       , scipy

     

       11
       11
        
       , pytestCheckHook

     

       12
       12
        
       }:

     
···

       26
       26
        
           joblib

     

       27
       27
        
           matplotlib

     

       28
       28
        
           numpy

     

       29
       29
       -
           scikitlearn

     

       29
       29
       +
           scikit-learn

     

       30
       30
        
           scipy

     

       31
       31
        
         ];

     

       32
       32

+2 -2

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

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , isPy27

     

       5
       5
        
       , pandas

     

       6
       6
       -
       , scikitlearn

     

       6
       6
       +
       , scikit-learn

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

     

       25
       25
        
           pandas

     

       26
       26
       -
           scikitlearn

     

       26
       26
       +
           scikit-learn

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         meta = with lib; {

+2 -2

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

···

       4
       4
        
       , scipy

     

       5
       5
        
       , numpy

     

       6
       6
        
       , numba

     

       7
       7
       -
       , scikitlearn

     

       7
       7
       +
       , scikit-learn

     

       8
       8
        
       , pytest

     

       9
       9
        
       , pythonOlder

     

       10
       10
        
       }:

     
···

       25
       25
        
           scipy

     

       26
       26
        
           numpy

     

       27
       27
        
           numba

     

       28
       28
       -
           scikitlearn

     

       28
       28
       +
           scikit-learn

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         checkInputs = [

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , nose

     

       5
       5
       -
       , scikitlearn

     

       5
       5
       +
       , scikit-learn

     

       6
       6
        
       , scipy

     

       7
       7
        
       , numba

     

       8
       8
        
       , llvmlite

     
···

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

     

       22
       22
       -
           scikitlearn

     

       22
       22
       +
           scikit-learn

     

       23
       23
        
           scipy

     

       24
       24
        
           numba

     

       25
       25
        
           llvmlite

+2 -2

pkgs/development/python-modules/pytorch-metric-learning/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , isPy27

     

       5
       5
        
       , numpy

     

       6
       6
       -
       , scikitlearn

     

       6
       6
       +
       , scikit-learn

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       , pytorch

     

       9
       9
        
       , torchvision

     
···

       26
       26
        
         propagatedBuildInputs = [

     

       27
       27
        
           numpy

     

       28
       28
        
           pytorch

     

       29
       29
       -
           scikitlearn

     

       29
       29
       +
           scikit-learn

     

       30
       30
        
           torchvision

     

       31
       31
        
           tqdm

     

       32
       32
        
         ];

+2 -2

pkgs/development/python-modules/qiskit-aqua/default.nix

···

       14
       14
        
       , qiskit-ignis

     

       15
       15
        
       , qiskit-terra

     

       16
       16
        
       , quandl

     

       17
       17
       -
       , scikitlearn

     

       17
       17
       +
       , scikit-learn

     

       18
       18
        
       , yfinance

     

       19
       19
        
         # Optional inputs

     

       20
       20
        
       , withTorch ? false

     
···

       59
       59
        
           qiskit-terra

     

       60
       60
        
           qiskit-ignis

     

       61
       61
        
           quandl

     

       62
       62
       -
           scikitlearn

     

       62
       62
       +
           scikit-learn

     

       63
       63
        
           yfinance

     

       64
       64
        
         ] ++ lib.optionals (withTorch) [ pytorch ]

     

       65
       65
        
         ++ lib.optionals (withPyscf) [ pyscf ]

+2 -2

pkgs/development/python-modules/qiskit-ignis/default.nix

···

       5
       5
        
       , python

     

       6
       6
        
       , numpy

     

       7
       7
        
       , qiskit-terra

     

       8
       8
       -
       , scikitlearn

     

       8
       8
       +
       , scikit-learn

     

       9
       9
        
       , scipy

     

       10
       10
        
         # Optional package inputs

     

       11
       11
        
       , withVisualization ? false

     
···

       44
       44
        
         propagatedBuildInputs = [

     

       45
       45
        
           numpy

     

       46
       46
        
           qiskit-terra

     

       47
       47
       -
           scikitlearn

     

       47
       47
       +
           scikit-learn

     

       48
       48
        
           scipy

     

       49
       49
        
         ] ++ lib.optionals (withCvx) [ cvxpy ]

     

       50
       50
        
         ++ lib.optionals (withVisualization) [ matplotlib ]

+2 -2

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

···

       5
       5
        
       , cython

     

       6
       6
        
       , numpy

     

       7
       7
        
       , scipy

     

       8
       8
       -
       , scikitlearn

     

       8
       8
       +
       , scikit-learn

     

       9
       9
        
       , persim

     

       10
       10
        
       , pytest

     

       11
       11
        
       }:

     
···

       28
       28
        
           cython

     

       29
       29
        
           numpy

     

       30
       30
        
           scipy

     

       31
       31
       -
           scikitlearn

     

       31
       31
       +
           scikit-learn

     

       32
       32
        
           persim

     

       33
       33
        
         ];

     

       34
       34

+2 -2

pkgs/development/python-modules/scikit-bio/default.nix

···

       12
       12
        
       , pandas

     

       13
       13
        
       , scipy

     

       14
       14
        
       , hdmedians

     

       15
       15
       -
       , scikitlearn

     

       15
       15
       +
       , scikit-learn

     

       16
       16
        
       , coverage

     

       17
       17
        
       , python

     

       18
       18
        
       , isPy3k

     
···

       30
       30
        
       

     

       31
       31
        
         buildInputs = [ cython ];

     

       32
       32
        
         checkInputs = [ coverage ];

     

       33
       33
       -
         propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ];

     

       33
       33
       +
         propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikit-learn ];

     

       34
       34
        
       

     

       35
       35
        
         # cython package not included for tests

     

       36
       36
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/scikit-optimize/default.nix

···

       5
       5
        
       , matplotlib

     

       6
       6
        
       , numpy

     

       7
       7
        
       , scipy

     

       8
       8
       -
       , scikitlearn

     

       8
       8
       +
       , scikit-learn

     

       9
       9
        
       , pyaml

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
        
       }:

     
···

       26
       26
        
           matplotlib

     

       27
       27
        
           numpy

     

       28
       28
        
           scipy

     

       29
       29
       -
           scikitlearn

     

       29
       29
       +
           scikit-learn

     

       30
       30
        
           pyaml

     

       31
       31
        
         ];

     

       32
       32

+2 -2

pkgs/development/python-modules/scikit-tda/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , numpy

     

       5
       5
        
       , scipy

     

       6
       6
       -
       , scikitlearn

     

       6
       6
       +
       , scikit-learn

     

       7
       7
        
       , matplotlib

     

       8
       8
        
       , numba

     

       9
       9
        
       , umap-learn

     
···

       32
       32
        
         propagatedBuildInputs = [

     

       33
       33
        
           numpy

     

       34
       34
        
           scipy

     

       35
       35
       -
           scikitlearn

     

       35
       35
       +
           scikit-learn

     

       36
       36
        
           matplotlib

     

       37
       37
        
           numba

     

       38
       38
        
           umap-learn

pkgs/development/python-modules/scikitlearn/0.20.nix pkgs/development/python-modules/scikit-learn/0.20.nix

+18 -4

pkgs/development/python-modules/scikitlearn/default.nix pkgs/development/python-modules/scikit-learn/default.nix

···

       7
       7
        
       , glibcLocales

     

       8
       8
        
       , numpy

     

       9
       9
        
       , scipy

     

       10
       10
       -
       , pytest

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       , pytest-xdist

     

       11
       12
        
       , pillow

     

       12
       13
        
       , cython

     

       13
       14
        
       , joblib

     
···

       54
       55
        
           joblib

     

       55
       56
        
           threadpoolctl

     

       56
       57
        
         ];

     

       57
       57
       -
         checkInputs = [ pytest ];

     

       58
       58
       +
       

     

       59
       59
       +
         checkInputs = [ pytestCheckHook pytest-xdist ];

     

       58
       60
        
       

     

       59
       61
        
         LC_ALL="en_US.UTF-8";

     

       60
       62
        
       

     

       63
       63
       +
         preBuild = ''

     

       64
       64
       +
           export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES

     

       65
       65
       +
         '';

     

       66
       66
       +
       

     

       61
       67
        
         doCheck = !stdenv.isAarch64;

     

       68
       68
       +
       

     

       62
       69
        
         # Skip test_feature_importance_regression - does web fetch

     

       63
       63
       -
         checkPhase = ''

     

       70
       70
       +
         disabledTests = [ "test_feature_importance_regression" ];

     

       71
       71
       +
       

     

       72
       72
       +
         pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" "--pyargs" "sklearn" ];

     

       73
       73
       +
       

     

       74
       74
       +
         preCheck = ''

     

       64
       75
        
           cd $TMPDIR

     

       65
       65
       -
           HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn

     

       76
       76
       +
           export HOME=$TMPDIR

     

       77
       77
       +
           export OMP_NUM_THREADS=1

     

       66
       78
        
         '';

     

       79
       79
       +
       

     

       80
       80
       +
         pythonImportsCheck = [ "sklearn" ];

     

       67
       81
        
       

     

       68
       82
        
         meta = with lib; {

     

       69
       83
        
           description = "A set of python modules for machine learning and data mining";

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , numpy

     

       5
       5
       -
       , scikitlearn

     

       5
       5
       +
       , scikit-learn

     

       6
       6
        
       , perl

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       }:

     
···

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

     

       29
       29
        
           numpy

     

       30
       30
       -
           scikitlearn

     

       30
       30
       +
           scikit-learn

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         checkInputs = [

+2 -2

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

···

       5
       5
        
       , pytestCheckHook

     

       6
       6
        
       , numpy

     

       7
       7
        
       , scipy

     

       8
       8
       -
       , scikitlearn

     

       8
       8
       +
       , scikit-learn

     

       9
       9
        
       , pandas

     

       10
       10
        
       , tqdm

     

       11
       11
        
       , slicer

     
···

       30
       30
        
         propagatedBuildInputs = [

     

       31
       31
        
           numpy

     

       32
       32
        
           scipy

     

       33
       33
       -
           scikitlearn

     

       33
       33
       +
           scikit-learn

     

       34
       34
        
           pandas

     

       35
       35
        
           tqdm

     

       36
       36
        
           slicer

+2 -2

pkgs/development/python-modules/sklearn-deap/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "sklearn-deap";

     
···

       20
       20
        
           })

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ numpy scipy deap scikitlearn ];

     

       23
       23
       +
         propagatedBuildInputs = [ numpy scipy deap scikit-learn ];

     

       24
       24
        
       

     

       25
       25
        
         checkPhase = ''

     

       26
       26
        
           ${python.interpreter} test.py

+2 -2

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

···

       8
       8
        
       , numpy

     

       9
       9
        
       , pandas

     

       10
       10
        
       , pytorch

     

       11
       11
       -
       , scikitlearn

     

       11
       11
       +
       , scikit-learn

     

       12
       12
        
       , scipy

     

       13
       13
        
       , tabulate

     

       14
       14
        
       , tqdm

     
···

       23
       23
        
           sha256 = "9910f97339e654c8d38e0075d87b735e69e5eb11db59c527fb36705b30c8d0a4";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ];

     

       26
       26
       +
         propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ];

     

       27
       27
        
         checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ];

     

       28
       28
        
       

     

       29
       29
        
         disabledTests = [

+2 -2

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

···

       9
       9
        
       , pyphen

     

       10
       10
        
       , pytest

     

       11
       11
        
       , requests

     

       12
       12
       -
       , scikitlearn

     

       12
       12
       +
       , scikit-learn

     

       13
       13
        
       , scipy

     

       14
       14
        
       , spacy

     

       15
       15
        
       , srsly

     
···

       35
       35
        
           pyemd

     

       36
       36
        
           pyphen

     

       37
       37
        
           requests

     

       38
       38
       -
           scikitlearn

     

       38
       38
       +
           scikit-learn

     

       39
       39
        
           scipy

     

       40
       40
        
           spacy

     

       41
       41
        
           srsly

+2 -2

pkgs/development/python-modules/umap-learn/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , nose

     

       5
       5
        
       , numpy

     

       6
       6
       -
       , scikitlearn

     

       6
       6
       +
       , scikit-learn

     

       7
       7
        
       , scipy

     

       8
       8
        
       , numba

     

       9
       9
        
       , pynndescent

     
···

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

     

       26
       26
        
           numpy

     

       27
       27
       -
           scikitlearn

     

       27
       27
       +
           scikit-learn

     

       28
       28
        
           scipy

     

       29
       29
        
           numba

     

       30
       30
        
           pynndescent

+2 -2

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

···

       11
       11
        
       , pygments

     

       12
       12
        
       , numpy

     

       13
       13
        
       , scipy

     

       14
       14
       -
       , scikitlearn }:

     

       14
       14
       +
       , scikit-learn }:

     

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "vowpalwabbit";

     
···

       36
       36
        
       

     

       37
       37
        
         propagatedBuildInputs = [

     

       38
       38
        
           numpy

     

       39
       39
       -
           scikitlearn

     

       39
       39
       +
           scikit-learn

     

       40
       40
        
           scipy

     

       41
       41
        
         ];

     

       42
       42

+2 -2

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

···

       4
       4
        
       , fetchzip

     

       5
       5
        
       , cython

     

       6
       6
        
       , numpy

     

       7
       7
       -
       , scikitlearn

     

       7
       7
       +
       , scikit-learn

     

       8
       8
        
       , six

     

       9
       9
        
       , setuptools_scm

     

       10
       10
        
       , gcc

     
···

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ setuptools_scm gcc ];

     

       32
       32
        
       

     

       33
       33
       -
         propagatedBuildInputs = [ cython numpy scikitlearn six ];

     

       33
       33
       +
         propagatedBuildInputs = [ cython numpy scikit-learn six ];

     

       34
       34
        
       

     

       35
       35
        
         checkInputs = [ pytest pytestcov ];

     

       36
       36

+2 -2

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

···

       2
       2
        
       , pytestCheckHook

     

       3
       3
        
       , cmake

     

       4
       4
        
       , scipy

     

       5
       5
       -
       , scikitlearn

     

       5
       5
       +
       , scikit-learn

     

       6
       6
        
       , stdenv

     

       7
       7
        
       , xgboost

     

       8
       8
        
       , substituteAll

     
···

       22
       22
        
         propagatedBuildInputs = [ scipy ];

     

       23
       23
        
         checkInputs = [

     

       24
       24
        
           pytestCheckHook

     

       25
       25
       -
           scikitlearn

     

       25
       25
       +
           scikit-learn

     

       26
       26
        
           pandas

     

       27
       27
        
           matplotlib

     

       28
       28
        
           graphviz

+28 -2

pkgs/development/tools/build-managers/rebar3/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub,

     

       2
       2
       -
         fetchHex, erlang, makeWrapper }:

     

       2
       2
       +
         fetchHex, erlang, makeWrapper,

     

       3
       3
       +
         writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:

     

       3
       4
        
       

     

       4
       5
        
       let

     

       5
       6
        
         version = "3.15.1";

     

       6
       7
        
         owner = "erlang";

     

       7
       7
       -
         deps = import ./rebar-deps.nix { inherit fetchHex; };

     

       8
       8
       +
         deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; };

     

       8
       9
        
         rebar3 = stdenv.mkDerivation rec {

     

       9
       10
        
           pname = "rebar3";

     

       10
       11
        
           inherit version erlang;

     
···

       63
       64
        
             license = lib.licenses.asl20;

     

       64
       65
        
           };

     

       65
       66
        
       

     

       67
       67
       +
           passthru.updateScript = writeScript "update.sh" ''

     

       68
       68
       +
             #!${stdenv.shell}

     

       69
       69
       +
             set -ox errexit

     

       70
       70
       +
             PATH=${

     

       71
       71
       +
               lib.makeBinPath [

     

       72
       72
       +
                 common-updater-scripts

     

       73
       73
       +
                 coreutils

     

       74
       74
       +
                 git

     

       75
       75
       +
                 gnused

     

       76
       76
       +
                 nix

     

       77
       77
       +
                 (rebar3WithPlugins { globalPlugins = [rebar3-nix]; })

     

       78
       78
       +
               ]

     

       79
       79
       +
             }

     

       80
       80
       +
             latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1)

     

       81
       81
       +
             if [ "$latest" != "${version}" ]; then

     

       82
       82
       +
               nixpkgs="$(git rev-parse --show-toplevel)"

     

       83
       83
       +
               nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3"

     

       84
       84
       +
               update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix"

     

       85
       85
       +
               tmpdir=$(mktemp -d)

     

       86
       86
       +
               cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir"

     

       87
       87
       +
               (cd "$tmpdir" && rebar3 nix lock -o "$nix_path/rebar-deps.nix")

     

       88
       88
       +
             else

     

       89
       89
       +
               echo "rebar3 is already up-to-date"

     

       90
       90
       +
             fi

     

       91
       91
       +
           '';

     

       66
       92
        
         };

     

       67
       93
        
         rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }:

     

       68
       94
        
           let

+2 -1

pkgs/development/tools/build-managers/rebar3/rebar-deps.nix

···

       1
       1
       -
       { fetchHex }:

     

       1
       1
       +
       # Generated by rebar3_nix

     

       2
       2
       +
       { fetchHex, fetchFromGitHub }:

     

       2
       3
        
       {

     

       3
       4
        
         ssl_verify_fun = fetchHex {

     

       4
       5
        
           pkg = "ssl_verify_fun";

+3 -3

pkgs/development/tools/rust/cargo-cache/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-cache";

     

       5
       5
       -
         version = "0.6.1";

     

       5
       5
       +
         version = "0.6.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "matthiaskrgr";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY=";

     

       11
       11
       +
           sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-qAq5B/BivQr8yuHtyFGTRigAa5dG2rboc0aD44/38FQ=";

     

       14
       14
       +
         cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

     

       17
       17

+3 -3

pkgs/development/tools/rust/cargo-crev/default.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "cargo-crev";

     

       14
       14
       -
         version = "0.19.2";

     

       14
       14
       +
         version = "0.19.4";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "crev-dev";

     

       18
       18
        
           repo = "cargo-crev";

     

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

     

       20
       20
       -
           sha256 = "sha256-aqvdAljAJsYtmxz/WtMrrnmJJRXDpqDjUn1LusoM8ns=";

     

       20
       20
       +
           sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoSha256 = "sha256-KwnZmehh0vdR1eSPBrY6yHJR6r7mhIEgfN4soEBDTjU=";

     

       23
       23
       +
         cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ perl pkg-config ];

     

       26
       26

+7 -5

pkgs/development/tools/rust/cargo-embed/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , rustPlatform, fetchFromGitHub

     

       3
       3
       -
       , libusb1, pkg-config, rustfmt }:

     

       3
       3
       +
       , libusb1, libftdi1, pkg-config, rustfmt }:

     

       4
       4
        
       

     

       5
       5
        
       rustPlatform.buildRustPackage rec {

     

       6
       6
        
         pname = "cargo-embed";

     

       7
       7
       -
         version = "0.8.0";

     

       7
       7
       +
         version = "0.10.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "probe-rs";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35";

     

       13
       13
       +
           sha256 = "1z8n883cb4jca3phi9x2kwl01xclyr00l8jxgiyd28l2jik78i5k";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         cargoSha256 = "1nqrij4j8787x7zqgdcscf8i436s19gwk08nyixhmf9sprcfb0ck";

     

       16
       16
       +
         cargoSha256 = "1ir9qngxmja6cm42m40jqbga9mlfjllm23ca26wyigjv3025pi6i";

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkg-config rustfmt ];

     

       19
       19
       -
         buildInputs = [ libusb1 ];

     

       19
       19
       +
         buildInputs = [ libusb1 libftdi1 ];

     

       20
       20
       +
       

     

       21
       21
       +
         cargoBuildFlags = [ "--features=ftdi" ];

     

       20
       22
        
       

     

       21
       23
        
         meta = with lib; {

     

       22
       24
        
           description = "A cargo extension for working with microcontrollers";

+1 -3

pkgs/development/tools/rust/cargo-flash/default.nix

···

       23
       23
        
         cargoSha256 = "sha256-P7xyg9I1MhmiKlyAI9cvABcYKNxB6TSvTgMsMk5KxAQ=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkg-config rustfmt ];

     

       26
       26
       -
         buildInputs = [ libusb1 ]

     

       27
       27
       -
           ++ lib.optionals (!stdenv.isDarwin) [ openssl ]

     

       28
       28
       -
           ++ lib.optionals stdenv.isDarwin [ Security ];

     

       26
       26
       +
         buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];

     

       29
       27
        
       

     

       30
       28
        
         meta = with lib; {

     

       31
       29
        
           description = "A cargo extension for working with microcontrollers";

+13 -8

pkgs/servers/nosql/influxdb2/default.nix

···

       7
       7
        
       , mkYarnPackage

     

       8
       8
        
       , pkg-config

     

       9
       9
        
       , rustPlatform

     

       10
       10
       +
       , stdenv

     

       11
       11
       +
       , libiconv

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       14
        
       # Note for maintainers: use ./update-influxdb2.sh to update the Yarn

     

       13
       15
        
       # dependencies nix expression.

     

       14
       16
        
       

     

       15
       17
        
       let

     

       16
       16
       -
         version = "2.0.2";

     

       17
       17
       -
         shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out

     

       18
       18
       -
         libflux_version = "0.95.0";

     

       18
       18
       +
         version = "2.0.6";

     

       19
       19
       +
         shorthash = "4db98b4c9a"; # git rev-parse HEAD with 2.0.6 checked out

     

       20
       20
       +
         libflux_version = "0.115.0";

     

       19
       21
        
       

     

       20
       22
        
         src = fetchFromGitHub {

     

       21
       23
        
           owner = "influxdata";

     

       22
       24
        
           repo = "influxdb";

     

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

     

       24
       24
       -
           sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn";

     

       26
       26
       +
           sha256 = "1x74p87csx4m4cgijk57xs75nikv3bnh7skgnzk30ab1ar13iirw";

     

       25
       27
        
         };

     

       26
       28
        
       

     

       27
       29
        
         ui = mkYarnPackage {

     
···

       31
       33
        
           yarnNix = ./influx-ui-yarndeps.nix;

     

       32
       34
        
           configurePhase = ''

     

       33
       35
        
             cp -r $node_modules ui/node_modules

     

       34
       34
       -
             rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules

     

       36
       36
       +
             rsync -r $node_modules/../deps/influxdb-ui/node_modules/ ui/node_modules

     

       35
       37
        
           '';

     

       36
       38
        
           INFLUXDB_SHA = shorthash;

     

       37
       39
        
           buildPhase = ''

     
···

       52
       54
        
             owner = "influxdata";

     

       53
       55
        
             repo = "flux";

     

       54
       56
        
             rev = "v${libflux_version}";

     

       55
       55
       -
             sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3";

     

       57
       57
       +
             sha256 = "0zplwsk9xidv8l9sqbxqivy6q20ryd31fhrzspn1mjn4i45kkwz1";

     

       56
       58
        
           };

     

       57
       59
        
           sourceRoot = "source/libflux";

     

       58
       58
       -
           cargoSha256 = "15xrg7h2jkm0p2nvzza8r6v71w5f3vjilzdahqcd23n2pg5bxgg5";

     

       60
       60
       +
           cargoSha256 = "06gh466q7qkid0vs5scic0qqlz3h81yb00nwn8nwq8ppr5z2ijyq";

     

       59
       61
        
           nativeBuildInputs = [ llvmPackages.libclang ];

     

       62
       62
       +
           buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       60
       63
        
           LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

     

       61
       64
        
           pkgcfg = ''

     

       62
       65
        
             Name: flux

     
···

       71
       74
        
             cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include

     

       72
       75
        
             substitute $pkgcfgPath $out/pkgconfig/flux.pc \

     

       73
       76
        
               --replace /out $out

     

       77
       77
       +
           '' + lib.optionalString stdenv.isDarwin ''

     

       78
       78
       +
             install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib

     

       74
       79
        
           '';

     

       75
       80
        
         };

     

       76
       81
        
       in buildGoModule {

     
···

       80
       85
        
       

     

       81
       86
        
         nativeBuildInputs = [ go-bindata pkg-config ];

     

       82
       87
        
       

     

       83
       83
       -
         vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a";

     

       88
       88
       +
         vendorSha256 = "03pabm0h9q0v5dfdq9by2l2n32bz9imwalz0aw897vsrfhci0ldf";

     

       84
       89
        
         subPackages = [ "cmd/influxd" "cmd/influx" ];

     

       85
       90
        
       

     

       86
       91
        
         PKG_CONFIG_PATH = "${flux}/pkgconfig";

+6 -5

pkgs/servers/nosql/influxdb2/influx-ui-package.json

···

       1
       1
        
       {

     

       2
       2
       -
         "name": "chronograf-ui",

     

       3
       3
       -
         "version": "2.0.2",

     

       2
       2
       +
         "name": "influxdb-ui",

     

       3
       3
       +
         "version": "2.0.5",

     

       4
       4
        
         "private": false,

     

       5
       5
       -
         "license": "AGPL-3.0",

     

       5
       5
       +
         "license": "MIT",

     

       6
       6
        
         "description": "",

     

       7
       7
        
         "repository": {

     

       8
       8
        
           "type": "git",

     

       9
       9
       -
           "url": "github:influxdata/chronograf"

     

       9
       9
       +
           "url": "github:influxdata/ui"

     

       10
       10
        
         },

     

       11
       11
        
         "engines": {

     

       12
       12
        
           "node": ">=10.5.0",

     
···

       40
       40
        
           "eslint:circleci": "eslint",

     

       41
       41
        
           "eslint:fix": "eslint --fix '{src,cypress}/**/*.{ts,tsx}'",

     

       42
       42
        
           "prettier": "prettier --config .prettierrc.json --check '{src,cypress}/**/*.{ts,tsx}'",

     

       43
       43
       +
           "prettier:circleci": "prettier --config .prettierrc.json --check",

     

       43
       44
        
           "prettier:fix": "prettier --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'",

     

       44
       45
        
           "tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck",

     

       45
       46
        
           "tsc:cypress": "tsc -p ./cypress/tsconfig.json --noEmit --pretty --skipLibCheck",

     
···

       134
       135
        
         "dependencies": {

     

       135
       136
        
           "@influxdata/clockface": "2.3.4",

     

       136
       137
        
           "@influxdata/flux": "^0.5.1",

     

       137
       137
       -
           "@influxdata/flux-lsp-browser": "^0.5.23",

     

       138
       138
       +
           "@influxdata/flux-lsp-browser": "^0.5.41",

     

       138
       139
        
           "@influxdata/giraffe": "0.29.0",

     

       139
       140
        
           "@influxdata/influx": "0.5.5",

     

       140
       141
        
           "@influxdata/influxdb-templates": "0.9.0",

+4 -4

pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix

···

       666
       666
        
             };

     

       667
       667
        
           }

     

       668
       668
        
           {

     

       669
       669
       -
             name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz";

     

       669
       669
       +
             name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz";

     

       670
       670
        
             path = fetchurl {

     

       671
       671
       -
               name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz";

     

       672
       672
       -
               url  = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.23.tgz";

     

       673
       673
       -
               sha1 = "b3d1579e26ff21a11771003cbcaebe5fef82d73c";

     

       671
       671
       +
               name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz";

     

       672
       672
       +
               url  = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.41.tgz";

     

       673
       673
       +
               sha1 = "abf6c5ad253317f34a9217ecfd250d78fe625a83";

     

       674
       674
        
             };

     

       675
       675
        
           }

     

       676
       676
        
           {

+2

pkgs/test/default.nix

···

       50
       50
        
       

     

       51
       51
        
         cuda = callPackage ./cuda { };

     

       52
       52
        
       

     

       53
       53
       +
         trivial = callPackage ../build-support/trivial-builders/test.nix {};

     

       54
       54
       +
       

     

       53
       55
        
         writers = callPackage ../build-support/writers/test.nix {};

     

       54
       56
        
       }

+4

pkgs/tools/X11/hsetroot/default.nix

···

       24
       24
        
           libXinerama

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
       +
         postPatch = lib.optionalString (!stdenv.cc.isGNU) ''

     

       28
       28
       +
           sed -i -e '/--no-as-needed/d' Makefile

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       27
       31
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       28
       32
        
       

     

       29
       33
        
         preInstall = ''

+2 -2

pkgs/tools/graphics/cfdg/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cfdg";

     
···

       10
       10
        
           sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ libpng bison flex ffmpeg_3 icu ];

     

       13
       13
       +
         buildInputs = [ libpng bison flex ffmpeg icu ];

     

       14
       14
        
       

     

       15
       15
        
         postPatch = ''

     

       16
       16
        
           sed -e "/YY_NO_UNISTD/a#include <stdio.h>" -i src-common/cfdg.l

+3 -3

pkgs/tools/misc/chezmoi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "chezmoi";

     

       5
       5
       -
         version = "2.0.11";

     

       5
       5
       +
         version = "2.0.12";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "twpayne";

     

       9
       9
        
           repo = "chezmoi";

     

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

     

       11
       11
       -
           sha256 = "sha256-z9ALpoF2ZLigAG/uvoYVG1YTy+EM4bDQDDtxd3PgQW8=";

     

       11
       11
       +
           sha256 = "sha256-CF/Ers/w1ZGBSvRVxyNf1R4CwwidK9ItiFBCIjToYg0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-CYDFEVZ04csn4BjvwUvfOafEjucnDHyeYU7gNwO1xTQ=";

     

       14
       14
       +
         vendorSha256 = "sha256-tdd3uUxN+ZJ0hX4IqSM/xPZzcawtOa5xgjPhRrns5yM=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+6 -12

pkgs/tools/misc/mdbtools/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, glib, readline

     

       2
       2
        
       , bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper

     

       3
       3
        
       , txt2man, which

     

       4
       4
       -
       # withUi currently doesn't work. It compiles but fails to run.

     

       5
       5
       -
       , withUi ? false, gtk2, gnome2

     

       6
       4
        
       }:

     

       7
       5
        
       

     

       8
       8
       -
       let

     

       9
       9
       -
         uiDeps = [ gtk2 ] ++ (with gnome2; [ GConf libglade libgnomeui gnome-doc-utils ]);

     

       10
       10
       -
       

     

       11
       11
       -
       in

     

       12
       6
        
       stdenv.mkDerivation rec {

     

       13
       7
        
         pname = "mdbtools";

     

       14
       14
       -
         version = "0.8.2";

     

       8
       8
       +
         version = "0.9.3";

     

       15
       9
        
       

     

       16
       10
        
         src = fetchFromGitHub {

     

       17
       17
       -
           owner = "cyberemissary";

     

       11
       11
       +
           owner = "mdbtools";

     

       18
       12
        
           repo = "mdbtools";

     

       19
       19
       -
           rev = version;

     

       20
       20
       -
           sha256 = "12rhf6rgnws6br5dn1l2j7i77q9p4l6ryga10jpax01vvzhr26qc";

     

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

     

       14
       14
       +
           sha256 = "11cv7hh8j8akpgm1a6pp7im6iacpgx6wzcg9n9rmb41j0fgxamdf";

     

       21
       15
        
         };

     

       22
       16
        
       

     

       23
       17
        
         configureFlags = [ "--disable-scrollkeeper" ];

     

       24
       18
        
       

     

       25
       19
        
         nativeBuildInputs = [

     

       26
       20
        
           pkg-config bison flex autoreconfHook txt2man which

     

       27
       27
       -
         ] ++ lib.optional withUi libxslt;

     

       21
       21
       +
         ];

     

       28
       22
        
       

     

       29
       29
       -
         buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps;

     

       23
       23
       +
         buildInputs = [ glib readline ];

     

       30
       24
        
       

     

       31
       25
        
         enableParallelBuilding = true;

     

       32
       26

+3 -3

pkgs/tools/networking/findomain/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "findomain";

     

       13
       13
       -
         version = "4.2.1";

     

       13
       13
       +
         version = "4.3.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "Edu4rdSHL";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-yVjxwgReZhdArTXr1rUsU+pKIlxCVVf3NfR0znqzfxA=";

     

       19
       19
       +
           sha256 = "sha256-UC70XmhAVf2a2QO9bkIRE5vEsWyIA0DudZfKraNffGY=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "sha256-t1/BQD8ostyMJh/HoZ7n3bKw5LfDZQeq03AO7JY0G8E=";

     

       22
       22
       +
         cargoSha256 = "sha256-Cdfh3smX6UjiG29L9hG22bOQQIjaNrv+okl153mIiso=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ installShellFiles perl ];

     

       25
       25
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

+7

pkgs/top-level/all-packages.nix

···

       11173
       11173
        
         julia-stable = julia_15;

     

       11174
       11174
        
         julia = julia-lts;

     

       11175
       11175
        
       

     

       11176
       11176
       +
         julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { };

     

       11177
       11177
       +
         julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };

     

       11178
       11178
       +
       

     

       11179
       11179
       +
         julia-lts-bin = julia_10-bin;

     

       11180
       11180
       +
         julia-stable-bin = julia_16-bin;

     

       11181
       11181
       +
         julia-bin = julia-lts-bin;

     

       11182
       11182
       +
       

     

       11176
       11183
        
         jwasm =  callPackage ../development/compilers/jwasm { };

     

       11177
       11184
        
       

     

       11178
       11185
        
         knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };

+2

pkgs/top-level/coq-packages.nix

···

       13
       13
        
             contribs = recurseIntoAttrs

     

       14
       14
        
               (callPackage ../development/coq-modules/contribs {});

     

       15
       15
        
       

     

       16
       16
       +
             aac-tactics = callPackage ../development/coq-modules/aac-tactics {};

     

       16
       17
        
             autosubst = callPackage ../development/coq-modules/autosubst {};

     

       17
       18
        
             bignums = if lib.versionAtLeast coq.coq-version "8.6"

     

       18
       19
        
               then callPackage ../development/coq-modules/bignums {}

     
···

       68
       69
        
             paramcoq = callPackage ../development/coq-modules/paramcoq {};

     

       69
       70
        
             pocklington = callPackage ../development/coq-modules/pocklington {};

     

       70
       71
        
             QuickChick = callPackage ../development/coq-modules/QuickChick {};

     

       72
       72
       +
             relation-algebra = callPackage ../development/coq-modules/relation-algebra {};

     

       71
       73
        
             simple-io = callPackage ../development/coq-modules/simple-io { };

     

       72
       74
        
             stdpp = callPackage ../development/coq-modules/stdpp { };

     

       73
       75
        
             StructTact = callPackage ../development/coq-modules/StructTact {};

+3 -1

pkgs/top-level/python-packages.nix

···

       7382
       7382
        
       

     

       7383
       7383
        
         scikitimage = callPackage ../development/python-modules/scikit-image { };

     

       7384
       7384
        
       

     

       7385
       7385
       -
         scikitlearn = callPackage ../development/python-modules/scikitlearn {

     

       7385
       7385
       +
         scikit-learn = callPackage ../development/python-modules/scikit-learn {

     

       7386
       7386
        
           inherit (pkgs) gfortran glibcLocales;

     

       7387
       7387
        
         };

     

       7388
       7388
       +
       

     

       7389
       7389
       +
         scikitlearn = self.scikit-learn;

     

       7388
       7390
        
       

     

       7389
       7391
        
         scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };

     

       7390
       7392

+1 -1

pkgs/top-level/python2-packages.nix

···

       524
       524
        
       

     

       525
       525
        
         scandir = callPackage ../development/python-modules/scandir { };

     

       526
       526
        
       

     

       527
       527
       -
         scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix {

     

       527
       527
       +
         scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix {

     

       528
       528
        
           inherit (pkgs) gfortran glibcLocales;

     

       529
       529
        
         };

     

       530
       530