commit 1fcb01e5470d1afadd0bc41361937db1f3d64480 · pyrox.dev/nixpkgs

+2

nixos/modules/services/hardware/fwupd.nix

···

       126
       126
        
           services.udev.packages = [ cfg.package ];

     

       127
       127
        
       

     

       128
       128
        
           systemd.packages = [ cfg.package ];

     

       129
       129
       +
       

     

       130
       130
       +
           security.polkit.enable = true;

     

       129
       131
        
         };

     

       130
       132
        
       

     

       131
       133
        
         meta = {

+11 -10

nixos/modules/services/misc/paperless.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       let

     

       5
       5
        
         cfg = config.services.paperless;

     

       6
       6
       +
         pkg = cfg.package;

     

       6
       7
        
       

     

       7
       8
        
         defaultUser = "paperless";

     

       8
       9
        
       

     
···

       27
       28
        
           setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);

     

       28
       29
        
         in pkgs.writeShellScript "manage" ''

     

       29
       30
        
           ${setupEnv}

     

       30
       30
       -
           exec ${cfg.package}/bin/paperless-ngx "$@"

     

       31
       31
       +
           exec ${pkg}/bin/paperless-ngx "$@"

     

       31
       32
        
         '';

     

       32
       33
        
       

     

       33
       34
        
         # Secure the services

     
···

       213
       214
        
             description = "Paperless scheduler";

     

       214
       215
        
             serviceConfig = defaultServiceConfig // {

     

       215
       216
        
               User = cfg.user;

     

       216
       216
       -
               ExecStart = "${cfg.package}/bin/paperless-ngx qcluster";

     

       217
       217
       +
               ExecStart = "${pkg}/bin/paperless-ngx qcluster";

     

       217
       218
        
               Restart = "on-failure";

     

       218
       219
        
               # The `mbind` syscall is needed for running the classifier.

     

       219
       220
        
               SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ];

     
···

       229
       230
        
       

     

       230
       231
        
               # Auto-migrate on first run or if the package has changed

     

       231
       232
        
               versionFile="${cfg.dataDir}/src-version"

     

       232
       232
       -
               if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then

     

       233
       233
       -
                 ${cfg.package}/bin/paperless-ngx migrate

     

       234
       234
       -
                 echo ${cfg.package} > "$versionFile"

     

       233
       233
       +
               if [[ $(cat "$versionFile" 2>/dev/null) != ${pkg} ]]; then

     

       234
       234
       +
                 ${pkg}/bin/paperless-ngx migrate

     

       235
       235
       +
                 echo ${pkg} > "$versionFile"

     

       235
       236
        
               fi

     

       236
       237
        
             ''

     

       237
       238
        
             + optionalString (cfg.passwordFile != null) ''

     
···

       241
       242
        
               superuserStateFile="${cfg.dataDir}/superuser-state"

     

       242
       243
        
       

     

       243
       244
        
               if [[ $(cat "$superuserStateFile" 2>/dev/null) != $superuserState ]]; then

     

       244
       244
       -
                 ${cfg.package}/bin/paperless-ngx manage_superuser

     

       245
       245
       +
                 ${pkg}/bin/paperless-ngx manage_superuser

     

       245
       246
        
                 echo "$superuserState" > "$superuserStateFile"

     

       246
       247
        
               fi

     

       247
       248
        
             '';

     
···

       266
       267
        
             description = "Paperless document consumer";

     

       267
       268
        
             serviceConfig = defaultServiceConfig // {

     

       268
       269
        
               User = cfg.user;

     

       269
       269
       -
               ExecStart = "${cfg.package}/bin/paperless-ngx document_consumer";

     

       270
       270
       +
               ExecStart = "${pkg}/bin/paperless-ngx document_consumer";

     

       270
       271
        
               Restart = "on-failure";

     

       271
       272
        
             };

     

       272
       273
        
             environment = env;

     
···

       282
       283
        
               User = cfg.user;

     

       283
       284
        
               ExecStart = ''

     

       284
       285
        
                 ${pkgs.python3Packages.gunicorn}/bin/gunicorn \

     

       285
       285
       -
                   -c ${cfg.package}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application

     

       286
       286
       +
                   -c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application

     

       286
       287
        
               '';

     

       287
       288
        
               Restart = "on-failure";

     

       288
       289
        
       

     
···

       295
       296
        
               CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];

     

       296
       297
        
             };

     

       297
       298
        
             environment = env // {

     

       298
       298
       -
               PATH = mkForce cfg.package.path;

     

       299
       299
       -
               PYTHONPATH = "${cfg.package.pythonPath}:${cfg.package}/lib/paperless-ngx/src";

     

       299
       299
       +
               PATH = mkForce pkg.path;

     

       300
       300
       +
               PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/paperless-ngx/src";

     

       300
       301
        
             };

     

       301
       302
        
             # Allow the web interface to access the private /tmp directory of the server.

     

       302
       303
        
             # This is required to support uploading files via the web interface.

+1

nixos/tests/installed-tests/ibus.nix

···

       4
       4
        
         tested = pkgs.ibus;

     

       5
       5
        
       

     

       6
       6
        
         testConfig = {

     

       7
       7
       +
           i18n.supportedLocales = [ "all" ];

     

       7
       8
        
           i18n.inputMethod.enabled = "ibus";

     

       8
       9
        
           systemd.user.services.ibus-daemon = {

     

       9
       10
        
             serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose";

+1 -1

nixos/tests/kanidm.nix

···

       69
       69
        
               server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm")

     

       70
       70
        
               server.wait_until_succeeds("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'")

     

       71
       71
        
               client.wait_until_succeeds("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}")

     

       72
       72
       -
               (rv, result) = server.execute("kanidmd recover_account -d quiet -c ${serverConfigFile} -n admin 2>&1 | rg -o '[A-Za-z0-9]{48}'")

     

       72
       72
       +
               rv, result = server.execute("kanidmd recover_account -c ${serverConfigFile} idm_admin 2>&1 | rg -o '[A-Za-z0-9]{48}'")

     

       73
       73
        
               assert rv == 0

     

       74
       74
        
             '';

     

       75
       75
        
         })

+3 -2

pkgs/applications/editors/helix/default.nix

···

       1
       1
       -
       { fetchzip, lib, rustPlatform, makeWrapper }:

     

       1
       1
       +
       { fetchzip, lib, rustPlatform, installShellFiles, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "helix";

     
···

       14
       14
        
       

     

       15
       15
        
         cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M=";

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ installShellFiles makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         postInstall = ''

     

       20
       20
        
           # not needed at runtime

     
···

       22
       22
        
       

     

       23
       23
        
           mkdir -p $out/lib

     

       24
       24
        
           cp -r runtime $out/lib

     

       25
       25
       +
           installShellCompletion contrib/completion/hx.{bash,fish,zsh}

     

       25
       26
        
         '';

     

       26
       27
        
         postFixup = ''

     

       27
       28
        
           wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime

+3 -3

pkgs/applications/graphics/epick/default.nix

···

       16
       16
        
       

     

       17
       17
        
       rustPlatform.buildRustPackage rec {

     

       18
       18
        
         pname = "epick";

     

       19
       19
       -
         version = "0.8.1";

     

       19
       19
       +
         version = "0.8.2";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "vv9k";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           sha256 = "sha256-sZ0ZPst6PE6KQ+pmjqLdcD7bWU/gLRsGH84PtWTLdSQ=";

     

       25
       25
       +
           sha256 = "sha256-b4if2ggJY+8CsCX8jbnnWXy16k7sfB88CLlYYCrtltk=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         cargoSha256 = "sha256-kMVjX4AWn8XFRzI7P9NRW8B7AHcIC8TG8LQk7tzkz5o=";

     

       28
       28
       +
         cargoSha256 = "sha256-HyGSmeLJ+2Twkg94p1QqXZDix0mU2jGFfEot6hgUg34=";

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = lib.optional stdenv.isLinux python3;

     

       31
       31

+39

pkgs/applications/misc/nwg-bar/default.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, pkg-config, gtk3, gtk-layer-shell }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "nwg-bar";

     

       5
       5
       +
         version = "unstable-2021-09-23";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "nwg-piotr";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5";

     

       11
       11
       +
           sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         patches = [ ./fix-paths.patch ];

     

       15
       15
       +
         postPatch = ''

     

       16
       16
       +
           substituteInPlace config/bar.json --subst-var out

     

       17
       17
       +
           substituteInPlace tools.go --subst-var out

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         vendorSha256 = "sha256-dgOwflNRb+11umFykozL8DQ50dLbhbMCmCyKmLlW7rw=";

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [ pkg-config ];

     

       23
       23
       +
       

     

       24
       24
       +
         buildInputs = [ gtk3 gtk-layer-shell ];

     

       25
       25
       +
       

     

       26
       26
       +
         preInstall = ''

     

       27
       27
       +
           mkdir -p $out/share/nwg-bar

     

       28
       28
       +
           cp -r config/* images $out/share/nwg-bar

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with lib; {

     

       32
       32
       +
           description =

     

       33
       33
       +
             "GTK3-based button bar for sway and other wlroots-based compositors";

     

       34
       34
       +
           homepage = "https://github.com/nwg-piotr/nwg-bar";

     

       35
       35
       +
           license = licenses.mit;

     

       36
       36
       +
           platforms = platforms.linux;

     

       37
       37
       +
           maintainers = with maintainers; [ sei40kr ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+47

pkgs/applications/misc/nwg-bar/fix-paths.patch

···

       1
       1
       +
       diff --git a/config/bar.json b/config/bar.json

     

       2
       2
       +
       index 6c456e7..98527cb 100644

     

       3
       3
       +
       --- a/config/bar.json

     

       4
       4
       +
       +++ b/config/bar.json

     

       5
       5
       +
       @@ -2,21 +2,21 @@

     

       6
       6
       +
          {

     

       7
       7
       +
            "label": "Lock",

     

       8
       8
       +
            "exec": "swaylock -f -c 000000",

     

       9
       9
       +
       -    "icon": "/usr/share/nwg-bar/images/system-lock-screen.svg"

     

       10
       10
       +
       +    "icon": "@out@/share/nwg-bar/images/system-lock-screen.svg"

     

       11
       11
       +
          },

     

       12
       12
       +
          {

     

       13
       13
       +
            "label": "Logout",

     

       14
       14
       +
            "exec": "swaymsg exit",

     

       15
       15
       +
       -    "icon": "/usr/share/nwg-bar/images/system-log-out.svg"

     

       16
       16
       +
       +    "icon": "@out@/share/nwg-bar/images/system-log-out.svg"

     

       17
       17
       +
          },

     

       18
       18
       +
          {

     

       19
       19
       +
            "label": "Reboot",

     

       20
       20
       +
            "exec": "systemctl reboot",

     

       21
       21
       +
       -    "icon": "/usr/share/nwg-bar/images/system-reboot.svg"

     

       22
       22
       +
       +    "icon": "@out@/share/nwg-bar/images/system-reboot.svg"

     

       23
       23
       +
          },

     

       24
       24
       +
          {

     

       25
       25
       +
            "label": "Shutdown",

     

       26
       26
       +
            "exec": "systemctl -i poweroff",

     

       27
       27
       +
       -    "icon": "/usr/share/nwg-bar/images/system-shutdown.svg"

     

       28
       28
       +
       +    "icon": "@out@/share/nwg-bar/images/system-shutdown.svg"

     

       29
       29
       +
          }

     

       30
       30
       +
        ]

     

       31
       31
       +
       \ No newline at end of file

     

       32
       32
       +
       diff --git a/tools.go b/tools.go

     

       33
       33
       +
       index f97751e..987163e 100644

     

       34
       34
       +
       --- a/tools.go

     

       35
       35
       +
       +++ b/tools.go

     

       36
       36
       +
       @@ -45,10 +45,7 @@ func configDir() string {

     

       37
       37
       +
        }

     

       38
       38
       +
        

     

       39
       39
       +
        func getDataHome() string {

     

       40
       40
       +
       -	if os.Getenv("XDG_DATA_HOME") != "" {

     

       41
       41
       +
       -		return os.Getenv("XDG_DATA_HOME")

     

       42
       42
       +
       -	}

     

       43
       43
       +
       -	return "/usr/share/"

     

       44
       44
       +
       +	return "@out@/share/"

     

       45
       45
       +
        }

     

       46
       46
       +
        

     

       47
       47
       +
        func createDir(dir string) {

+77

pkgs/applications/misc/qelectrotech/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , mkDerivation

     

       4
       4
       +
       , fetchzip

     

       5
       5
       +
       , installShellFiles

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , qmake

     

       8
       8
       +
       , qtbase

     

       9
       9
       +
       , kcoreaddons

     

       10
       10
       +
       , kwidgetsaddons

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       mkDerivation rec {

     

       14
       14
       +
         pname = "qelectrotech";

     

       15
       15
       +
         version = "0.8.0";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchzip {

     

       18
       18
       +
           url = "https://git.tuxfamily.org/qet/qet.git/snapshot/qet-${version}.tar.gz";

     

       19
       19
       +
           sha256 = "sha256-op2vnMPF9bNnHGphWFB/HEeoThE6tX+9UvX8LWVwkzI=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           substituteInPlace qelectrotech.pro \

     

       24
       24
       +
             --replace 'GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""' \

     

       25
       25
       +
                       'GIT_COMMIT_SHA="\\\"${version}\\\""' \

     

       26
       26
       +
             --replace "COMPIL_PREFIX              = '/usr/local/'" \

     

       27
       27
       +
                       "COMPIL_PREFIX              = '$out/'" \

     

       28
       28
       +
             --replace "INSTALL_PREFIX             = '/usr/local/'" \

     

       29
       29
       +
                       "INSTALL_PREFIX             = '$out/'"

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         nativeBuildInputs = [

     

       33
       33
       +
           installShellFiles

     

       34
       34
       +
           pkg-config

     

       35
       35
       +
           qmake

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         buildInputs = [

     

       39
       39
       +
           kcoreaddons

     

       40
       40
       +
           kwidgetsaddons

     

       41
       41
       +
           qtbase

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         qmakeFlags = [

     

       45
       45
       +
           "INSTALLROOT=$(out)"

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         installPhase = ''

     

       49
       49
       +
           runHook preInstall

     

       50
       50
       +
       

     

       51
       51
       +
           install -Dm555 qelectrotech $out/bin/qelectrotech

     

       52
       52
       +
       

     

       53
       53
       +
           install -Dm444 -t $out/share/applications misc/qelectrotech.desktop

     

       54
       54
       +
           install -Dm444 -t $out/share/applications misc/x-qet-titleblock.desktop

     

       55
       55
       +
           install -Dm444 -t $out/share/applications misc/x-qet-element.desktop

     

       56
       56
       +
           install -Dm444 -t $out/share/applications misc/x-qet-project.desktop

     

       57
       57
       +
       

     

       58
       58
       +
           mkdir -p $out/share/qelectrotech

     

       59
       59
       +
           cp -r elements $out/share/qelectrotech

     

       60
       60
       +
           cp -r titleblocks $out/share/qelectrotech

     

       61
       61
       +
           cp -r lang $out/share/qelectrotech

     

       62
       62
       +
           cp -r examples $out/share/qelectrotech

     

       63
       63
       +
       

     

       64
       64
       +
           mkdir -p $out/share/icons/hicolor

     

       65
       65
       +
           cp -r ico $out/share/icons/hicolor

     

       66
       66
       +
       

     

       67
       67
       +
           runHook postInstall

     

       68
       68
       +
         '';

     

       69
       69
       +
       

     

       70
       70
       +
         meta = with lib; {

     

       71
       71
       +
           description = "Free software to create electric diagrams";

     

       72
       72
       +
           homepage = "https://qelectrotech.org/";

     

       73
       73
       +
           license = licenses.gpl2;

     

       74
       74
       +
           maintainers = with maintainers; [ yvesf ];

     

       75
       75
       +
           platforms = qtbase.meta.platforms;

     

       76
       76
       +
         };

     

       77
       77
       +
       }

+1 -5

pkgs/applications/office/paperless-ngx/default.nix

···

       207
       207
        
         '';

     

       208
       208
        
       

     

       209
       209
        
         passthru = {

     

       210
       210
       -
           inherit python;

     

       211
       211
       -
           # PYTHONPATH of all dependencies used by the package

     

       212
       212
       -
           pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;

     

       213
       213
       -
           inherit path;

     

       214
       214
       -
       

     

       210
       210
       +
           inherit python path;

     

       215
       211
        
           tests = { inherit (nixosTests) paperless; };

     

       216
       212
        
         };

     

       217
       213

+2 -2

pkgs/applications/science/biology/EZminc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk, fftwFloat, gsl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "EZminc";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       15
       15
       -
         buildInputs = [ itk4 libminc bicpl fftwFloat gsl ];

     

       15
       15
       +
         buildInputs = [ itk libminc bicpl fftwFloat gsl ];

     

       16
       16
        
       

     

       17
       17
        
         cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"

     

       18
       18
        
                        "-DEZMINC_BUILD_TOOLS=TRUE"

+5 -13

pkgs/applications/science/biology/ants/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk-unstable, vtk_8, Cocoa }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname    = "ANTs";

     

       5
       5
       -
         version = "2.2.0";

     

       5
       5
       +
         version = "2.4.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "ANTsX";

     

       9
       9
        
           repo   = "ANTs";

     

       10
       10
       -
           rev    = "37ad4e20be3a5ecd26c2e4e41b49e778a0246c3d";

     

       11
       11
       -
           sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q";

     

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

     

       11
       11
       +
           sha256 = "sha256-sRZwRRqqU0xiu4K6xlLQV4xzVNnzMlnRsk+TPiv0wD0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = [

     

       15
       15
       -
           # Fix build with gcc8

     

       16
       16
       -
           (fetchpatch {

     

       17
       17
       -
             url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch";

     

       18
       18
       -
             sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams";

     

       19
       19
       -
           })

     

       20
       20
       -
         ];

     

       21
       21
       -
       

     

       22
       14
        
         nativeBuildInputs = [ cmake makeWrapper ];

     

       23
       23
       -
         buildInputs = [ itk4 vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];

     

       15
       15
       +
         buildInputs = [ itk-unstable vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];

     

       24
       16
        
       

     

       25
       17
        
         cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];

     

       26
       18

+27

pkgs/applications/science/biology/treemix/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , zlib

     

       5
       5
       +
       , gsl

     

       6
       6
       +
       , boost

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       10
       10
       +
         pname = "treemix";

     

       11
       11
       +
         version = "1.13";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchurl {

     

       14
       14
       +
           url = "https://bitbucket.org/nygcresearch/treemix/downloads/${pname}-${version}.tar.gz";

     

       15
       15
       +
           sha256 = "1nd3rzsdgk47r8b8k43mdfvaagln533sm08s1jr0dz8km8nlym7y";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         buildInputs = [ zlib gsl boost ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib ; {

     

       21
       21
       +
           description = "Inference of patterns of population splitting and mixing from genome-wide allele frequency data";

     

       22
       22
       +
           homepage = "https://bitbucket.org/nygcresearch/treemix/wiki/Home";

     

       23
       23
       +
           license = licenses.gpl3Only;

     

       24
       24
       +
           maintainers = [ maintainers.bzizou ];

     

       25
       25
       +
           platforms = platforms.linux;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

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

···

       27
       27
        
       }:

     

       28
       28
        
       

     

       29
       29
        
       let

     

       30
       30
       -
         version = "1.13.0";

     

       30
       30
       +
         version = "1.13.1";

     

       31
       31
        
       

     

       32
       32
        
         # build stimuli file for PGO build and the script to generate it

     

       33
       33
        
         # independently of the foot's build, so we can cache the result

     
···

       99
       99
        
           owner = "dnkl";

     

       100
       100
        
           repo = pname;

     

       101
       101
        
           rev = version;

     

       102
       102
       -
           sha256 = "0cc262jpqp8l25p04pcqh3w671gw0p1d2zrr3d34ch8k9c6s4nzq";

     

       102
       102
       +
           sha256 = "0k0zbh6adwr99y9aazlyvp6s1k8zaq2j6x8kqb8q9a5qjjg56lay";

     

       103
       103
        
         };

     

       104
       104
        
       

     

       105
       105
        
         depsBuildBuild = [

+3 -3

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

···

       29
       29
        
       

     

       30
       30
        
       rustPlatform.buildRustPackage rec {

     

       31
       31
        
         pname = "wezterm";

     

       32
       32
       -
         version = "20220807-113146-c2fee766";

     

       32
       32
       +
         version = "20220903-194523-3bb1ed61";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchFromGitHub {

     

       35
       35
        
           owner = "wez";

     

       36
       36
        
           repo = pname;

     

       37
       37
        
           rev = version;

     

       38
       38
        
           fetchSubmodules = true;

     

       39
       39
       -
           sha256 = "sha256-2krngcANqcwq8wNQZSz01srJ6yEOkk03QnO2sL7SuJA=";

     

       39
       39
       +
           sha256 = "sha256-R5DFBO6U1hVDCjvvNF2nDoldl+mzkrjaXR5rIPCosmM=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         postPatch = ''

     
···

       46
       46
        
           rm -r wezterm-ssh/tests

     

       47
       47
        
         '';

     

       48
       48
        
       

     

       49
       49
       -
         cargoSha256 = "sha256-ZkDGCR86VSCuvVlo4Pf9Ifax2BZuBicZpB/K/7bIMls=";

     

       49
       49
       +
         cargoSha256 = "sha256-x2n8ti9zk+h2MrwDg/FgRWTQJmCAckxE2fOHgrWdayA=";

     

       50
       50
        
       

     

       51
       51
        
         nativeBuildInputs = [

     

       52
       52
        
           pkg-config

+2 -2

pkgs/desktops/gnome/extensions/arcmenu/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gnome-shell-extension-arcmenu";

     

       5
       5
       -
         version = "35";

     

       5
       5
       +
         version = "37";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "arcmenu";

     

       9
       9
        
           repo = "ArcMenu";

     

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

     

       11
       11
       -
           sha256 = "sha256-q869UCnekCHBbB0aGNmHl8Ln32hRWHLddu3oqIUinwo=";

     

       11
       11
       +
           sha256 = "sha256-dXGcdDq6RbvE8ICd2VhnyMlfOH+x2jqlG3Jerll9EE8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = [

-35

pkgs/development/libraries/itk/4.x.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "itk";

     

       5
       5
       -
         version = "4.13.3";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "InsightSoftwareConsortium";

     

       9
       9
       -
           repo = "ITK";

     

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

     

       11
       11
       -
           sha256 = "067vkh39jxcvyvn69qjh4vi3wa7vdvm9m6qsg3jmnmm7gzw0kjlm";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         cmakeFlags = [

     

       15
       15
       -
           "-DBUILD_TESTING=OFF"

     

       16
       16
       -
           "-DBUILD_EXAMPLES=OFF"

     

       17
       17
       -
           "-DBUILD_SHARED_LIBS=ON"

     

       18
       18
       -
           "-DModule_ITKMINC=ON"

     

       19
       19
       -
           "-DModule_ITKIOMINC=ON"

     

       20
       20
       -
           "-DModule_ITKIOTransformMINC=ON"

     

       21
       21
       -
           "-DModule_ITKVtkGlue=ON"

     

       22
       22
       -
           "-DModule_ITKReview=ON"

     

       23
       23
       -
         ];

     

       24
       24
       -
       

     

       25
       25
       -
         nativeBuildInputs = [ cmake xz ];

     

       26
       26
       -
         buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];

     

       27
       27
       -
       

     

       28
       28
       -
         meta = {

     

       29
       29
       -
           description = "Insight Segmentation and Registration Toolkit";

     

       30
       30
       -
           homepage = "https://www.itk.org/";

     

       31
       31
       -
           license = lib.licenses.asl20;

     

       32
       32
       -
           maintainers = with lib.maintainers; [viric];

     

       33
       33
       -
           platforms = with lib.platforms; linux ++ darwin;

     

       34
       34
       -
         };

     

       35
       35
       -
       }

+5

pkgs/development/libraries/itk/5.x.nix

···

       1
       1
       +
       import ./generic.nix rec {

     

       2
       2
       +
         version = "5.2.1";

     

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

     

       4
       4
       +
         sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE=";

     

       5
       5
       +
       }

+5 -3

pkgs/development/libraries/itk/default.nix pkgs/development/libraries/itk/generic.nix

···

       1
       1
       +
       { version, rev, sourceSha256 }:

     

       2
       2
       +
       

     

       1
       3
        
       { lib, stdenv, fetchFromGitHub, cmake, makeWrapper

     

       2
       4
        
       , pkg-config, libX11, libuuid, xz, vtk, Cocoa }:

     

       3
       5
        
       

     

       4
       6
        
       stdenv.mkDerivation rec {

     

       5
       7
        
         pname = "itk";

     

       6
       6
       -
         version = "5.2.1";

     

       8
       8
       +
         inherit version;

     

       7
       9
        
       

     

       8
       10
        
         itkGenericLabelInterpolatorSrc = fetchFromGitHub {

     

       9
       11
        
           owner = "InsightSoftwareConsortium";

     
···

       22
       24
        
         src = fetchFromGitHub {

     

       23
       25
        
           owner = "InsightSoftwareConsortium";

     

       24
       26
        
           repo = "ITK";

     

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

     

       26
       26
       -
           sha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE=";

     

       27
       27
       +
           inherit rev;

     

       28
       28
       +
           sha256 = sourceSha256;

     

       27
       29
        
         };

     

       28
       30
        
       

     

       29
       31
        
         postPatch = ''

+5

pkgs/development/libraries/itk/unstable.nix

···

       1
       1
       +
       import ./generic.nix {

     

       2
       2
       +
         version = "unstable-2022-07-02";

     

       3
       3
       +
         rev = "5e7aea957c82b67d4364b2b88999805616e3b01d";

     

       4
       4
       +
         sourceSha256 = "sha256-tjkoaHCuVdvgE6X+7Kb8mt9oxINWs4R0xD9cxdEeYKk=";

     

       5
       5
       +
       }

+2 -2

pkgs/development/libraries/ngtcp2/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "ngtcp2";

     

       10
       10
       -
         version = "0.8.0";

     

       10
       10
       +
         version = "0.8.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "ngtcp2";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "sha256-ehOIWUGSPyHhNitkkA8voVciuEsCoRWv1s3MVMmOT0c=";

     

       16
       16
       +
           sha256 = "sha256-Sn03nY80UmL5oeoK6ScPye1oSUmEKxgoz2VLHcvor3U=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         outputs = [ "out" "dev" "doc" ];

-22

pkgs/development/libraries/vtk/7.x.nix

···

       1
       1
       -
       import ./generic.nix {

     

       2
       2
       -
         majorVersion = "7.1";

     

       3
       3
       -
         minorVersion = "1";

     

       4
       4
       -
         sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";

     

       5
       5
       -
         patchesToFetch = [

     

       6
       6
       -
           {

     

       7
       7
       -
             url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";

     

       8
       8
       -
             sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";

     

       9
       9
       -
           }

     

       10
       10
       -
       

     

       11
       11
       -
           {

     

       12
       12
       -
             url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f";

     

       13
       13
       -
             sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5";

     

       14
       14
       -
           }

     

       15
       15
       -
       

     

       16
       16
       -
           # Add missing include required with recent Qt.

     

       17
       17
       -
           {

     

       18
       18
       -
             url = "https://gitlab.kitware.com/vtk/vtk/-/commit/797f28697d5ba50c1fa2bc5596af626a3c277826.diff";

     

       19
       19
       -
             sha256 = "BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds=";

     

       20
       20
       -
           }

     

       21
       21
       -
         ];

     

       22
       22
       -
       }

+1 -1

pkgs/development/libraries/vtk/generic.nix

···

       96
       96
        
           maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];

     

       97
       97
        
           platforms = with platforms; unix;

     

       98
       98
        
           # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope

     

       99
       99
       -
           broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8");

     

       99
       99
       +
           broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8");

     

       100
       100
        
         };

     

       101
       101
        
       }

+42 -12

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

···

       4
       4
        
       , cython

     

       5
       5
        
       , datamodeldict

     

       6
       6
        
       , fetchFromGitHub

     

       7
       7
       +
       , fetchpatch

     

       7
       8
        
       , matplotlib

     

       8
       9
        
       , numericalunits

     

       9
       10
        
       , numpy

     
···

       12
       13
        
       , potentials

     

       13
       14
        
       , pymatgen

     

       14
       15
        
       , pytest

     

       16
       16
       +
       , pytestCheckHook

     

       15
       17
        
       , pythonOlder

     

       16
       18
        
       , pythonAtLeast

     

       17
       19
        
       , requests

     
···

       21
       23
        
       }:

     

       22
       24
        
       

     

       23
       25
        
       buildPythonPackage rec {

     

       24
       24
       -
         version = "1.4.4";

     

       26
       26
       +
         version = "1.4.5";

     

       25
       27
        
         pname = "atomman";

     

       26
       28
        
         format = "setuptools";

     

       27
       29
        
       

     

       28
       28
       -
         disabled = pythonOlder "3.6" || pythonAtLeast "3.10";

     

       30
       30
       +
         disabled = pythonOlder "3.6";

     

       29
       31
        
       

     

       30
       32
        
         src = fetchFromGitHub {

     

       31
       33
        
           owner = "usnistgov";

     

       32
       34
        
           repo = "atomman";

     

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

     

       34
       34
       -
           hash = "sha256-iLAB0KMtrTCyGpx+81QfHDPVDhq8OA6CDL/ipVRpyo0=";

     

       36
       36
       +
           hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys=";

     

       35
       37
        
         };

     

       36
       38
        
       

     

       39
       39
       +
         patches = [

     

       40
       40
       +
           # Fix several tests that are failing on master.

     

       41
       41
       +
           # https://github.com/usnistgov/atomman/pull/9

     

       42
       42
       +
           (fetchpatch {

     

       43
       43
       +
             name = "fix-tests-1.patch";

     

       44
       44
       +
             url = "https://github.com/usnistgov/atomman/commit/d255977a5e0ce4584e2c886f6c55ccb9f5932731.patch";

     

       45
       45
       +
             hash = "sha256-lBFOgcozY85JfQVsVjd51Jf9mrokwQuYdxa8l7VzkqU=";

     

       46
       46
       +
           })

     

       47
       47
       +
           (fetchpatch {

     

       48
       48
       +
             name = "fix-tests-2.patch";

     

       49
       49
       +
             url = "https://github.com/usnistgov/atomman/commit/de4177f28ad7c48d482cb606f323128e2fcb86aa.patch";

     

       50
       50
       +
             hash = "sha256-+YpwdKCT/OTue3b2GOk9Jagg26r1PTTV2Zg+GGBd8sM=";

     

       51
       51
       +
           })

     

       52
       52
       +
           (fetchpatch {

     

       53
       53
       +
             name = "fix-tests-3.patch";

     

       54
       54
       +
             url = "https://github.com/usnistgov/atomman/commit/10b168493ee883348699f1e42680423cec84bed5.patch";

     

       55
       55
       +
             hash = "sha256-b4f3POjiceq3xApfjnKAs9dEf1trCiTIyu7hMPL0ZTw=";

     

       56
       56
       +
           })

     

       57
       57
       +
           (fetchpatch {

     

       58
       58
       +
             name = "fix-tests-4.patch";

     

       59
       59
       +
             url = "https://github.com/usnistgov/atomman/commit/057d24c70427bab3c7c530251ceb5f4e27eb5c56.patch";

     

       60
       60
       +
             hash = "sha256-FTg/GNRZ5xigGW8SpUTIw2/GEzOxwb1rsv2wGebmZOk=";

     

       61
       61
       +
           })

     

       62
       62
       +
         ];

     

       63
       63
       +
       

     

       37
       64
        
         propagatedBuildInputs = [

     

       38
       65
        
           cython

     

       39
       66
        
           datamodeldict

     
···

       47
       74
        
           toolz

     

       48
       75
        
           xmltodict

     

       49
       76
        
         ];

     

       77
       77
       +
       

     

       78
       78
       +
         preCheck = ''

     

       79
       79
       +
           # By default, pytestCheckHook imports atomman from the current directory

     

       80
       80
       +
           # instead of from where `pip` installs it and fails due to missing Cython

     

       81
       81
       +
           # modules. Fix this by removing atomman from the current directory.

     

       82
       82
       +
           #

     

       83
       83
       +
           rm -r atomman

     

       84
       84
       +
         '';

     

       50
       85
        
       

     

       51
       86
        
         checkInputs = [

     

       52
       87
        
           ase

     

       53
       88
        
           phonopy

     

       54
       89
        
           pymatgen

     

       55
       90
        
           pytest

     

       91
       91
       +
           pytestCheckHook

     

       56
       92
        
         ];

     

       57
       93
        
       

     

       58
       58
       -
         checkPhase = ''

     

       59
       59
       -
           # pytestCheckHook doesn't work

     

       60
       60
       -
           pytest tests -k "not test_rootdir and not test_version \

     

       61
       61
       -
             and not test_atomic_mass and not imageflags \

     

       62
       62
       -
             and not test_build_unit and not test_set_and_get_in_units \

     

       63
       63
       -
             and not test_set_literal and not test_scalar_model " \

     

       64
       64
       -
             --ignore tests/plot/test_interpolate.py \

     

       65
       65
       -
             --ignore tests/tools/test_vect_angle.py

     

       66
       66
       -
         '';

     

       94
       94
       +
         disabledTests = [

     

       95
       95
       +
           "test_unique_shifts_prototype" # needs network access to download database files

     

       96
       96
       +
         ];

     

       67
       97
        
       

     

       68
       98
        
         pythonImportsCheck = [

     

       69
       99
        
           "atomman"

+19 -16

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

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , lib

     

       1
       1
       +
       { lib

     

       3
       2
        
       , buildPythonPackage

     

       4
       3
        
       , fetchPypi

     

       5
       4
        
       , hatchling

     
···

       14
       13
        
       , pytest-timeout

     

       15
       14
        
       , pytest-tornasync

     

       16
       15
        
       , ruamel-yaml

     

       17
       17
       -
       , strict-rfc3339

     

       16
       16
       +
       , importlib-metadata

     

       18
       17
        
       }:

     

       19
       18
        
       

     

       20
       19
        
       buildPythonPackage rec {

     

       21
       20
        
         pname = "jupyterlab_server";

     

       22
       22
       -
         version = "2.15.0";

     

       21
       21
       +
         version = "2.15.1";

     

       23
       22
        
         format = "pyproject";

     

       24
       23
        
         disabled = pythonOlder "3.6";

     

       25
       24
        
       

     

       26
       25
        
         src = fetchPypi {

     

       27
       26
        
           inherit pname version;

     

       28
       28
       -
           sha256 = "sha256-qRxRXg55caj3w8mDS3SIV/faxQL5NgS/KDmHmR/Zh+8=";

     

       27
       27
       +
           sha256 = "sha256-MFMTlw4THFkM93u2uMp+mFkbwwQRHo0QO8kdIS6UeW8=";

     

       29
       28
        
         };

     

       30
       29
        
       

     

       31
       31
       -
         postPatch = ''

     

       32
       32
       -
           substituteInPlace pyproject.toml \

     

       33
       33
       -
             --replace "--cov jupyterlab_server --cov-report term-missing --cov-report term:skip-covered" ""

     

       34
       34
       -
       

     

       35
       35
       -
           # translation tests try to install additional packages into read only paths

     

       36
       36
       -
           rm -r tests/translations/

     

       37
       37
       -
         '';

     

       38
       38
       -
       

     

       39
       30
        
         nativeBuildInputs = [

     

       40
       31
        
           hatchling

     

       41
       32
        
         ];

     

       42
       33
        
       

     

       43
       43
       -
         propagatedBuildInputs = [ requests jsonschema json5 babel jupyter_server ];

     

       34
       34
       +
         propagatedBuildInputs = [

     

       35
       35
       +
           requests

     

       36
       36
       +
           jsonschema

     

       37
       37
       +
           json5

     

       38
       38
       +
           babel

     

       39
       39
       +
           jupyter_server

     

       40
       40
       +
         ] ++ lib.optional (pythonOlder "3.10") importlib-metadata;

     

       44
       41
        
       

     

       45
       42
        
         checkInputs = [

     

       46
       43
        
           openapi-core

     
···

       50
       47
        
           ruamel-yaml

     

       51
       48
        
         ];

     

       52
       49
        
       

     

       50
       50
       +
         postPatch = ''

     

       51
       51
       +
           # translation tests try to install additional packages into read only paths

     

       52
       52
       +
           rm -r tests/translations/

     

       53
       53
       +
         '';

     

       54
       54
       +
       

     

       53
       55
        
         preCheck = ''

     

       54
       56
        
           export HOME=$(mktemp -d)

     

       55
       57
        
         '';

     

       56
       58
        
       

     

       57
       59
        
         pytestFlagsArray = [

     

       58
       58
       -
           # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives

     

       60
       60
       +
           # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12.

     

       61
       61
       +
           # Use setuptools or check PEP 632 for potential alternatives.

     

       59
       62
        
           "-W ignore::DeprecationWarning"

     

       60
       63
        
         ];

     

       61
       64
        
       

     

       62
       65
        
         __darwinAllowLocalNetworking = true;

     

       63
       66
        
       

     

       64
       67
        
         meta = with lib; {

     

       65
       65
       -
           description = "JupyterLab Server";

     

       68
       68
       +
           description = "A set of server components for JupyterLab and JupyterLab like applications";

     

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

     

       67
       70
        
           license = licenses.bsdOriginal;

     

       68
       71
        
           maintainers = [ maintainers.costrouc ];

+47

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

···

       1
       1
       +
       { fetchFromGitHub

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pillow

     

       4
       4
       +
       , numpy

     

       5
       5
       +
       , libdmtx

     

       6
       6
       +
       , lib

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "pylibdmtx";

     

       11
       11
       +
         version = "0.1.10";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "NaturalHistoryMuseum";

     

       15
       15
       +
           repo = pname;

     

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

     

       17
       17
       +
           hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         # Change:

     

       21
       21
       +
         # def load():

     

       22
       22
       +
         #     """Loads the libdmtx shared library.

     

       23
       23
       +
         #

     

       24
       24
       +
         # To:

     

       25
       25
       +
         # def load():

     

       26
       26
       +
         #     return cdll.LoadLibrary("/nix/store/.../lib/libdmtx.so")

     

       27
       27
       +
         #     """Loads the libdmtx shared library.

     

       28
       28
       +
         postPatch = ''

     

       29
       29
       +
           sed -i '\#def load.*#a\    return cdll.LoadLibrary("${libdmtx}/lib/libdmtx.so")' \

     

       30
       30
       +
               pylibdmtx/dmtx_library.py

     

       31
       31
       +
       

     

       32
       32
       +
           # Checks that the loader works in various scenarios, but we just

     

       33
       33
       +
           # forced it to only work one way.

     

       34
       34
       +
           rm pylibdmtx/tests/test_dmtx_library.py

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         propagatedBuildInputs = [ pillow numpy ];

     

       38
       38
       +
       

     

       39
       39
       +
         pythonImportsCheck = [ "pylibdmtx" ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "Read and write Data Matrix barcodes from Python 2 and 3 using the libdmtx library";

     

       43
       43
       +
           homepage = "https://github.com/NaturalHistoryMuseum/pylibdmtx/";

     

       44
       44
       +
           license = licenses.mit;

     

       45
       45
       +
           maintainers = with maintainers; [ grahamc ];

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+61

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

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , matplotlib

     

       7
       7
       +
       , python-snap7

     

       8
       8
       +
       , opencv4

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "remi";

     

       13
       13
       +
         version = "2022.7.27";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "rawpython";

     

       17
       17
       +
           repo = pname;

     

       18
       18
       +
           rev = version;

     

       19
       19
       +
           hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         preCheck = ''

     

       23
       23
       +
           # for some reason, REMI already deal with these using try blocks, but they fail

     

       24
       24
       +
           substituteInPlace test/test_widget.py \

     

       25
       25
       +
             --replace \

     

       26
       26
       +
               "from html_validator import " \

     

       27
       27
       +
               "from .html_validator import "

     

       28
       28
       +
           substituteInPlace test/test_examples_app.py \

     

       29
       29
       +
             --replace \

     

       30
       30
       +
               "from mock_server_and_request import " \

     

       31
       31
       +
               "from .mock_server_and_request import " \

     

       32
       32
       +
             --replace \

     

       33
       33
       +
               "from html_validator import " \

     

       34
       34
       +
               "from .html_validator import "

     

       35
       35
       +
           # Halves number of warnings

     

       36
       36
       +
           substituteInPlace test/test_*.py \

     

       37
       37
       +
             --replace \

     

       38
       38
       +
               "self.assertEquals(" \

     

       39
       39
       +
               "self.assertEqual("

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         checkInputs = [

     

       43
       43
       +
           pytestCheckHook

     

       44
       44
       +
           python-snap7

     

       45
       45
       +
           opencv4

     

       46
       46
       +
           matplotlib

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         pythonImportsCheck = [

     

       50
       50
       +
           "remi"

     

       51
       51
       +
           "editor"

     

       52
       52
       +
           "editor.widgets"

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       55
       55
       +
         meta = with lib; {

     

       56
       56
       +
           description = "Pythonic, lightweight and websocket-based webui library";

     

       57
       57
       +
           homepage = "https://github.com/rawpython/remi";

     

       58
       58
       +
           license = with licenses; [ asl20 ];

     

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

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+4

pkgs/development/tools/buf/default.nix

···

       26
       26
        
           ./skip_test_requiring_network.patch

     

       27
       27
        
           # Skip TestWorkspaceGit which requires .git and commits.

     

       28
       28
        
           ./skip_test_requiring_dotgit.patch

     

       29
       29
       +
           # Skips the invalid_upstream test as it is flakey. Based on upstream commit

     

       30
       30
       +
           # 27930caf2eb35c2592a77f59ed5afe4d9e2fb7ea.

     

       31
       31
       +
           # This patch may be removed on the next buf update.

     

       32
       32
       +
           ./skip_test_invalid_upstream_flakey.patch

     

       29
       33
        
         ];

     

       30
       34
        
       

     

       31
       35
        
         nativeBuildInputs = [ installShellFiles ];

+24

pkgs/development/tools/buf/skip_test_invalid_upstream_flakey.patch

···

       1
       1
       +
       diff --git a/private/bufpkg/bufstudioagent/bufstudioagent_test.go b/private/bufpkg/bufstudioagent/bufstudioagent_test.go

     

       2
       2
       +
       index 6e010937..9cacc082 100644

     

       3
       3
       +
       --- a/private/bufpkg/bufstudioagent/bufstudioagent_test.go

     

       4
       4
       +
       +++ b/private/bufpkg/bufstudioagent/bufstudioagent_test.go

     

       5
       5
       +
       @@ -186,6 +186,19 @@ func testPlainPostHandlerErrors(t *testing.T, upstreamServer *httptest.Server) {

     

       6
       6
       +
        	})

     

       7
       7
       +
        

     

       8
       8
       +
        	t.Run("invalid_upstream", func(t *testing.T) {

     

       9
       9
       +
       +		// TODO: unskip this test. This is flaky because of two reasons:

     

       10
       10
       +
       +		//

     

       11
       11
       +
       +		// 1. When a connection is closed, the underlying HTTP client does not

     

       12
       12
       +
       +		// always knows it, since the http handler implementation in go has no way

     

       13
       13
       +
       +		// of changing the connection timeout. See:

     

       14
       14
       +
       +		// https://github.com/golang/go/issues/16100

     

       15
       15
       +
       +		//

     

       16
       16
       +
       +		// 2. The expected status code is `StatusBadGateway` since the issue

     

       17
       17
       +
       +		// happened client-side (a response never came back from the server). This

     

       18
       18
       +
       +		// is not deterministic in the business logic because we're based on the

     

       19
       19
       +
       +		// connect error code that's returned. See

     

       20
       20
       +
       +		// https://linear.app/bufbuild/issue/BSR-383/flaky-test-in-bufstudioagent-testgo

     

       21
       21
       +
       +		t.SkipNow()

     

       22
       22
       +
        		listener, err := net.Listen("tcp", "127.0.0.1:")

     

       23
       23
       +
        		require.NoError(t, err)

     

       24
       24
       +
        		go func() {

+2 -2

pkgs/development/tools/flyway/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, jre_headless, makeWrapper }:

     

       2
       2
        
       stdenv.mkDerivation rec{

     

       3
       3
        
         pname = "flyway";

     

       4
       4
       -
         version = "9.2.0";

     

       4
       4
       +
         version = "9.2.2";

     

       5
       5
        
         src = fetchurl {

     

       6
       6
        
           url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";

     

       7
       7
       -
           sha256 = "sha256-vNTL1yIGYgldjC69Yhj8fGShvfaDv5zM82cxwZMpzQw=";

     

       7
       7
       +
           sha256 = "sha256-aHsBey1WzmRhcrCeHeAeVuEvX4iaxbIb/C7N6tCOyuY=";

     

       8
       8
        
         };

     

       9
       9
        
         nativeBuildInputs = [ makeWrapper ];

     

       10
       10
        
         dontBuild = true;

+15 -4

pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch

···

       1
       1
       +
       diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build

     

       2
       2
       +
       index b0ff5b106..13ac380d0 100644

     

       3
       3
       +
       --- a/data/bios-settings.d/meson.build

     

       4
       4
       +
       +++ b/data/bios-settings.d/meson.build

     

       5
       5
       +
       @@ -1,5 +1,5 @@

     

       6
       6
       +
        if build_standalone and host_machine.system() == 'linux'

     

       7
       7
       +
        install_data('README.md',

     

       8
       8
       +
       -  install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d')

     

       9
       9
       +
       +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'bios-settings.d')

     

       10
       10
       +
        )

     

       11
       11
       +
        endif

     

       1
       12
        
       diff --git a/data/meson.build b/data/meson.build

     

       2
       2
       -
       index d8494020d..7c896fa0d 100644

     

       13
       13
       +
       index 3a77a7bfc..747bd1988 100644

     

       3
       14
        
       --- a/data/meson.build

     

       4
       15
        
       +++ b/data/meson.build

     

       5
       16
        
       @@ -26,7 +26,7 @@ endif

     
···

       83
       94
        
       +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),

     

       84
       95
        
        )

     

       85
       96
        
       diff --git a/meson.build b/meson.build

     

       86
       86
       -
       index e6b717078..f8a7a7455 100644

     

       97
       97
       +
       index e7980e965..2c66e2dc4 100644

     

       87
       98
        
       --- a/meson.build

     

       88
       99
        
       +++ b/meson.build

     

       89
       100
        
       @@ -195,6 +195,12 @@ endif

     
···

       100
       111
        
        gio = dependency('gio-2.0', version: '>= 2.45.8')

     

       101
       112
        
        giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false)

     

       102
       113
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       103
       103
       -
       index 06d242371..d9e517fc0 100644

     

       114
       114
       +
       index 6cf92e72e..2e8568292 100644

     

       104
       115
        
       --- a/meson_options.txt

     

       105
       116
        
       +++ b/meson_options.txt

     

       106
       117
        
       @@ -1,3 +1,4 @@

     
···

       121
       132
        
        )

     

       122
       133
        
        endif

     

       123
       134
        
       diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build

     

       124
       124
       -
       index 13f03ccd4..9235ebe33 100644

     

       135
       135
       +
       index d626c3ad3..5a2f847d5 100644

     

       125
       136
        
       --- a/plugins/msr/meson.build

     

       126
       137
        
       +++ b/plugins/msr/meson.build

     

       127
       138
        
       @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'],

+3 -2

pkgs/os-specific/linux/firmware/fwupd/default.nix

···

       114
       114
        
       

     

       115
       115
        
         self = stdenv.mkDerivation rec {

     

       116
       116
        
           pname = "fwupd";

     

       117
       117
       -
           version = "1.8.3";

     

       117
       117
       +
           version = "1.8.4";

     

       118
       118
        
       

     

       119
       119
        
           # libfwupd goes to lib

     

       120
       120
        
           # daemon, plug-ins and libfwupdplugin go to out

     
···

       123
       123
        
       

     

       124
       124
        
           src = fetchurl {

     

       125
       125
        
             url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";

     

       126
       126
       -
             sha256 = "sha256-ciIpd86KhmJRH/o8CIFWb2xFjsjWHSUNlGYRfWEiOOw=";

     

       126
       126
       +
             sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY=";

     

       127
       127
        
           };

     

       128
       128
        
       

     

       129
       129
        
           patches = [

     
···

       322
       322
        
       

     

       323
       323
        
           passthru = {

     

       324
       324
        
             filesInstalledToEtc = [

     

       325
       325
       +
               "fwupd/bios-settings.d/README.md"

     

       325
       326
        
               "fwupd/daemon.conf"

     

       326
       327
        
               "fwupd/remotes.d/lvfs-testing.conf"

     

       327
       328
        
               "fwupd/remotes.d/lvfs.conf"

+9

pkgs/servers/dns/bind/default.nix

···

       48
       48
        
           for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do

     

       49
       49
        
             sed -i "$f" -e 's|-L${openssl.dev}|-L${lib.getLib openssl}|g'

     

       50
       50
        
           done

     

       51
       51
       +
       

     

       52
       52
       +
           cat <<EOF >$out/etc/rndc.conf

     

       53
       53
       +
           include "/etc/bind/rndc.key";

     

       54
       54
       +
           options {

     

       55
       55
       +
               default-key "rndc-key";

     

       56
       56
       +
               default-server 127.0.0.1;

     

       57
       57
       +
               default-port 953;

     

       58
       58
       +
           };

     

       59
       59
       +
           EOF

     

       51
       60
        
         '';

     

       52
       61
        
       

     

       53
       62
        
         doCheck = false; # requires root and the net

+14 -17

pkgs/servers/kanidm/default.nix

···

       17
       17
        
       in

     

       18
       18
        
       rustPlatform.buildRustPackage rec {

     

       19
       19
        
         pname = "kanidm";

     

       20
       20
       -
         version = "1.1.0-alpha.8";

     

       20
       20
       +
         version = "1.1.0-alpha.9";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = pname;

     

       24
       24
        
           repo = pname;

     

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

     

       26
       26
       -
           sha256 = "sha256-zMtbE6Y9wXFPBqhmiTMJ3m6bLVZl+c6lRY39DWDlJNo=";

     

       25
       25
       +
           rev = "985462590b1c49b26a0b0ee01e24b1eb01942165";

     

       26
       26
       +
           hash = "sha256-JtoDuA3NCKmX+wDqav30VwrLeDALYat1iKFWpbYOO1s=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         cargoSha256 = "sha256:1l7xqp457zfd9gfjp6f4lzgadfp6112jbip4irazw4084qwj0z6x";

     

       29
       29
       +
         cargoSha256 = "sha256-pkBkXIG2PF5YMeighQwHwhURWbJabfveyszRIdrQjcA=";

     

       30
       30
        
       

     

       31
       31
        
         KANIDM_BUILD_PROFILE = "release_nixos_${arch}";

     

       32
       32
        
       

     
···

       56
       56
        
           pam

     

       57
       57
        
         ];

     

       58
       58
        
       

     

       59
       59
       -
         # Failing tests, probably due to network issues

     

       60
       60
       -
         checkFlags = [

     

       61
       61
       -
           "--skip default_entries"

     

       62
       62
       -
           "--skip oauth2_openid_basic_flow"

     

       63
       63
       -
           "--skip test_server"

     

       64
       64
       -
           "--skip test_cache"

     

       65
       65
       -
         ];

     

       59
       59
       +
         # The UI needs to be in place before the tests are run.

     

       60
       60
       +
         postBuild = ''

     

       61
       61
       +
           # We don't compile the wasm-part form source, as there isn't a rustc for

     

       62
       62
       +
           # wasm32-unknown-unknown in nixpkgs yet.

     

       63
       63
       +
           mkdir $out

     

       64
       64
       +
           cp -r kanidmd_web_ui/pkg $out/ui

     

       65
       65
       +
         '';

     

       66
       66
        
       

     

       67
       67
        
         preFixup = ''

     

       68
       68
       -
           installShellCompletion --bash $releaseDir/build/completions/*.bash

     

       69
       69
       -
           installShellCompletion --zsh  $releaseDir/build/completions/_*

     

       68
       68
       +
           installShellCompletion \

     

       69
       69
       +
             --bash $releaseDir/build/completions/*.bash \

     

       70
       70
       +
             --zsh $releaseDir/build/completions/_*

     

       70
       71
        
       

     

       71
       72
        
           # PAM and NSS need fix library names

     

       72
       73
        
           mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2

     

       73
       74
        
           mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so

     

       74
       74
       -
       

     

       75
       75
       -
           # We don't compile the wasm-part form source, as there isn't a rustc for

     

       76
       76
       -
           # wasm32-unknown-unknown in nixpkgs yet.

     

       77
       77
       -
           cp -r kanidmd_web_ui/pkg $out/ui

     

       78
       75
        
         '';

     

       79
       76
        
       

     

       80
       77
        
         passthru.tests = { inherit (nixosTests) kanidm; };

+31

pkgs/shells/carapace/default.nix

···

       1
       1
       +
       { lib, buildGo117Module, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGo117Module rec {

     

       4
       4
       +
         pname = "carapace";

     

       5
       5
       +
         version = "0.8.10";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "rsteube";

     

       9
       9
       +
           repo = "${pname}-bin";

     

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

     

       11
       11
       +
           sha256 = "0j60fvrmjm4440gj9hib2ar386zxcblw7yifigsnchr7p3i2187n";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "1s1sws79cyz1rl63wayzf7yhb04x29a4a1mkifqnl4cc2pv806jf";

     

       15
       15
       +
       

     

       16
       16
       +
         subPackages = [ "./cmd/carapace" ];

     

       17
       17
       +
       

     

       18
       18
       +
         tags = [ "release" ];

     

       19
       19
       +
       

     

       20
       20
       +
         preBuild = ''

     

       21
       21
       +
           go generate ./...

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with lib; {

     

       25
       25
       +
           description = "Multi-shell multi-command argument completer";

     

       26
       26
       +
           homepage = "https://rsteube.github.io/carapace-bin/";

     

       27
       27
       +
           maintainers = with maintainers; [ mredaelli ];

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
           platforms = platforms.unix;

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+2 -10

pkgs/tools/inputmethods/ibus/default.nix

···

       1
       1
        
       { lib, stdenv

     

       2
       2
        
       , substituteAll

     

       3
       3
       -
       , fetchurl

     

       4
       4
       -
       , fetchpatch

     

       5
       3
        
       , fetchFromGitHub

     

       6
       4
        
       , autoreconfHook

     

       7
       5
        
       , gettext

     
···

       60
       58
        
       

     

       61
       59
        
       stdenv.mkDerivation rec {

     

       62
       60
        
         pname = "ibus";

     

       63
       63
       -
         version = "1.5.26";

     

       61
       61
       +
         version = "1.5.27";

     

       64
       62
        
       

     

       65
       63
        
         src = fetchFromGitHub {

     

       66
       64
        
           owner = "ibus";

     

       67
       65
        
           repo = "ibus";

     

       68
       66
        
           rev = version;

     

       69
       69
       -
           sha256 = "7Vuj4Gyd+dLUoCkR4SPkfGPwVQPRo2pHk0pRAsmtjxc=";

     

       67
       67
       +
           sha256 = "sha256-DwX7SYRb18C0Lz2ySPS3yV99Q1xQezs0Ls2P7Rbtk5Q=";

     

       70
       68
        
         };

     

       71
       69
        
       

     

       72
       70
        
         patches = [

     

       73
       73
       -
           # Fixes systemd unit installation path https://github.com/ibus/ibus/pull/2388

     

       74
       74
       -
           (fetchpatch {

     

       75
       75
       -
             url = "https://github.com/ibus/ibus/commit/33b4b3932bfea476a841f8df99e20049b83f4b0e.patch";

     

       76
       76
       -
             sha256 = "kh8SBR+cqsov/B0A2YXLJVq1F171qoSRUKbBPHjPRHI=";

     

       77
       77
       -
           })

     

       78
       78
       -
       

     

       79
       71
        
           (substituteAll {

     

       80
       72
        
             src = ./fix-paths.patch;

     

       81
       73
        
             pythonInterpreter = python3Runtime.interpreter;

+39

pkgs/tools/misc/findup/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, zig, testers, findup }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "findup";

     

       5
       5
       +
         version = "1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "hiljusti";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "sha256-erlKIiYYlWnhoeD3FnKdxnHjfGmmJVXk44DUja5Unig=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ zig ];

     

       15
       15
       +
       

     

       16
       16
       +
         # Builds and installs (at the same time) with Zig.

     

       17
       17
       +
         dontConfigure = true;

     

       18
       18
       +
         dontBuild = true;

     

       19
       19
       +
       

     

       20
       20
       +
         # Give Zig a directory for intermediate work.

     

       21
       21
       +
         preInstall = ''

     

       22
       22
       +
           export HOME=$TMPDIR

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           runHook preInstall

     

       27
       27
       +
           zig build -Drelease-safe -Dcpu=baseline --prefix $out

     

       28
       28
       +
           runHook postInstall

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         passthru.tests.version = testers.testVersion { package = findup; };

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           homepage = "https://github.com/hiljusti/findup";

     

       35
       35
       +
           description = "Search parent directories for sentinel files";

     

       36
       36
       +
           license = licenses.mit;

     

       37
       37
       +
           maintainers = with maintainers; [ hiljusti ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+3 -3

pkgs/tools/misc/lsd/default.nix

···

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "lsd";

     

       12
       12
       -
         version = "0.22.0";

     

       12
       12
       +
         version = "0.23.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Peltoche";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-YeSEaamtIjip2nLBw/1/RSkr6ZL0p1GG2pHU14Ry6XU=";

     

       18
       18
       +
           sha256 = "sha256-E0STOvHeKC5uJ4l3+UU7L1gK9oKL/EChM7yVWCPqxLg=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoSha256 = "sha256-JsPGw5hjNy+yTZiSBeF05o9Zl6pYXxEI4kIDLY6Q54Q=";

     

       21
       21
       +
         cargoSha256 = "sha256-jO/3BGZIx7XibaAqd+vO1mwku3BG91/vkwpHvrUYV+Y=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ installShellFiles pandoc ];

     

       24
       24
        
         postInstall = ''

+2 -2

pkgs/tools/networking/chrony/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "chrony";

     

       8
       8
       -
         version = "4.2";

     

       8
       8
       +
         version = "4.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";

     

       12
       12
       -
           sha256 = "sha256-Jz+f0Vwyjtbzpfa6a67DWkIaNKc7tyVgUymxcSBI25o=";

     

       12
       12
       +
           sha256 = "sha256-nQ2oiahl8ImlohYQ/7ZxPjyUOM4wOmO0nC+26v9biAQ=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         postPatch = ''

+14 -12

pkgs/top-level/all-packages.nix

···

       6345
       6345
        
       

     

       6346
       6346
        
         findutils = callPackage ../tools/misc/findutils { };

     

       6347
       6347
        
       

     

       6348
       6348
       +
         findup = callPackage ../tools/misc/findup { };

     

       6349
       6349
       +
       

     

       6348
       6350
        
         bsd-finger = callPackage ../tools/networking/bsd-finger { };

     

       6349
       6351
        
         bsd-fingerd = bsd-finger.override({ buildClient = false; });

     

       6350
       6352
        
       

     
···

       12795
       12797
        
       

     

       12796
       12798
        
         undistract-me = callPackage ../shells/bash/undistract-me { };

     

       12797
       12799
        
       

     

       12800
       12800
       +
         carapace = callPackage ../shells/carapace { };

     

       12801
       12801
       +
       

     

       12798
       12802
        
         dash = callPackage ../shells/dash { };

     

       12799
       12803
        
       

     

       12800
       12804
        
         dasht = callPackage ../tools/misc/dasht { };

     
···

       18921
       18925
        
           nodejs = nodejs-14_x;

     

       18922
       18926
        
         };

     

       18923
       18927
        
       

     

       18924
       18924
       -
         itk4 = callPackage ../development/libraries/itk/4.x.nix {

     

       18925
       18925
       -
           stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv;

     

       18928
       18928
       +
         itk_5 = callPackage ../development/libraries/itk/5.x.nix {

     

       18926
       18929
        
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       18927
       18930
        
         };

     

       18928
       18931
        
       

     

       18929
       18929
       -
         itk = callPackage ../development/libraries/itk {

     

       18932
       18932
       +
         itk-unstable = callPackage ../development/libraries/itk/unstable.nix {

     

       18930
       18933
        
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       18931
       18934
        
         };

     

       18935
       18935
       +
       

     

       18936
       18936
       +
         itk = itk_5;

     

       18932
       18937
        
       

     

       18933
       18938
        
         jama = callPackage ../development/libraries/jama { };

     

       18934
       18939
        
       

     
···

       22014
       22019
        
       

     

       22015
       22020
        
         vte_290 = callPackage ../development/libraries/vte/2.90.nix { };

     

       22016
       22021
        
       

     

       22017
       22017
       -
         vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix {

     

       22018
       22018
       -
           stdenv = gcc9Stdenv;

     

       22019
       22019
       -
           inherit (darwin) libobjc;

     

       22020
       22020
       -
           inherit (darwin.apple_sdk.libs) xpc;

     

       22021
       22021
       -
           inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration

     

       22022
       22022
       -
                                                 IOKit CFNetwork Security ApplicationServices

     

       22023
       22023
       -
                                                 CoreText IOSurface ImageIO OpenGL GLUT;

     

       22024
       22024
       -
         };

     

       22025
       22022
        
         vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {

     

       22026
       22023
        
           stdenv = gcc9Stdenv;

     

       22027
       22024
        
           inherit (darwin) libobjc;

     
···

       29761
       29758
        
       

     

       29762
       29759
        
         novnc = callPackage ../applications/networking/novnc { };

     

       29763
       29760
        
       

     

       29761
       29761
       +
         nwg-bar = callPackage ../applications/misc/nwg-bar { };

     

       29762
       29762
       +
       

     

       29764
       29763
        
         nwg-drawer = callPackage ../applications/misc/nwg-drawer { };

     

       29765
       29764
        
       

     

       29766
       29765
        
         nwg-launchers = callPackage ../applications/misc/nwg-launchers { };

     
···

       30491
       30490
        
         qcad = libsForQt5.callPackage ../applications/misc/qcad { };

     

       30492
       30491
        
       

     

       30493
       30492
        
         qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };

     

       30493
       30493
       +
       

     

       30494
       30494
       +
         qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };

     

       30494
       30495
        
       

     

       30495
       30496
        
         eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };

     

       30496
       30497
        
       

     
···

       34137
       34138
        
         angsd = callPackage ../applications/science/biology/angsd { };

     

       34138
       34139
        
       

     

       34139
       34140
        
         ants = callPackage ../applications/science/biology/ants {

     

       34140
       34140
       -
           stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv;

     

       34141
       34141
        
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       34142
       34142
        
         };

     

       34143
       34143
        
       

     
···

       34365
       34365
        
         svaba = callPackage ../applications/science/biology/svaba { };

     

       34366
       34366
        
       

     

       34367
       34367
        
         tebreak = callPackage ../applications/science/biology/tebreak { };

     

       34368
       34368
       +
       

     

       34369
       34369
       +
         treemix = callPackage ../applications/science/biology/treemix { };

     

       34368
       34370
        
       

     

       34369
       34371
        
         trimal = callPackage ../applications/science/biology/trimal { };

     

       34370
       34372

+4

pkgs/top-level/python-packages.nix

···

       7872
       7872
        
       

     

       7873
       7873
        
         pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };

     

       7874
       7874
        
       

     

       7875
       7875
       +
         pylibdmtx = callPackage ../development/python-modules/pylibdmtx { };

     

       7876
       7876
       +
       

     

       7875
       7877
        
         pylibftdi = callPackage ../development/python-modules/pylibftdi {

     

       7876
       7878
        
           inherit (pkgs) libusb1;

     

       7877
       7879
        
         };

     
···

       9436
       9438
        
         releases = callPackage ../development/python-modules/releases { };

     

       9437
       9439
        
       

     

       9438
       9440
        
         remarshal = callPackage ../development/python-modules/remarshal { };

     

       9441
       9441
       +
       

     

       9442
       9442
       +
         remi = callPackage ../development/python-modules/remi { };

     

       9439
       9443
        
       

     

       9440
       9444
        
         renault-api = callPackage ../development/python-modules/renault-api { };

     

       9441
       9445