commit 1b357187a91bcfcc191578f16badf76261d6bb85 · pyrox.dev/nixpkgs

+1 -3

nixos/doc/manual/release-notes/rl-2405.section.md

···

48
48

49
49

- GNOME has been updated to v46. Refer to the [release notes](https://release.gnome.org/46/) for more details. Notably this release brings experimental VRR support, default GTK renderer changes and WebDAV support in Online Accounts. This release we have also stopped including the legacy and unsupported Adwaita-Dark theme by default.

50
50

51
51
-
- A new option `virtualisation.containers.cdi` was added. It contains `static` and `dynamic` attributes (corresponding to `/etc/cdi` and `/run/cdi` respectively) to configure the Container Device Interface (CDI).

52
52
-

53
53
-
- `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `virtualisation.containers.cdi.dynamic.nvidia.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature.

51
51
+
- `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `hardware.nvidia-container-toolkit.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature.

54
52

55
53

- `system.etc.overlay.enable` option was added. If enabled, `/etc` is

56
54

mounted via an overlayfs instead of being created by a custom perl script.

+1 -1

nixos/modules/module-list.nix

···

       559
       559
        
         ./services/hardware/kanata.nix

     

       560
       560
        
         ./services/hardware/lcd.nix

     

       561
       561
        
         ./services/hardware/lirc.nix

     

       562
       562
       -
         ./services/hardware/nvidia-container-toolkit-cdi-generator

     

       562
       562
       +
         ./services/hardware/nvidia-container-toolkit

     

       563
       563
        
         ./services/hardware/monado.nix

     

       564
       564
        
         ./services/hardware/nvidia-optimus.nix

     

       565
       565
        
         ./services/hardware/openrgb.nix

-41

nixos/modules/services/editors/emacs.md

···

       366
       366
        
       You can use `woman` to get completion of all available

     

       367
       367
        
       man pages. For example, type `M-x woman <RET> nixos-rebuild <RET>.`

     

       368
       368
        
       

     

       369
       369
       -
       ### Editing DocBook 5 XML Documents {#sec-emacs-docbook-xml}

     

       370
       370
       -
       

     

       371
       371
       -
       Emacs includes

     

       372
       372
       -
       [nXML](https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html),

     

       373
       373
       -
       a major-mode for validating and editing XML documents. When editing DocBook

     

       374
       374
       -
       5.0 documents, such as [this one](#book-nixos-manual),

     

       375
       375
       -
       nXML needs to be configured with the relevant schema, which is not

     

       376
       376
       -
       included.

     

       377
       377
       -
       

     

       378
       378
       -
       To install the DocBook 5.0 schemas, either add

     

       379
       379
       -
       {var}`pkgs.docbook5` to [](#opt-environment.systemPackages)

     

       380
       380
       -
       ([NixOS](#sec-declarative-package-mgmt)), or run

     

       381
       381
       -
       `nix-env -f '<nixpkgs>' -iA docbook5`

     

       382
       382
       -
       ([Nix](#sec-ad-hoc-packages)).

     

       383
       383
       -
       

     

       384
       384
       -
       Then customize the variable {var}`rng-schema-locating-files` to

     

       385
       385
       -
       include {file}`~/.emacs.d/schemas.xml` and put the following

     

       386
       386
       -
       text into that file:

     

       387
       387
       -
       ::: {.example #ex-emacs-docbook-xml}

     

       388
       388
       -
       ### nXML Schema Configuration (`~/.emacs.d/schemas.xml`)

     

       389
       389
       -
       

     

       390
       390
       -
       ```xml

     

       391
       391
       -
       <?xml version="1.0"?>

     

       392
       392
       -
       <!--

     

       393
       393
       -
         To let emacs find this file, evaluate:

     

       394
       394
       -
         (add-to-list 'rng-schema-locating-files "~/.emacs.d/schemas.xml")

     

       395
       395
       -
       -->

     

       396
       396
       -
       <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">

     

       397
       397
       -
         <!--

     

       398
       398
       -
           Use this variation if pkgs.docbook5 is added to environment.systemPackages

     

       399
       399
       -
         -->

     

       400
       400
       -
         <namespace ns="http://docbook.org/ns/docbook"

     

       401
       401
       -
                    uri="/run/current-system/sw/share/xml/docbook-5.0/rng/docbookxi.rnc"/>

     

       402
       402
       -
         <!--

     

       403
       403
       -
           Use this variation if installing schema with "nix-env -iA pkgs.docbook5".

     

       404
       404
       -
         <namespace ns="http://docbook.org/ns/docbook"

     

       405
       405
       -
                    uri="../.nix-profile/share/xml/docbook-5.0/rng/docbookxi.rnc"/>

     

       406
       406
       -
         -->

     

       407
       407
       -
       </locatingRules>

     

       408
       408
       -
       ```

     

       409
       409
       -
       :::

-60

nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         addDriverRunpath,

     

       3
       3
       -
         glibc,

     

       4
       4
       -
         jq,

     

       5
       5
       -
         lib,

     

       6
       6
       -
         nvidia-container-toolkit,

     

       7
       7
       -
         nvidia-driver,

     

       8
       8
       -
         runtimeShell,

     

       9
       9
       -
         writeScriptBin,

     

       10
       10
       -
       }:

     

       11
       11
       -
       let

     

       12
       12
       -
         mountOptions = { options = ["ro" "nosuid" "nodev" "bind"]; };

     

       13
       13
       -
         mounts = [

     

       14
       14
       -
           # FIXME: Making /usr mounts optional

     

       15
       15
       -
           { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control";

     

       16
       16
       -
             containerPath = "/usr/bin/nvidia-cuda-mps-control"; }

     

       17
       17
       -
           { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server";

     

       18
       18
       -
             containerPath = "/usr/bin/nvidia-cuda-mps-server"; }

     

       19
       19
       -
           { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump";

     

       20
       20
       -
             containerPath = "/usr/bin/nvidia-debugdump"; }

     

       21
       21
       -
           { hostPath = lib.getExe' nvidia-driver "nvidia-powerd";

     

       22
       22
       -
             containerPath = "/usr/bin/nvidia-powerd"; }

     

       23
       23
       -
           { hostPath = lib.getExe' nvidia-driver "nvidia-smi";

     

       24
       24
       -
             containerPath = "/usr/bin/nvidia-smi"; }

     

       25
       25
       -
           { hostPath = lib.getExe' nvidia-container-toolkit "nvidia-ctk";

     

       26
       26
       -
             containerPath = "/usr/bin/nvidia-ctk"; }

     

       27
       27
       -
           { hostPath = "${lib.getLib glibc}/lib";

     

       28
       28
       -
             containerPath = "${lib.getLib glibc}/lib"; }

     

       29
       29
       -
       

     

       30
       30
       -
           # FIXME: use closureinfo

     

       31
       31
       -
           {

     

       32
       32
       -
             hostPath = addDriverRunpath.driverLink;

     

       33
       33
       -
             containerPath = addDriverRunpath.driverLink;

     

       34
       34
       -
           }

     

       35
       35
       -
           { hostPath = "${lib.getLib glibc}/lib";

     

       36
       36
       -
             containerPath = "${lib.getLib glibc}/lib"; }

     

       37
       37
       -
           { hostPath = "${lib.getLib glibc}/lib64";

     

       38
       38
       -
             containerPath = "${lib.getLib glibc}/lib64"; }

     

       39
       39
       -
         ];

     

       40
       40
       -
         jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +";

     

       41
       41
       -
         mountsToJq = lib.concatMap

     

       42
       42
       -
           (mount:

     

       43
       43
       -
             ["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"])

     

       44
       44
       -
           mounts;

     

       45
       45
       -
       in

     

       46
       46
       -
       writeScriptBin "nvidia-cdi-generator"

     

       47
       47
       -
       ''

     

       48
       48
       -
       #! ${runtimeShell}

     

       49
       49
       -
       

     

       50
       50
       -
       function cdiGenerate {

     

       51
       51
       -
         ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \

     

       52
       52
       -
           --format json \

     

       53
       53
       -
           --ldconfig-path ${lib.getExe' glibc "ldconfig"} \

     

       54
       54
       -
           --library-search-path ${lib.getLib nvidia-driver}/lib \

     

       55
       55
       -
           --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}

     

       56
       56
       -
       }

     

       57
       57
       -
       

     

       58
       58
       -
       cdiGenerate | \

     

       59
       59
       -
         ${lib.concatStringsSep " | " mountsToJq} > $RUNTIME_DIRECTORY/nvidia-container-toolkit.json

     

       60
       60
       -
       ''

-40

nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       {

     

       4
       4
       -
       

     

       5
       5
       -
         options = {

     

       6
       6
       -
       

     

       7
       7
       -
           hardware.nvidia-container-toolkit-cdi-generator.enable = lib.mkOption {

     

       8
       8
       -
             default = false;

     

       9
       9
       -
             internal = true;

     

       10
       10
       -
             visible = false;

     

       11
       11
       -
             type = lib.types.bool;

     

       12
       12
       -
             description = ''

     

       13
       13
       -
               Enable dynamic CDI configuration for NVidia devices by running

     

       14
       14
       -
               nvidia-container-toolkit on boot.

     

       15
       15
       -
             '';

     

       16
       16
       -
           };

     

       17
       17
       -
       

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         config = {

     

       21
       21
       -
       

     

       22
       22
       -
           systemd.services.nvidia-container-toolkit-cdi-generator = lib.mkIf config.hardware.nvidia-container-toolkit-cdi-generator.enable {

     

       23
       23
       -
             description = "Container Device Interface (CDI) for Nvidia generator";

     

       24
       24
       -
             wantedBy = [ "multi-user.target" ];

     

       25
       25
       -
             after = [ "systemd-udev-settle.service" ];

     

       26
       26
       -
             serviceConfig = {

     

       27
       27
       -
               RuntimeDirectory = "cdi";

     

       28
       28
       -
               RemainAfterExit = true;

     

       29
       29
       -
               ExecStart =

     

       30
       30
       -
                 let

     

       31
       31
       -
                   script = pkgs.callPackage ./cdi-generate.nix { nvidia-driver = config.hardware.nvidia.package; };

     

       32
       32
       -
                 in

     

       33
       33
       -
                 lib.getExe script;

     

       34
       34
       -
               Type = "oneshot";

     

       35
       35
       -
             };

     

       36
       36
       -
           };

     

       37
       37
       -
       

     

       38
       38
       -
         };

     

       39
       39
       -
       

     

       40
       40
       -
       }

+35

nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         glibc,

     

       3
       3
       +
         jq,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         mounts,

     

       6
       6
       +
         nvidia-container-toolkit,

     

       7
       7
       +
         nvidia-driver,

     

       8
       8
       +
         runtimeShell,

     

       9
       9
       +
         writeScriptBin,

     

       10
       10
       +
       }: let

     

       11
       11
       +
         mkMount = {hostPath, containerPath, mountOptions}: {

     

       12
       12
       +
           inherit hostPath containerPath;

     

       13
       13
       +
           options = mountOptions;

     

       14
       14
       +
         };

     

       15
       15
       +
         jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +";

     

       16
       16
       +
         allJqMounts = lib.concatMap

     

       17
       17
       +
           (mount:

     

       18
       18
       +
             ["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mkMount mount)}'"])

     

       19
       19
       +
           mounts;

     

       20
       20
       +
       in

     

       21
       21
       +
       writeScriptBin "nvidia-cdi-generator"

     

       22
       22
       +
       ''

     

       23
       23
       +
       #! ${runtimeShell}

     

       24
       24
       +
       

     

       25
       25
       +
       function cdiGenerate {

     

       26
       26
       +
         ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \

     

       27
       27
       +
           --format json \

     

       28
       28
       +
           --ldconfig-path ${lib.getExe' glibc "ldconfig"} \

     

       29
       29
       +
           --library-search-path ${lib.getLib nvidia-driver}/lib \

     

       30
       30
       +
           --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       cdiGenerate | \

     

       34
       34
       +
         ${lib.concatStringsSep " | " allJqMounts} > $RUNTIME_DIRECTORY/nvidia-container-toolkit.json

     

       35
       35
       +
       ''

+121

nixos/modules/services/hardware/nvidia-container-toolkit/default.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [

     

       5
       5
       +
           (lib.mkRenamedOptionModule

     

       6
       6
       +
             [ "virtualisation" "containers" "cdi" "dynamic" "nvidia" "enable" ]

     

       7
       7
       +
             [ "hardware" "nvidia-container-toolkit" "enable" ])

     

       8
       8
       +
         ];

     

       9
       9
       +
       

     

       10
       10
       +
         options = let

     

       11
       11
       +
           mountType = {

     

       12
       12
       +
             options = {

     

       13
       13
       +
               hostPath = lib.mkOption {

     

       14
       14
       +
                 type = lib.types.str;

     

       15
       15
       +
                 description = "Host path.";

     

       16
       16
       +
               };

     

       17
       17
       +
               containerPath = lib.mkOption {

     

       18
       18
       +
                 type = lib.types.str;

     

       19
       19
       +
                 description = "Container path.";

     

       20
       20
       +
               };

     

       21
       21
       +
               mountOptions = lib.mkOption {

     

       22
       22
       +
                 default = [ "ro" "nosuid" "nodev" "bind" ];

     

       23
       23
       +
                 type = lib.types.listOf lib.types.str;

     

       24
       24
       +
                 description = "Mount options.";

     

       25
       25
       +
               };

     

       26
       26
       +
             };

     

       27
       27
       +
           };

     

       28
       28
       +
         in {

     

       29
       29
       +
       

     

       30
       30
       +
           hardware.nvidia-container-toolkit = {

     

       31
       31
       +
             enable = lib.mkOption {

     

       32
       32
       +
               default = false;

     

       33
       33
       +
               type = lib.types.bool;

     

       34
       34
       +
               description = ''

     

       35
       35
       +
                 Enable dynamic CDI configuration for NVidia devices by running

     

       36
       36
       +
                 nvidia-container-toolkit on boot.

     

       37
       37
       +
               '';

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
             mounts = lib.mkOption {

     

       41
       41
       +
               type = lib.types.listOf (lib.types.submodule mountType);

     

       42
       42
       +
               default = [];

     

       43
       43
       +
               description = "Mounts to be added to every container under the Nvidia CDI profile.";

     

       44
       44
       +
             };

     

       45
       45
       +
       

     

       46
       46
       +
             mount-nvidia-executables = lib.mkOption {

     

       47
       47
       +
               default = true;

     

       48
       48
       +
               type = lib.types.bool;

     

       49
       49
       +
               description = ''

     

       50
       50
       +
                 Mount executables nvidia-smi, nvidia-cuda-mps-control, nvidia-cuda-mps-server,

     

       51
       51
       +
                 nvidia-debugdump, nvidia-powerd and nvidia-ctk on containers.

     

       52
       52
       +
               '';

     

       53
       53
       +
             };

     

       54
       54
       +
       

     

       55
       55
       +
             mount-nvidia-docker-1-directories = lib.mkOption {

     

       56
       56
       +
               default = true;

     

       57
       57
       +
               type = lib.types.bool;

     

       58
       58
       +
               description = ''

     

       59
       59
       +
                 Mount nvidia-docker-1 directories on containers: /usr/local/nvidia/lib and

     

       60
       60
       +
                 /usr/local/nvidia/lib64.

     

       61
       61
       +
               '';

     

       62
       62
       +
             };

     

       63
       63
       +
           };

     

       64
       64
       +
       

     

       65
       65
       +
         };

     

       66
       66
       +
       

     

       67
       67
       +
         config = {

     

       68
       68
       +
       

     

       69
       69
       +
           hardware.nvidia-container-toolkit.mounts = let

     

       70
       70
       +
             nvidia-driver = config.hardware.nvidia.package;

     

       71
       71
       +
           in (lib.mkMerge [

     

       72
       72
       +
             [{ hostPath = pkgs.addDriverRunpath.driverLink;

     

       73
       73
       +
                containerPath = pkgs.addDriverRunpath.driverLink; }

     

       74
       74
       +
              { hostPath = "${lib.getLib pkgs.glibc}/lib";

     

       75
       75
       +
                containerPath = "${lib.getLib pkgs.glibc}/lib"; }

     

       76
       76
       +
              { hostPath = "${lib.getLib pkgs.glibc}/lib64";

     

       77
       77
       +
                containerPath = "${lib.getLib pkgs.glibc}/lib64"; }]

     

       78
       78
       +
             (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-executables

     

       79
       79
       +
               [{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control";

     

       80
       80
       +
                  containerPath = "/usr/bin/nvidia-cuda-mps-control"; }

     

       81
       81
       +
                { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server";

     

       82
       82
       +
                  containerPath = "/usr/bin/nvidia-cuda-mps-server"; }

     

       83
       83
       +
                { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump";

     

       84
       84
       +
                  containerPath = "/usr/bin/nvidia-debugdump"; }

     

       85
       85
       +
                { hostPath = lib.getExe' nvidia-driver "nvidia-powerd";

     

       86
       86
       +
                  containerPath = "/usr/bin/nvidia-powerd"; }

     

       87
       87
       +
                { hostPath = lib.getExe' nvidia-driver "nvidia-smi";

     

       88
       88
       +
                  containerPath = "/usr/bin/nvidia-smi"; }])

     

       89
       89
       +
             # nvidia-docker 1.0 uses /usr/local/nvidia/lib{,64}

     

       90
       90
       +
             #   e.g.

     

       91
       91
       +
             #     - https://gitlab.com/nvidia/container-images/cuda/-/blob/e3ff10eab3a1424fe394899df0e0f8ca5a410f0f/dist/12.3.1/ubi9/base/Dockerfile#L44

     

       92
       92
       +
             #     - https://github.com/NVIDIA/nvidia-docker/blob/01d2c9436620d7dde4672e414698afe6da4a282f/src/nvidia/volumes.go#L104-L173

     

       93
       93
       +
             (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-docker-1-directories

     

       94
       94
       +
               [{ hostPath = "${lib.getLib nvidia-driver}/lib";

     

       95
       95
       +
                  containerPath = "/usr/local/nvidia/lib"; }

     

       96
       96
       +
                { hostPath = "${lib.getLib nvidia-driver}/lib";

     

       97
       97
       +
                  containerPath = "/usr/local/nvidia/lib64"; }])

     

       98
       98
       +
           ]);

     

       99
       99
       +
       

     

       100
       100
       +
           systemd.services.nvidia-container-toolkit-cdi-generator = lib.mkIf config.hardware.nvidia-container-toolkit.enable {

     

       101
       101
       +
             description = "Container Device Interface (CDI) for Nvidia generator";

     

       102
       102
       +
             wantedBy = [ "multi-user.target" ];

     

       103
       103
       +
             after = [ "systemd-udev-settle.service" ];

     

       104
       104
       +
             serviceConfig = {

     

       105
       105
       +
               RuntimeDirectory = "cdi";

     

       106
       106
       +
               RemainAfterExit = true;

     

       107
       107
       +
               ExecStart =

     

       108
       108
       +
                 let

     

       109
       109
       +
                   script = pkgs.callPackage ./cdi-generate.nix {

     

       110
       110
       +
                     inherit (config.hardware.nvidia-container-toolkit) mounts;

     

       111
       111
       +
                     nvidia-driver = config.hardware.nvidia.package;

     

       112
       112
       +
                   };

     

       113
       113
       +
                 in

     

       114
       114
       +
                 lib.getExe script;

     

       115
       115
       +
               Type = "oneshot";

     

       116
       116
       +
             };

     

       117
       117
       +
           };

     

       118
       118
       +
       

     

       119
       119
       +
         };

     

       120
       120
       +
       

     

       121
       121
       +
       }

+2 -47

nixos/modules/virtualisation/containers.nix

···

       28
       28
        
             description = "Enable the OCI seccomp BPF hook";

     

       29
       29
        
           };

     

       30
       30
        
       

     

       31
       31
       -
           cdi = {

     

       32
       32
       -
             dynamic.nvidia.enable = mkOption {

     

       33
       33
       -
               type = types.bool;

     

       34
       34
       -
               default = false;

     

       35
       35
       -
               description = ''

     

       36
       36
       -
                 Enable dynamic CDI configuration for NVidia devices by running nvidia-container-toolkit on boot.

     

       37
       37
       -
               '';

     

       38
       38
       -
             };

     

       39
       39
       -
       

     

       40
       40
       -
             static = mkOption {

     

       41
       41
       -
               type = types.attrs;

     

       42
       42
       -
               default = { };

     

       43
       43
       -
               description = ''

     

       44
       44
       -
                 Declarative CDI specification. Each key of the attribute set

     

       45
       45
       -
                 will be mapped to a file in /etc/cdi. It is required for every

     

       46
       46
       -
                 key to be provided in JSON format.

     

       47
       47
       -
               '';

     

       48
       48
       -
               example = {

     

       49
       49
       -
                 some-vendor = builtins.fromJSON ''

     

       50
       50
       -
                     {

     

       51
       51
       -
                       "cdiVersion": "0.5.0",

     

       52
       52
       -
                       "kind": "some-vendor.com/foo",

     

       53
       53
       -
                       "devices": [],

     

       54
       54
       -
                       "containerEdits": []

     

       55
       55
       -
                     }

     

       56
       56
       -
                   '';

     

       57
       57
       -
       

     

       58
       58
       -
                 some-other-vendor = {

     

       59
       59
       -
                   cdiVersion = "0.5.0";

     

       60
       60
       -
                   kind = "some-other-vendor.com/bar";

     

       61
       61
       -
                   devices = [];

     

       62
       62
       -
                   containerEdits = [];

     

       63
       63
       -
                 };

     

       64
       64
       -
               };

     

       65
       65
       -
             };

     

       66
       66
       -
           };

     

       67
       67
       -
       

     

       68
       31
        
           containersConf.settings = mkOption {

     

       69
       32
        
             type = toml.type;

     

       70
       33
        
             default = { };

     
···

       150
       113
        
       

     

       151
       114
        
         config = lib.mkIf cfg.enable {

     

       152
       115
        
       

     

       153
       153
       -
           hardware.nvidia-container-toolkit-cdi-generator.enable = lib.mkIf cfg.cdi.dynamic.nvidia.enable true;

     

       154
       154
       -
       

     

       155
       116
        
           virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ];

     

       156
       117
        
       

     

       157
       118
        
           virtualisation.containers.containersConf.settings = {

     
···

       163
       124
        
             };

     

       164
       125
        
           };

     

       165
       126
        
       

     

       166
       166
       -
           environment.etc = let

     

       167
       167
       -
             cdiStaticConfigurationFiles = (lib.attrsets.mapAttrs'

     

       168
       168
       -
               (name: value:

     

       169
       169
       -
                 lib.attrsets.nameValuePair "cdi/${name}.json"

     

       170
       170
       -
                   { text = builtins.toJSON value; })

     

       171
       171
       -
               cfg.cdi.static);

     

       172
       172
       -
           in {

     

       127
       127
       +
           environment.etc = {

     

       173
       128
        
             "containers/containers.conf".source =

     

       174
       129
        
               toml.generate "containers.conf" cfg.containersConf.settings;

     

       175
       130
        
       

     
···

       183
       138
        
             "containers/policy.json".source =

     

       184
       139
        
               if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy)

     

       185
       140
        
               else "${pkgs.skopeo.policy}/default-policy.json";

     

       186
       186
       -
           } // cdiStaticConfigurationFiles;

     

       141
       141
       +
           };

     

       187
       142
        
       

     

       188
       143
        
         };

     

       189
       144

-2

pkgs/applications/audio/galaxy-buds-client/default.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , buildDotnetModule

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       -
       , autoPatchelfHook

     

       6
       5
        
       , fontconfig

     

       7
       6
        
       , xorg

     

       8
       7
        
       , libglvnd

     
···

       27
       26
        
         dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ];

     

       28
       27
        
       

     

       29
       28
        
         nativeBuildInputs = [

     

       30
       30
       -
           autoPatchelfHook

     

       31
       29
        
           copyDesktopItems

     

       32
       30
        
           graphicsmagick

     

       33
       31
        
         ];

+3 -3

pkgs/applications/backup/pika-backup/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "pika-backup";

     

       24
       24
       -
         version = "0.7.0";

     

       24
       24
       +
         version = "0.7.1";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitLab {

     

       27
       27
        
           domain = "gitlab.gnome.org";

     

       28
       28
        
           owner = "World";

     

       29
       29
        
           repo = "pika-backup";

     

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

     

       31
       31
       -
           hash = "sha256-WeFc/4TEIxw6uzLroJX1D/rEA419sghkjBt1nsPv2Ho=";

     

       31
       31
       +
           hash = "sha256-yxr98CJuu15TGiIXCBhU2bOgvct6jQ5xAraD9Z0sL2Q=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       35
       35
        
           inherit src;

     

       36
       36
        
           name = "${pname}-${version}";

     

       37
       37
       -
           hash = "sha256-fgPgUZxye9YUyX9/+hTye3cUypgRAegZMUTKfPxVH4s=";

     

       37
       37
       +
           hash = "sha256-ce8SdBvRdFp1BU9OPcByoJjCiSrAkQqtmfCeJ3B+Piw=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         patches = [

-2

pkgs/applications/blockchains/wasabibackend/default.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         buildDotnetModule,

     

       6
       6
        
         dotnetCorePackages,

     

       7
       7
       -
         autoPatchelfHook,

     

       8
       7
        
         zlib,

     

       9
       8
        
         openssl,

     

       10
       9
        
       }:

     
···

       25
       24
        
         dotnet-sdk = dotnetCorePackages.sdk_7_0;

     

       26
       25
        
         dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

     

       27
       26
        
       

     

       28
       28
       -
         nativeBuildInputs = [autoPatchelfHook];

     

       29
       27
        
         buildInputs = [stdenv.cc.cc.lib zlib];

     

       30
       28
        
       

     

       31
       29
        
         runtimeDeps = [openssl zlib];

+1 -3

pkgs/applications/misc/avalonia-ilspy/default.nix

···

       15
       15
        
       , makeDesktopItem

     

       16
       16
        
       , copyDesktopItems

     

       17
       17
        
       , icoutils

     

       18
       18
       -
       , autoPatchelfHook

     

       19
       18
        
       , bintools

     

       20
       19
        
       , fixDarwinDylibNames

     

       21
       20
        
       , autoSignDarwinBinariesHook

     
···

       40
       39
        
         nativeBuildInputs = [

     

       41
       40
        
           copyDesktopItems

     

       42
       41
        
           icoutils

     

       43
       43
       -
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]

     

       44
       44
       -
           ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]

     

       42
       42
       +
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]

     

       45
       43
        
           ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];

     

       46
       44
        
       

     

       47
       45
        
         buildInputs = [

pkgs/applications/misc/waybar/default.nix pkgs/by-name/wa/waybar/package.nix

+2 -1

pkgs/applications/misc/wmenu/default.nix

···

       9
       9
        
       , pango

     

       10
       10
        
       , wayland

     

       11
       11
        
       , wayland-protocols

     

       12
       12
       +
       , wayland-scanner

     

       12
       13
        
       , libxkbcommon

     

       13
       14
        
       , scdoc

     

       14
       15
        
       }:

     
···

       34
       35
        
           })

     

       35
       36
        
         ];

     

       36
       37
        
       

     

       37
       37
       -
         nativeBuildInputs = [ pkg-config meson ninja ];

     

       38
       38
       +
         nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ];

     

       38
       39
        
         buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ];

     

       39
       40
        
       

     

       40
       41
        
         meta = with lib; {

pkgs/applications/misc/wttrbar/default.nix pkgs/by-name/wt/wttrbar/package.nix

+3 -3

pkgs/applications/networking/cluster/kubecolor/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kubecolor";

     

       5
       5
       -
         version = "0.2.2";

     

       5
       5
       +
         version = "0.3.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-zXglsfPsJi9DVxlRPniSBsdF1xEMYqqGr46ThpQj3gQ=";

     

       11
       11
       +
           sha256 = "sha256-1gEEmF9RRMwFAvmhLwidkVh+lnibs6x5ZHy/nJRum9E=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-uf7nBnS1wmbz4xcVA5qF82QMPsLdSucje1NNaPyheCw=";

     

       14
       14
       +
         vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" "-X main.Version=${version}" ];

     

       17
       17

+2 -1

pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix

···

       120
       120
        
           libappindicator-gtk3

     

       121
       121
        
           libnotify

     

       122
       122
        
           libdbusmenu

     

       123
       123
       +
           pipewire

     

       124
       124
       +
           stdenv.cc.cc

     

       123
       125
        
           xdg-utils

     

       124
       126
        
           wayland

     

       125
       127
        
         ];

     
···

       158
       160
        
       

     

       159
       161
        
         preFixup = ''

     

       160
       162
        
           gappsWrapperArgs+=(

     

       161
       161
       -
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }"

     

       162
       163
        
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

     

       163
       164
        
             --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

     

       164
       165
        
           )

+8

pkgs/by-name/di/digikam/package.nix

···

       26
       26
        
       , x265

     

       27
       27
        
       , jasper

     

       28
       28
        
       

     

       29
       29
       +
       , bash

     

       29
       30
        
       # For panorama and focus stacking

     

       30
       31
        
       , enblend-enfuse

     

       31
       32
        
       , hugin

     
···

       109
       110
        
         ]) ++ lib.optionals cudaSupport (with cudaPackages; [

     

       110
       111
        
           cuda_cudart

     

       111
       112
        
         ]);

     

       113
       113
       +
       

     

       114
       114
       +
         postPatch = ''

     

       115
       115
       +
           substituteInPlace \

     

       116
       116
       +
             core/dplugins/bqm/custom/userscript/userscript.cpp \

     

       117
       117
       +
             core/utilities/import/backend/cameracontroller.cpp \

     

       118
       118
       +
             --replace-fail \"/bin/bash\" \"${lib.getExe bash}\"

     

       119
       119
       +
         '';

     

       112
       120
        
       

     

       113
       121
        
         cmakeFlags = [

     

       114
       122
        
           "-DENABLE_MYSQLSUPPORT=1"

+6 -5

pkgs/by-name/fi/firefly-iii/package.nix

···

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
         pname = "firefly-iii";

     

       11
       11
       -
         version = "6.1.13";

     

       11
       11
       +
         version = "6.1.15";

     

       12
       12
        
         phpPackage = php83;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "firefly-iii";

     

       16
       16
        
           repo = "firefly-iii";

     

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

     

       18
       18
       -
           hash = "sha256-85zI8uCyyoCflzxDkvba6FWa9B3kh179DJfQ2Um6MGM=";

     

       18
       18
       +
           hash = "sha256-9Od8tR8X2OZ2hu81tHWDpBX8snWCRvTnlY1AwjIcMug=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         assets = buildNpmPackage {

     

       22
       22
        
           pname = "${pname}-assets";

     

       23
       23
        
           inherit version src;

     

       24
       24
       -
           npmDepsHash = "sha256-wuPUE6XuzzgKjpxZVgwh2wGut15M61WSBFG+YIZwOFM=";

     

       24
       24
       +
           npmDepsHash = "sha256-UVySgcj1tQLQIxlsZuig4ixkfxfsYWYPKWLz5zHA+Dg=";

     

       25
       25
        
           dontNpmBuild = true;

     

       26
       26
        
           installPhase = ''

     

       27
       27
        
             runHook preInstall

     

       28
       28
       -
             npm run build

     

       28
       28
       +
             npm run prod --workspace=v1

     

       29
       29
       +
             npm run build --workspace=v2

     

       29
       30
        
             cp -r ./public $out/

     

       30
       31
        
             runHook postInstall

     

       31
       32
        
           '';

     
···

       35
       36
        
       phpPackage.buildComposerProject (finalAttrs: {

     

       36
       37
        
         inherit pname src version;

     

       37
       38
        
       

     

       38
       38
       -
         vendorHash = "sha256-CVGKyyLp5hjjpEulDNEYfljU4OgPBaFcYQQAUf6GeGs=";

     

       39
       39
       +
         vendorHash = "sha256-RDkAbTKj7M7lE8bVRxb+RR5CA6hJIMp61U0+aRtFE50=";

     

       39
       40
        
       

     

       40
       41
        
         passthru = {

     

       41
       42
        
           inherit phpPackage;

+2 -2

pkgs/by-name/fw/fwupd/package.nix

···

       120
       120
        
       in

     

       121
       121
        
       stdenv.mkDerivation (finalAttrs: {

     

       122
       122
        
         pname = "fwupd";

     

       123
       123
       -
         version = "1.9.16";

     

       123
       123
       +
         version = "1.9.18";

     

       124
       124
        
       

     

       125
       125
        
         # libfwupd goes to lib

     

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

     
···

       131
       131
        
           owner = "fwupd";

     

       132
       132
        
           repo = "fwupd";

     

       133
       133
        
           rev = finalAttrs.version;

     

       134
       134
       -
           hash = "sha256-mM8HSSQD5znjpl9q/f+u0RzZEkFA1tnh+BPB2qdcWvI=";

     

       134
       134
       +
           hash = "sha256-w2jqIPNV6OkPaHfy7bEFgr5IgzJYtMTrO5UWmnZ+2JI=";

     

       135
       135
        
         };

     

       136
       136
        
       

     

       137
       137
        
         patches = [

+17 -14

pkgs/by-name/li/live555/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , darwin

     

       3
       3
       -
       , fetchurl

     

       4
       4
       -
       , fetchpatch

     

       5
       5
       -
       , openssl

     

       6
       6
       -
       , stdenv

     

       7
       7
       -
       , vlc

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         darwin,

     

       4
       4
       +
         fetchpatch,

     

       5
       5
       +
         fetchurl,

     

       6
       6
       +
         openssl,

     

       7
       7
       +
         stdenv,

     

       8
       8
       +
         vlc,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
       12
        
         pname = "live555";

     

       12
       12
       -
         version = "2024.03.08";

     

       13
       13
       +
         version = "2024.04.14";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchurl {

     

       15
       16
        
           urls = [

     
···

       18
       19
        
             "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"

     

       19
       20
        
             "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"

     

       20
       21
        
           ];

     

       21
       21
       -
           hash = "sha256-wWUC4EbxxfK+OxXiyNbNMGObVMZOqb+8jTG078pnDeU=";

     

       22
       22
       +
           hash = "sha256-mR5rKGKtTwMq3p+xAAGdo0DNNnIe4KHladLPlnhVhNY=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       25
        
         patches = [

     
···

       60
       61
        
         '';

     

       61
       62
        
       

     

       62
       63
        
         configurePhase = let

     

       63
       63
       -
           platform = if stdenv.isLinux

     

       64
       64
       -
                      then "linux"

     

       65
       65
       -
                      else if stdenv.isDarwin

     

       66
       66
       -
                      then "macosx-catalina"

     

       67
       67
       -
                      else throw "Unsupported platform: ${stdenv.hostPlatform.system}";

     

       64
       64
       +
           platform =

     

       65
       65
       +
             if stdenv.isLinux then

     

       66
       66
       +
               "linux"

     

       67
       67
       +
             else if stdenv.isDarwin then

     

       68
       68
       +
               "macosx-catalina"

     

       69
       69
       +
             else

     

       70
       70
       +
               throw "Unsupported platform: ${stdenv.hostPlatform.system}";

     

       68
       71
        
         in ''

     

       69
       72
        
           runHook preConfigure

     

       70
       73

+3 -3

pkgs/by-name/ma/maa-cli/package.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage rec {

     

       15
       15
        
         pname = "maa-cli";

     

       16
       16
       -
         version = "0.4.5";

     

       16
       16
       +
         version = "0.4.6";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "MaaAssistantArknights";

     

       20
       20
        
           repo = "maa-cli";

     

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

     

       22
       22
       -
           hash = "sha256-LeEIbfDQ+GO3gNmdpWGTNkpbhSqLz4fYQ+MdcrcbDk0=";

     

       22
       22
       +
           hash = "sha256-fvMSYcYWYEVvDuAEjSmQJltl90EoLKkjYD2P3OsHS3c=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

     
···

       36
       36
        
         buildNoDefaultFeatures = true;

     

       37
       37
        
         buildFeatures = [ "git2" "core_installer" ];

     

       38
       38
        
       

     

       39
       39
       -
         cargoHash = "sha256-tkUJH7oFY5eZ5A7J+qzeyHlqOUnTipf6o+leZz7KOiQ=";

     

       39
       39
       +
         cargoHash = "sha256-LQWjgMRxtSs2MX1R6YsxDAWUvoUJfOWmp/zj/hlTxyw=";

     

       40
       40
        
       

     

       41
       41
        
         # maa-cli would only seach libMaaCore.so and resources in itself's path

     

       42
       42
        
         # https://github.com/MaaAssistantArknights/maa-cli/issues/67

+2 -2

pkgs/by-name/na/nawk/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "nawk";

     

       11
       11
       -
         version = "20240311";

     

       11
       11
       +
         version = "20240422";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "onetrueawk";

     

       15
       15
        
           repo = "awk";

     

       16
       16
        
           rev = finalAttrs.version;

     

       17
       17
       -
           hash = "sha256-4iAQR8djhhp5Yn4H1IdzotQLY0d/Gz/vNQPfAUNQV0A=";

     

       17
       17
       +
           hash = "sha256-wsRkSXCLtK2jk4gW/Lpg/14NiOUANfmCrYqeKZW6CLY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

+2 -2

pkgs/by-name/pg/pgmoneta/package.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "pgmoneta";

     

       22
       22
       -
         version = "0.10.1";

     

       22
       22
       +
         version = "0.11.0";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "pgmoneta";

     

       26
       26
        
           repo = "pgmoneta";

     

       27
       27
        
           rev = version;

     

       28
       28
       -
           hash = "sha256-gViXbL54YGY2NFg0ScyiarMB4vYjpOrdkyTjWzwP2vo=";

     

       28
       28
       +
           hash = "sha256-sFH8sYTQ10bR+TDNbyIJiAIcp24CA9E5zrRjyV9mGBU=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/si/simplotask/package.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "simplotask";

     

       5
       5
       -
         version = "1.15.0";

     

       5
       5
       +
         version = "1.15.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "umputun";

     

       9
       9
        
           repo = "spot";

     

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

     

       11
       11
       -
           hash = "sha256-pd6bue/uo6+ZBaN7ZKf/byuPOKOLZdCQau7I7F+iZb0=";

     

       11
       11
       +
           hash = "sha256-XLkq8Oe3EsP0wf0sA7NSZWIsQQnOAGmvlVQad35+5Ws=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = null;

+27 -8

pkgs/by-name/we/wechat-uos/package.nix

···

       60
       60
        
             └── uos

     

       61
       61
        
                 └── .license.key

     

       62
       62
        
         */

     

       63
       63
       -
         uosLicense ? requireFile {

     

       64
       64
       -
           name = "license.tar.gz";

     

       65
       65
       -
           url = "https://www.uniontech.com";

     

       66
       66
       -
           sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69";

     

       67
       67
       -
         }

     

       63
       63
       +
         uosLicense ? null

     

       68
       64
        
       }:

     

       69
       65
        
       let

     

       70
       66
        
         wechat-uos-env = stdenvNoCC.mkDerivation {

     
···

       85
       81
        
             ln -s ${wechat}/usr/lib/wechat-uos/license/libuosdevicea.so $out/lib/license/

     

       86
       82
        
           '';

     

       87
       83
        
           preferLocalBuild = true;

     

       84
       84
       +
         };

     

       85
       85
       +
       

     

       86
       86
       +
         uosLicenseUnzipped = stdenvNoCC.mkDerivation {

     

       87
       87
       +
           name = "uos-license-unzipped";

     

       88
       88
       +
           src =

     

       89
       89
       +
             if uosLicense == null then

     

       90
       90
       +
               requireFile

     

       91
       91
       +
                 {

     

       92
       92
       +
                   name = "license.tar.gz";

     

       93
       93
       +
                   url = "https://www.uniontech.com";

     

       94
       94
       +
                   sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69";

     

       95
       95
       +
                 } else uosLicense;

     

       96
       96
       +
       

     

       97
       97
       +
           installPhase = ''

     

       98
       98
       +
             runHook preInstall

     

       99
       99
       +
       

     

       100
       100
       +
             mkdir -p $out

     

       101
       101
       +
             cp -r * $out/

     

       102
       102
       +
       

     

       103
       103
       +
             runHook postInstall

     

       104
       104
       +
           '';

     

       105
       105
       +
           outputHashAlgo = "sha256";

     

       106
       106
       +
           outputHashMode = "recursive";

     

       107
       107
       +
           outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME=";

     

       88
       108
        
         };

     

       89
       109
        
       

     

       90
       110
        
         wechat-uos-runtime = with xorg; [

     
···

       195
       215
        
               dpkg -x $src ./wechat-uos

     

       196
       216
        
               dpkg -x $uosSrc ./wechat-uos-old-source

     

       197
       217
        
       

     

       198
       198
       -
               tar -xvf $uosLicense

     

       199
       199
       -
       

     

       200
       218
        
               runHook postUnpack

     

       201
       219
        
             '';

     

       202
       220
        
       

     

       221
       221
       +
             # Use ln for license to prevent being garbage collection

     

       203
       222
        
             installPhase = ''

     

       204
       223
        
               runHook preInstall

     

       205
       224
        
               mkdir -p $out

     
···

       207
       226
        
               cp -r wechat-uos/* $out

     

       208
       227
        
       

     

       209
       228
        
               mkdir -pv $out/usr/lib/wechat-uos/license

     

       210
       210
       -
               cp -r license/* $out/usr/lib/wechat-uos/license

     

       229
       229
       +
               ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/

     

       211
       230
        
               cp -r wechat-uos-old-source/usr/lib/license/libuosdevicea.so $out/usr/lib/wechat-uos/license/

     

       212
       231
        
       

     

       213
       232
        
               runHook postInstall

+2 -2

pkgs/by-name/wo/workout-tracker/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "workout-tracker";

     

       11
       11
       -
         version = "0.13.4";

     

       11
       11
       +
         version = "0.14.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "jovandeginste";

     

       15
       15
        
           repo = "workout-tracker";

     

       16
       16
        
           rev = "refs/tags/v${version}";

     

       17
       17
       -
           hash = "sha256-wBDLf4UfE3YXH2naub9Z//z5HWaTBuz6MyCQovZcsFI=";

     

       17
       17
       +
           hash = "sha256-zmDY5KpKkq/9SYAm+v0QSnLLjxYQCzzXWLlCFkE8bA0=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         vendorHash = null;

+2 -2

pkgs/by-name/yo/youtrack/package.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       4
       4
        
         pname = "youtrack";

     

       5
       5
       -
         version = "2024.1.27971";

     

       5
       5
       +
         version = "2024.1.28928";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";

     

       9
       9
       -
           hash = "sha256-DropdHT3ZA4kuxyE8xyHB079OMzYH4zKPt38oW7XoFY=";

     

       9
       9
       +
           hash = "sha256-8+dZ1YTpvOX0IEEbFzv4t8T/U/BZMeDCZL7Ju25WBpE=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/data/fonts/sketchybar-app-font/default.nix pkgs/by-name/sk/sketchybar-app-font/package.nix

pkgs/data/themes/catppuccin-sddm-corners/default.nix pkgs/by-name/ca/catppuccin-sddm-corners/package.nix

pkgs/data/themes/catppuccin/default.nix pkgs/by-name/ca/catppuccin/package.nix

+1 -1

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

···

       19
       19
        
         mixFodDeps = fetchMixDeps {

     

       20
       20
        
           pname = "mix-deps-${pname}";

     

       21
       21
        
           inherit src version elixir;

     

       22
       22
       -
           hash = "sha256-ZNHhWCZ3n2Y/XCsXVjbu4wbx/J95JdFP/2raACciAUU=";

     

       22
       22
       +
           hash = "sha256-e0lU4TXLY2geO6MI1h0kpdwsGbEyXjIRe0W43337mHk=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         configurePhase = ''

+7 -4

pkgs/development/compilers/dotnet/build-dotnet.nix

···

       25
       25
        
       , writeShellScript

     

       26
       26
        
       , mkNugetDeps

     

       27
       27
        
       , callPackage

     

       28
       28
       +
       , dotnetCorePackages

     

       28
       29
        
       }:

     

       29
       30
        
       

     

       30
       31
        
       let

     
···

       43
       44
        
         };

     

       44
       45
        
       

     

       45
       46
        
         mkCommon = callPackage ./common.nix {};

     

       47
       47
       +
       

     

       48
       48
       +
         targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system;

     

       46
       49
        
       

     

       47
       50
        
       in

     

       48
       51
        
       mkCommon type rec {

     
···

       88
       91
        
       

     

       89
       92
        
         # Tell autoPatchelf about runtime dependencies.

     

       90
       93
        
         # (postFixup phase is run before autoPatchelfHook.)

     

       91
       91
       -
         postFixup = lib.optionalString stdenv.isLinux ''

     

       94
       94
       +
         postFixup = lib.optionalString stdenv.targetPlatform.isLinux ''

     

       92
       95
        
           patchelf \

     

       93
       96
        
             --add-needed libicui18n.so \

     

       94
       97
        
             --add-needed libicuuc.so \

     

       95
       98
        
             $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \

     

       96
       99
        
             $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \

     

       97
       97
       -
             $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost

     

       100
       100
       +
             $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host

     

       98
       101
        
           patchelf \

     

       99
       102
        
             --add-needed libgssapi_krb5.so \

     

       100
       103
        
             $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \

     

       101
       101
       -
             $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost

     

       104
       104
       +
             $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host

     

       102
       105
        
           patchelf \

     

       103
       106
        
             --add-needed libssl.so \

     

       104
       107
        
             $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \

     

       105
       105
       -
             $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost

     

       108
       108
       +
             $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host

     

       106
       109
        
         '';

     

       107
       110
        
       

     

       108
       111
        
         passthru = {

+13 -2

pkgs/development/compilers/dotnet/common.nix

···

       63
       63
        
                 '' + build);

     

       64
       64
        
               in

     

       65
       65
        
                 if run == null

     

       66
       66
       -
                   then build

     

       66
       66
       +
                   then built

     

       67
       67
        
                 else

     

       68
       68
        
                   runCommand "${built.name}-run" { src = built; nativeBuildInputs = runInputs; } (

     

       69
       69
        
                     lib.optionalString (runtime != null) ''

     
···

       71
       71
        
                       export DOTNET_ROOT=${runtime}

     

       72
       72
        
                     '' + run);

     

       73
       73
        
       

     

       74
       74
       +
             # Setting LANG to something other than 'C' forces the runtime to search

     

       75
       75
       +
             # for ICU, which will be required in most user environments.

     

       74
       76
        
             checkConsoleOutput = command: ''

     

       75
       75
       -
               output="$(${command})"

     

       77
       77
       +
               output="$(LANG=C.UTF-8 ${command})"

     

       76
       78
        
               # yes, older SDKs omit the comma

     

       77
       79
        
               [[ "$output" =~ Hello,?\ World! ]] && touch "$out"

     

       78
       80
        
             '';

     
···

       95
       97
        
               name = "publish";

     

       96
       98
        
               template = "console";

     

       97
       99
        
               build = "dotnet publish -o $out";

     

       100
       100
       +
               run = checkConsoleOutput "$src/test";

     

       101
       101
       +
             };

     

       102
       102
       +
       

     

       103
       103
       +
             self-contained = mkDotnetTest {

     

       104
       104
       +
               name = "self-contained";

     

       105
       105
       +
               template = "console";

     

       106
       106
       +
               usePackageSource = true;

     

       107
       107
       +
               build = "dotnet publish --use-current-runtime --sc -o $out";

     

       108
       108
       +
               runtime = null;

     

       98
       109
        
               run = checkConsoleOutput "$src/test";

     

       99
       110
        
             };

     

       100
       111

-2

pkgs/development/compilers/inklecate/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       -
       , autoPatchelfHook

     

       4
       3
        
       , buildDotnetModule

     

       5
       4
        
       , dotnetCorePackages

     

       6
       5
        
       , fetchFromGitHub

     
···

       17
       16
        
           hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";

     

       18
       17
        
         };

     

       19
       18
        
       

     

       20
       20
       -
         nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       21
       19
        
         buildInputs = [ stdenv.cc.cc.lib ];

     

       22
       20
        
       

     

       23
       21
        
         projectFile = "inklecate/inklecate.csproj";

+19 -3

pkgs/development/compilers/openjdk/openjfx/11.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake

     

       2
       2
       -
       , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68

     

       2
       2
       +
       , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand

     

       3
       3
        
       , openjdk11-bootstrap

     

       4
       4
        
       , withMedia ? true

     

       5
       5
        
       , withWebKit ? false

     
···

       14
       14
        
           java = openjdk11-bootstrap;

     

       15
       15
        
         });

     

       16
       16
        
       

     

       17
       17
       +
         icuVersionWithSep = s: "71${s}1";

     

       18
       18
       +
         icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip";

     

       19
       19
       +
         icuData = fetchurl {

     

       20
       20
       +
           url = "https://github.com/unicode-org/icu/releases/${icuPath}";

     

       21
       21
       +
           hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=";

     

       22
       22
       +
         };

     

       23
       23
       +
         icuFakeRepository = runCommand "icu-data-repository" {} ''

     

       24
       24
       +
           install -Dm644 ${icuData} $out/${icuPath}

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       17
       27
        
         makePackage = args: stdenv.mkDerivation ({

     

       18
       28
        
           version = "${major}${update}-${build}";

     

       19
       29
        
       

     
···

       24
       34
        
             sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko=";

     

       25
       35
        
           };

     

       26
       36
        
       

     

       27
       27
       -
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ];

     

       37
       37
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];

     

       28
       38
        
           nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

     

       29
       39
        
       

     

       30
       40
        
           dontUseCmakeConfigure = true;

     
···

       32
       42
        
           postPatch = ''

     

       33
       43
        
             substituteInPlace buildSrc/linux.gradle \

     

       34
       44
        
               --replace ', "-Werror=implicit-function-declaration"' ""

     

       45
       45
       +
       

     

       46
       46
       +
             # Add missing includes for gcc-13 for webkit build:

     

       47
       47
       +
             sed -e '1i #include <cstdio>' \

     

       48
       48
       +
               -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \

     

       49
       49
       +
                  modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h

     

       35
       50
        
           '';

     

       36
       51
        
       

     

       37
       52
        
           config = writeText "gradle.properties" (''

     
···

       46
       61
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       47
       62
        
             ln -s $config gradle.properties

     

       48
       63
        
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       49
       49
       -
             gradle --no-daemon $gradleFlags sdk

     

       64
       64
       +
             gradle --no-daemon --console=plain $gradleFlags sdk

     

       50
       65
        
       

     

       51
       66
        
             runHook postBuild

     

       52
       67
        
           '';

     
···

       77
       92
        
         gradleProperties = ''

     

       78
       93
        
           COMPILE_MEDIA = ${lib.boolToString withMedia}

     

       79
       94
        
           COMPILE_WEBKIT = ${lib.boolToString withWebKit}

     

       95
       95
       +
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"}

     

       80
       96
        
         '';

     

       81
       97
        
       

     

       82
       98
        
         preBuild = ''

+10 -12

pkgs/development/compilers/openjdk/openjfx/17.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7

     

       2
       2
        
       , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib

     

       3
       3
       -
       , ffmpeg_4-headless, python3, ruby, icu71, fetchurl, runCommand

     

       3
       3
       +
       , ffmpeg_4-headless, python3, ruby, fetchurl, runCommand

     

       4
       4
        
       , withMedia ? true

     

       5
       5
        
       , withWebKit ? false

     

       6
       6
        
       }:

     
···

       14
       14
        
           java = openjdk17_headless;

     

       15
       15
        
         });

     

       16
       16
        
       

     

       17
       17
       -
         dashed-icu-version = lib.concatStringsSep "-" (lib.splitVersion (lib.getVersion icu71));

     

       18
       18
       -
         underscored-icu-version = lib.concatStringsSep "_" (lib.splitVersion (lib.getVersion icu71));

     

       19
       19
       -
         icu-data = fetchurl {

     

       20
       20
       -
           url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip";

     

       17
       17
       +
         icuVersionWithSep = s: "71${s}1";

     

       18
       18
       +
         icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip";

     

       19
       19
       +
         icuData = fetchurl {

     

       20
       20
       +
           url = "https://github.com/unicode-org/icu/releases/${icuPath}";

     

       21
       21
        
           hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=";

     

       22
       22
        
         };

     

       23
       23
       -
       

     

       24
       24
       -
         fakeRepository = runCommand "icu-data-repository" {} ''

     

       25
       25
       -
           mkdir -p $out/download/release-${dashed-icu-version}

     

       26
       26
       -
           cp ${icu-data} $out/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip

     

       23
       23
       +
         icuFakeRepository = runCommand "icu-data-repository" {} ''

     

       24
       24
       +
           install -Dm644 ${icuData} $out/${icuPath}

     

       27
       25
        
         '';

     

       28
       26
        
       

     

       29
       27
        
         makePackage = args: stdenv.mkDerivation ({

     
···

       36
       34
        
             sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw=";

     

       37
       35
        
           };

     

       38
       36
        
       

     

       39
       39
       -
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu71 ];

     

       37
       37
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];

     

       40
       38
        
           nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

     

       41
       39
        
       

     

       42
       40
        
           dontUseCmakeConfigure = true;

     
···

       60
       58
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       61
       59
        
             ln -s $config gradle.properties

     

       62
       60
        
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       63
       63
       -
             gradle --no-daemon $gradleFlags sdk

     

       61
       61
       +
             gradle --no-daemon --console=plain $gradleFlags sdk

     

       64
       62
        
       

     

       65
       63
        
             runHook postBuild

     

       66
       64
        
           '';

     
···

       91
       89
        
         gradleProperties = ''

     

       92
       90
        
           COMPILE_MEDIA = ${lib.boolToString withMedia}

     

       93
       91
        
           COMPILE_WEBKIT = ${lib.boolToString withWebKit}

     

       94
       94
       -
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${fakeRepository}"}

     

       92
       92
       +
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"}

     

       95
       93
        
         '';

     

       96
       94
        
       

     

       97
       95
        
         preBuild = ''

+21 -3

pkgs/development/compilers/openjdk/openjfx/19.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless

     

       2
       2
        
       , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst

     

       3
       3
       -
       , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68

     

       3
       3
       +
       , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand

     

       4
       4
        
       , withMedia ? true

     

       5
       5
        
       , withWebKit ? false

     

       6
       6
        
       }:

     
···

       14
       14
        
           # note: gradle does not yet support running on 19

     

       15
       15
        
           java = openjdk17_headless;

     

       16
       16
        
         });

     

       17
       17
       +
       

     

       18
       18
       +
         icuVersionWithSep = s: "68${s}2";

     

       19
       19
       +
         icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "."}-data-bin-l.zip";

     

       20
       20
       +
         icuData = fetchurl {

     

       21
       21
       +
           url = "https://github.com/unicode-org/icu/releases/${icuPath}";

     

       22
       22
       +
           hash = "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw=";

     

       23
       23
       +
         };

     

       24
       24
       +
         icuFakeRepository = runCommand "icu-data-repository" {} ''

     

       25
       25
       +
           install -Dm644 ${icuData} $out/${icuPath}

     

       26
       26
       +
         '';

     

       17
       27
        
       

     

       18
       28
        
         makePackage = args: stdenv.mkDerivation ({

     

       19
       29
        
           version = "${major}${update}${build}";

     
···

       38
       48
        
             })

     

       39
       49
        
           ];

     

       40
       50
        
       

     

       41
       41
       -
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];

     

       51
       51
       +
           postPatch = ''

     

       52
       52
       +
             # Add missing includes for gcc-13 for webkit build:

     

       53
       53
       +
             sed -e '1i #include <cstdio>' \

     

       54
       54
       +
               -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \

     

       55
       55
       +
                  modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h

     

       56
       56
       +
           '';

     

       57
       57
       +
       

     

       58
       58
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];

     

       42
       59
        
           nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

     

       43
       60
        
       

     

       44
       61
        
           dontUseCmakeConfigure = true;

     
···

       55
       72
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       56
       73
        
             ln -s $config gradle.properties

     

       57
       74
        
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       58
       58
       -
             gradle --no-daemon $gradleFlags sdk

     

       75
       75
       +
             gradle --no-daemon --console=plain $gradleFlags sdk

     

       59
       76
        
       

     

       60
       77
        
             runHook postBuild

     

       61
       78
        
           '';

     
···

       89
       106
        
         gradleProperties = ''

     

       90
       107
        
           COMPILE_MEDIA = ${lib.boolToString withMedia}

     

       91
       108
        
           COMPILE_WEBKIT = ${lib.boolToString withWebKit}

     

       109
       109
       +
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"}

     

       92
       110
        
         '';

     

       93
       111
        
       

     

       94
       112
        
         preBuild = ''

+21 -3

pkgs/development/compilers/openjdk/openjfx/20.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless

     

       2
       2
        
       , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst

     

       3
       3
       -
       , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68

     

       3
       3
       +
       , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand

     

       4
       4
        
       , withMedia ? true

     

       5
       5
        
       , withWebKit ? false

     

       6
       6
        
       }:

     
···

       14
       14
        
           # note: gradle does not yet support running on 19

     

       15
       15
        
           java = openjdk17_headless;

     

       16
       16
        
         });

     

       17
       17
       +
       

     

       18
       18
       +
         icuVersionWithSep = s: "71${s}1";

     

       19
       19
       +
         icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip";

     

       20
       20
       +
         icuData = fetchurl {

     

       21
       21
       +
           url = "https://github.com/unicode-org/icu/releases/${icuPath}";

     

       22
       22
       +
           hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=";

     

       23
       23
       +
         };

     

       24
       24
       +
         icuFakeRepository = runCommand "icu-data-repository" {} ''

     

       25
       25
       +
           install -Dm644 ${icuData} $out/${icuPath}

     

       26
       26
       +
         '';

     

       17
       27
        
       

     

       18
       28
        
         makePackage = args: stdenv.mkDerivation ({

     

       19
       29
        
           version = "${major}${update}${build}";

     
···

       25
       35
        
             hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU=";

     

       26
       36
        
           };

     

       27
       37
        
       

     

       28
       28
       -
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];

     

       38
       38
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];

     

       29
       39
        
           nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

     

       30
       40
        
       

     

       31
       41
        
           dontUseCmakeConfigure = true;

     

       42
       42
       +
       

     

       43
       43
       +
           postPatch = ''

     

       44
       44
       +
             # Add missing includes for gcc-13 for webkit build:

     

       45
       45
       +
             sed -e '1i #include <cstdio>' \

     

       46
       46
       +
               -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \

     

       47
       47
       +
                  modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h

     

       48
       48
       +
           '';

     

       32
       49
        
       

     

       33
       50
        
           config = writeText "gradle.properties" (''

     

       34
       51
        
             CONF = Release

     
···

       42
       59
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       43
       60
        
             ln -s $config gradle.properties

     

       44
       61
        
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       45
       45
       -
             gradle --no-daemon $gradleFlags sdk

     

       62
       62
       +
             gradle --no-daemon --console=plain $gradleFlags sdk

     

       46
       63
        
       

     

       47
       64
        
             runHook postBuild

     

       48
       65
        
           '';

     
···

       76
       93
        
         gradleProperties = ''

     

       77
       94
        
           COMPILE_MEDIA = ${lib.boolToString withMedia}

     

       78
       95
        
           COMPILE_WEBKIT = ${lib.boolToString withWebKit}

     

       96
       96
       +
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"}

     

       79
       97
        
         '';

     

       80
       98
        
       

     

       81
       99
        
         preBuild = ''

+21 -3

pkgs/development/compilers/openjdk/openjfx/21.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless

     

       2
       2
        
       , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst

     

       3
       3
       -
       , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68

     

       3
       3
       +
       , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand

     

       4
       4
        
       , withMedia ? true

     

       5
       5
        
       , withWebKit ? false

     

       6
       6
        
       }:

     
···

       14
       14
        
           # note: gradle does not yet support running on 19

     

       15
       15
        
           java = openjdk17_headless;

     

       16
       16
        
         });

     

       17
       17
       +
       

     

       18
       18
       +
         icuVersionWithSep = s: "73${s}1";

     

       19
       19
       +
         icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip";

     

       20
       20
       +
         icuData = fetchurl {

     

       21
       21
       +
           url = "https://github.com/unicode-org/icu/releases/${icuPath}";

     

       22
       22
       +
           hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=";

     

       23
       23
       +
         };

     

       24
       24
       +
         icuFakeRepository = runCommand "icu-data-repository" {} ''

     

       25
       25
       +
           install -Dm644 ${icuData} $out/${icuPath}

     

       26
       26
       +
         '';

     

       17
       27
        
       

     

       18
       28
        
         makePackage = args: stdenv.mkDerivation ({

     

       19
       29
        
           version = "${major}${update}${build}";

     
···

       25
       35
        
             hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s=";

     

       26
       36
        
           };

     

       27
       37
        
       

     

       28
       28
       -
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];

     

       38
       38
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];

     

       29
       39
        
           nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

     

       30
       40
        
       

     

       31
       41
        
           dontUseCmakeConfigure = true;

     

       42
       42
       +
       

     

       43
       43
       +
           postPatch = ''

     

       44
       44
       +
             # Add missing includes for gcc-13 for webkit build:

     

       45
       45
       +
             sed -e '1i #include <cstdio>' \

     

       46
       46
       +
               -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \

     

       47
       47
       +
                  modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h

     

       48
       48
       +
           '';

     

       32
       49
        
       

     

       33
       50
        
           config = writeText "gradle.properties" (''

     

       34
       51
        
             CONF = Release

     
···

       42
       59
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       43
       60
        
             ln -s $config gradle.properties

     

       44
       61
        
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       45
       45
       -
             gradle --no-daemon $gradleFlags sdk

     

       62
       62
       +
             gradle --no-daemon --console=plain $gradleFlags sdk

     

       46
       63
        
       

     

       47
       64
        
             runHook postBuild

     

       48
       65
        
           '';

     
···

       76
       93
        
         gradleProperties = ''

     

       77
       94
        
           COMPILE_MEDIA = ${lib.boolToString withMedia}

     

       78
       95
        
           COMPILE_WEBKIT = ${lib.boolToString withWebKit}

     

       96
       96
       +
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"}

     

       79
       97
        
         '';

     

       80
       98
        
       

     

       81
       99
        
         preBuild = ''

+15 -3

pkgs/development/compilers/openjdk/openjfx/22.nix

···

       2
       2
        
       , lib

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , fetchpatch

     

       5
       5
       +
       , fetchurl

     

       6
       6
       +
       , runCommand

     

       5
       7
        
       , writeText

     

       6
       8
        
       , openjdk21_headless

     

       7
       9
        
       , gradle

     
···

       18
       20
        
       , ffmpeg_4

     

       19
       21
        
       , python3

     

       20
       22
        
       , ruby

     

       21
       21
       -
       , icu68

     

       22
       23
        
       , withMedia ? true

     

       23
       24
        
       , withWebKit ? false

     

       24
       25
        
       }:

     
···

       29
       30
        
         build = "+30";

     

       30
       31
        
         repover = "${major}${update}${build}";

     

       31
       32
        
       

     

       33
       33
       +
         icuVersionWithSep = s: "73${s}1";

     

       34
       34
       +
         icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip";

     

       35
       35
       +
         icuData = fetchurl {

     

       36
       36
       +
           url = "https://github.com/unicode-org/icu/releases/${icuPath}";

     

       37
       37
       +
           hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=";

     

       38
       38
       +
         };

     

       39
       39
       +
         icuFakeRepository = runCommand "icu-data-repository" {} ''

     

       40
       40
       +
           install -Dm644 ${icuData} $out/${icuPath}

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       32
       43
        
         makePackage = args: stdenv.mkDerivation ({

     

       33
       44
        
           version = "${major}${update}${build}";

     

       34
       45
        
       

     
···

       39
       50
        
             hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ=";

     

       40
       51
        
           };

     

       41
       52
        
       

     

       42
       42
       -
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];

     

       53
       53
       +
           buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];

     

       43
       54
        
           nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];

     

       44
       55
        
       

     

       45
       56
        
           dontUseCmakeConfigure = true;

     
···

       56
       67
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       57
       68
        
             ln -s $config gradle.properties

     

       58
       69
        
             export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"

     

       59
       59
       -
             gradle --no-daemon $gradleFlags sdk

     

       70
       70
       +
             gradle --no-daemon --console=plain $gradleFlags sdk

     

       60
       71
        
       

     

       61
       72
        
             runHook postBuild

     

       62
       73
        
           '';

     
···

       88
       99
        
         gradleProperties = ''

     

       89
       100
        
           COMPILE_MEDIA = ${lib.boolToString withMedia}

     

       90
       101
        
           COMPILE_WEBKIT = ${lib.boolToString withWebKit}

     

       102
       102
       +
           ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"}

     

       91
       103
        
         '';

     

       92
       104
        
       

     

       93
       105
        
         preBuild = ''

-6

pkgs/development/interpreters/erlang/27-rc2.nix

···

       1
       1
       -
       { mkDerivation }:

     

       2
       2
       -
       

     

       3
       3
       -
       mkDerivation {

     

       4
       4
       -
         version = "27.0-rc2";

     

       5
       5
       -
         sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0=";

     

       6
       6
       -
       }

+6

pkgs/development/interpreters/erlang/27-rc3.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       

     

       3
       3
       +
       mkDerivation {

     

       4
       4
       +
         version = "27.0-rc3";

     

       5
       5
       +
         sha256 = "sha256-c2DTIqBd7UxpSv84F1cCB9K+MkJb5OwnWSghtewnw/4=";

     

       6
       6
       +
       }

+2 -2

pkgs/development/interpreters/wamr/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation (finalAttrs: {

     

       8
       8
        
         pname = "wamr";

     

       9
       9
       -
         version = "1.3.2";

     

       9
       9
       +
         version = "2.0.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "bytecodealliance";

     

       13
       13
        
           repo = "wasm-micro-runtime";

     

       14
       14
        
           rev = "WAMR-${finalAttrs.version}";

     

       15
       15
       -
           hash = "sha256-4iH1PC0fEPehlez8YWgqPBxWnePFcMBzbGfd2CQjvd4=";

     

       15
       15
       +
           hash = "sha256-7k7FRe1mBH/+r9M19pYGAHX5rt54AomeWDBW4lwCfu4=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake ];

+3 -4

pkgs/development/interpreters/wasmtime/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "wasmtime";

     

       5
       5
       -
         version = "19.0.2";

     

       5
       5
       +
         version = "20.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bytecodealliance";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-t+2bkJ1SFN7Bi1Mj74CKGhnL2vWpruQKf8lYJWLOqB8=";

     

       11
       11
       +
           hash = "sha256-Q2CsIwYQsLnAlGyMRxNTxjZsezxhjSptBF540NtgkCc=";

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.

     

       16
       16
        
         auditable = false;

     

       17
       17
       -
         cargoHash = "sha256-Jr02AQWz4ILYZWlGtcVYWTcBojHWZk871bWuEyG5QxE=";

     

       17
       17
       +
         cargoHash = "sha256-d956DuVtLbZ/u3sAA4cQlw55CuYC7XyzeQarwyQ/hpY=";

     

       18
       18
        
         cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "dev" ];

     
···

       36
       36
        
           install -d -m0755 $dev/include/wasmtime

     

       37
       37
        
           install -m0644 $src/crates/c-api/include/*.h $dev/include

     

       38
       38
        
           install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime

     

       39
       39
       -
           install -m0644 $src/crates/c-api/wasm-c-api/include/* $dev/include

     

       40
       39
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       41
       40
        
           install_name_tool -id \

     

       42
       41
        
             $dev/lib/libwasmtime.dylib \

+2 -2

pkgs/development/libraries/gusb/default.nix

···

       23
       23
        
       in

     

       24
       24
        
       stdenv.mkDerivation rec {

     

       25
       25
        
         pname = "gusb";

     

       26
       26
       -
         version = "0.4.8";

     

       26
       26
       +
         version = "0.4.9";

     

       27
       27
        
       

     

       28
       28
        
         outputs = [ "bin" "out" "dev" "devdoc" ];

     

       29
       29
        
       

     
···

       31
       31
        
           owner = "hughsie";

     

       32
       32
        
           repo = "libgusb";

     

       33
       33
        
           rev = "refs/tags/${version}";

     

       34
       34
       -
           hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0=";

     

       34
       34
       +
           hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         patches = [

+2 -2

pkgs/development/libraries/nng/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "nng";

     

       5
       5
       -
         version = "1.7.3";

     

       5
       5
       +
         version = "1.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nanomsg";

     

       9
       9
        
           repo = "nng";

     

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

     

       11
       11
       -
           hash = "sha256-oP7hO3wCXNPW7877wK+HpGsw7j+U0q4i8aTRVi1v0r0=";

     

       11
       11
       +
           hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ninja ]

-4

pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix

···

       49
       49
        
             and de-serialization function from a .proto file.

     

       50
       50
        
           '';

     

       51
       51
        
           maintainers = [ lib.maintainers.GirardR1006 ];

     

       52
       52
       -
           # Broken with Dune 3.15.1:

     

       53
       53
       -
           #   Error: Dependency cycle between:

     

       54
       54
       -
           #      %{read:config/support_proto3_optional.conf} at test/dune:16

     

       55
       55
       -
           broken = true;

     

       56
       52
        
         };

     

       57
       53
        
       }

+3

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

···

       75
       75
        
         # The following tests have been disabled because they need to be run on a GPU platform.

     

       76
       76
        
         disabledTestPaths = [

     

       77
       77
        
           "tests-cuda"

     

       78
       78
       +
         # Disable tests dependending on jax on darwin

     

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

     

       80
       80
       +
           "tests/test_2603_custom_behaviors_with_jax.py"

     

       78
       81
        
         ];

     

       79
       82
        
       

     

       80
       83
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/boto3-stubs/default.nix

···

       366
       366
        
       

     

       367
       367
        
       buildPythonPackage rec {

     

       368
       368
        
         pname = "boto3-stubs";

     

       369
       369
       -
         version = "1.34.88";

     

       369
       369
       +
         version = "1.34.89";

     

       370
       370
        
         pyproject = true;

     

       371
       371
        
       

     

       372
       372
        
         disabled = pythonOlder "3.7";

     
···

       374
       374
        
         src = fetchPypi {

     

       375
       375
        
           pname = "boto3_stubs";

     

       376
       376
        
           inherit version;

     

       377
       377
       -
           hash = "sha256-I8qeDNDT53AtZjGh6UpCCKJrOfprEsc0Qn5op/pklHc=";

     

       377
       377
       +
           hash = "sha256-LGZI40McFYE28MHyHkQtPt4/taUkpacOo4AffpUUoQc=";

     

       378
       378
        
         };

     

       379
       379
        
       

     

       380
       380
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/botocore-stubs/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "botocore-stubs";

     

       12
       12
       -
         version = "1.34.88";

     

       12
       12
       +
         version = "1.34.89";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     
···

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           pname = "botocore_stubs";

     

       19
       19
        
           inherit version;

     

       20
       20
       -
           hash = "sha256-ZW6WbqFSpPKCiJKqepZzvJF5mZj1qO/Y6P45D2HC9PE=";

     

       20
       20
       +
           hash = "sha256-stdBa1JLznMlql/gm7XgtryVMdQTb0QH+jm2vFhQfzQ=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

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

···

       32
       32
        
       

     

       33
       33
        
       buildPythonPackage rec {

     

       34
       34
        
         pname = "coffea";

     

       35
       35
       -
         version = "2024.2.2";

     

       35
       35
       +
         version = "2024.4.1";

     

       36
       36
        
         pyproject = true;

     

       37
       37
        
       

     

       38
       38
        
         disabled = pythonOlder "3.8";

     
···

       41
       41
        
           owner = "CoffeaTeam";

     

       42
       42
        
           repo = "coffea";

     

       43
       43
        
           rev = "refs/tags/v${version}";

     

       44
       44
       -
           hash = "sha256-GdoVb9YtlUlrSx7TWWrdHOqOJJ4M+kJspOllv6HgFXk=";

     

       44
       44
       +
           hash = "sha256-Iu1GHnLUqdhYO7hoHaf+O/S6KO0P+dvl0wgfRA5vtGI=";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         postPatch = ''

+60

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         pythonOlder,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         setuptools,

     

       7
       7
       +
         versioneer,

     

       8
       8
       +
         wheel,

     

       9
       9
       +
         dask,

     

       10
       10
       +
         pandas,

     

       11
       11
       +
         pyarrow,

     

       12
       12
       +
         distributed,

     

       13
       13
       +
         pytestCheckHook,

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "dask-expr";

     

       18
       18
       +
         version = "1.0.12";

     

       19
       19
       +
         pyproject = true;

     

       20
       20
       +
       

     

       21
       21
       +
         disabled = pythonOlder "3.9";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "dask";

     

       25
       25
       +
           repo = "dask-expr";

     

       26
       26
       +
           rev = "refs/tags/v${version}";

     

       27
       27
       +
           hash = "sha256-B/BkLOZhvUyjinaFKp0ecUfzvLb5S90q+YHmJwS6WSQ=";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         postPatch = ''

     

       31
       31
       +
           substituteInPlace pyproject.toml \

     

       32
       32
       +
             --replace-fail "versioneer[toml]==0.28" "versioneer[toml]"

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           setuptools

     

       37
       37
       +
           versioneer

     

       38
       38
       +
           wheel

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         propagatedBuildInputs = [

     

       42
       42
       +
           dask

     

       43
       43
       +
           pandas

     

       44
       44
       +
           pyarrow

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         pythonImportsCheck = [ "dask_expr" ];

     

       48
       48
       +
       

     

       49
       49
       +
         nativeCheckInputs = [

     

       50
       50
       +
           distributed

     

       51
       51
       +
           pytestCheckHook

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         meta = with lib; {

     

       55
       55
       +
           description = "";

     

       56
       56
       +
           homepage = "https://github.com/dask/dask-expr";

     

       57
       57
       +
           license = licenses.bsd3;

     

       58
       58
       +
           maintainers = with maintainers; [ GaetanLepage ];

     

       59
       59
       +
         };

     

       60
       60
       +
       }

+26 -22

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

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       -
       , fetchpatch

     

       6
       5
        
       

     

       7
       6
        
       # build-system

     

       8
       7
        
       , setuptools

     
···

       29
       28
        
       

     

       30
       29
        
       # tests

     

       31
       30
        
       , arrow-cpp

     

       31
       31
       +
       , dask-expr

     

       32
       32
        
       , hypothesis

     

       33
       33
        
       , pytest-asyncio

     

       34
       34
        
       , pytest-rerunfailures

     
···

       37
       37
        
       , pythonOlder

     

       38
       38
        
       }:

     

       39
       39
        
       

     

       40
       40
       -
       buildPythonPackage rec {

     

       40
       40
       +
       let self = buildPythonPackage rec {

     

       41
       41
        
         pname = "dask";

     

       42
       42
       -
         version = "2024.2.1";

     

       42
       42
       +
         version = "2024.4.2";

     

       43
       43
        
         pyproject = true;

     

       44
       44
        
       

     

       45
       45
        
         disabled = pythonOlder "3.9";

     
···

       48
       48
        
           owner = "dask";

     

       49
       49
        
           repo = "dask";

     

       50
       50
        
           rev = "refs/tags/${version}";

     

       51
       51
       -
           hash = "sha256-8VFtKPaF0PqCjqFB+plFe1GjUno5j7j86+wxKhzByyw=";

     

       51
       51
       +
           hash = "sha256-iD+diwctXaQlOpL0fjOiFoWVONtlMq7AonbC0vCmXc0=";

     

       52
       52
        
         };

     

       53
       53
        
       

     

       54
       54
       -
         patches = [

     

       55
       55
       -
           # A pair of fixes with python 3.11.9, merged upstream;

     

       56
       56
       -
           # see https://github.com/dask/dask/issues/11038

     

       57
       57
       -
           (fetchpatch {

     

       58
       58
       -
             url = "https://github.com/dask/dask/pull/11035.diff";

     

       59
       59
       -
             hash = "sha256-aQTzas8gn7pCyp7L6VV3NpSYgqC1Ov7YN7YGnX0Vwmo=";

     

       60
       60
       -
           })

     

       61
       61
       -
           (fetchpatch {

     

       62
       62
       -
             url = "https://github.com/dask/dask/pull/11039.diff";

     

       63
       63
       -
             hash = "sha256-gvEEvnyhFlhiFvVaB6jwMy4auUOvECf49FbFJyjqQm4=";

     

       64
       64
       -
           })

     

       65
       65
       -
         ];

     

       66
       66
       -
       

     

       67
       54
        
         nativeBuildInputs = [

     

       68
       55
        
           setuptools

     

       69
       56
        
           wheel

     
···

       93
       80
        
           ++ self.distributed

     

       94
       81
        
           ++ self.diagnostics;

     

       95
       82
        
           dataframe = [

     

       83
       83
       +
             # dask-expr -> circular dependency with dask-expr

     

       96
       84
        
             numpy

     

       97
       85
        
             pandas

     

       98
       86
        
           ];

     
···

       106
       94
        
         });

     

       107
       95
        
       

     

       108
       96
        
         nativeCheckInputs = [

     

       97
       97
       +
           dask-expr

     

       109
       98
        
           pytestCheckHook

     

       110
       99
        
           pytest-rerunfailures

     

       111
       100
        
           pytest-xdist

     
···

       113
       102
        
           hypothesis

     

       114
       103
        
           pytest-asyncio

     

       115
       104
        
         ]

     

       105
       105
       +
         ++ passthru.optional-dependencies.array

     

       116
       106
        
         ++ passthru.optional-dependencies.dataframe

     

       117
       107
        
         ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64

     

       118
       108
        
           pyarrow

     
···

       172
       162
        
       

     

       173
       163
        
         pythonImportsCheck = [

     

       174
       164
        
           "dask"

     

       175
       175
       -
           "dask.array"

     

       176
       165
        
           "dask.bag"

     

       177
       166
        
           "dask.bytes"

     

       178
       178
       -
           "dask.dataframe"

     

       179
       179
       -
           "dask.dataframe.io"

     

       180
       180
       -
           "dask.dataframe.tseries"

     

       181
       167
        
           "dask.diagnostics"

     

       182
       168
        
         ];

     

       183
       169
        
       

     

       170
       170
       +
         doCheck = false;

     

       171
       171
       +
       

     

       172
       172
       +
         # Enable tests via passthru to avoid cyclic dependency with dask-expr.

     

       173
       173
       +
         passthru.tests = {

     

       174
       174
       +
           check = self.overridePythonAttrs (old: {

     

       175
       175
       +
             doCheck = true;

     

       176
       176
       +
             pythonImportsCheck = [

     

       177
       177
       +
               # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`

     

       178
       178
       +
               "dask.array"

     

       179
       179
       +
               # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`

     

       180
       180
       +
               "dask.dataframe"

     

       181
       181
       +
               "dask.dataframe.io"

     

       182
       182
       +
               "dask.dataframe.tseries"

     

       183
       183
       +
             ] ++ old.pythonImportsCheck;

     

       184
       184
       +
           });

     

       185
       185
       +
         };

     

       186
       186
       +
       

     

       187
       187
       +
       

     

       184
       188
        
         meta = with lib; {

     

       185
       189
        
           description = "Minimal task scheduling abstraction";

     

       186
       190
        
           mainProgram = "dask";

     
···

       189
       193
        
           license = licenses.bsd3;

     

       190
       194
        
           maintainers = with maintainers; [ fridh ];

     

       191
       195
        
         };

     

       192
       192
       -
       }

     

       196
       196
       +
       }; in self

+2 -2

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

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "distributed";

     

       28
       28
       -
         version = "2023.12.0";

     

       28
       28
       +
         version = "2024.4.2";

     

       29
       29
        
         pyproject = true;

     

       30
       30
        
       

     

       31
       31
        
         disabled = pythonOlder "3.9";

     
···

       34
       34
        
           owner = "dask";

     

       35
       35
        
           repo = "distributed";

     

       36
       36
        
           rev = "refs/tags/${version}";

     

       37
       37
       -
           hash = "sha256-Zv31BTzY31eXkU7wqa+h33qGrH+OTzKEj6L7Ei/aizk=";

     

       37
       37
       +
           hash = "sha256-xoQ+b7qzstZl9gRNs4jssNOsGQHDdvTXU7pTjBSuyWs=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         postPatch = ''

+3 -10

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

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , pythonOlder

     

       5
       5
        
       , fetchFromGitHub

     

       6
       6
       -
       , fetchpatch

     

       7
       6
        
       , substituteAll

     

       8
       7
        
       , graphviz-nox

     

       9
       8
        
       , xdg-utils

     
···

       18
       17
        
       

     

       19
       18
        
       buildPythonPackage rec {

     

       20
       19
        
         pname = "graphviz";

     

       21
       21
       -
         version = "0.20.1";

     

       20
       20
       +
         version = "0.20.2";

     

       22
       21
        
         pyproject = true;

     

       23
       22
        
       

     

       24
       24
       -
         disabled = pythonOlder "3.7";

     

       23
       23
       +
         disabled = pythonOlder "3.8";

     

       25
       24
        
       

     

       26
       25
        
         # patch does not apply to PyPI tarball due to different line endings

     

       27
       26
        
         src = fetchFromGitHub {

     

       28
       27
        
           owner = "xflr6";

     

       29
       28
        
           repo = "graphviz";

     

       30
       29
        
           rev = version;

     

       31
       31
       -
           hash = "sha256-plhWG9mE9DoTMg7mWCvFLAgtBx01LAgJ0gQ/mqBU3yc=";

     

       30
       30
       +
           hash = "sha256-q5y4QPBCtA1kMhxbOECodSeubj2bULnnNDrZZfxiry4=";

     

       32
       31
        
         };

     

       33
       32
        
       

     

       34
       33
        
         patches = [

     
···

       36
       35
        
             src = ./paths.patch;

     

       37
       36
        
             graphviz = graphviz-nox;

     

       38
       37
        
             xdgutils = xdg-utils;

     

       39
       39
       -
           })

     

       40
       40
       -
           # https://github.com/xflr6/graphviz/issues/209

     

       41
       41
       -
           (fetchpatch {

     

       42
       42
       -
             name = "fix-tests-with-python312.patch";

     

       43
       43
       -
             url = "https://github.com/xflr6/graphviz/commit/5ce9fc5de4f2284baa27d7a8d68ab0885d032868.patch";

     

       44
       44
       -
             hash = "sha256-jREPACSc4aoHY3G+39e8Axqajw4eeKkAeVu2s40v1nI=";

     

       45
       38
        
           })

     

       46
       39
        
         ];

     

       47
       40

+8 -8

pkgs/development/python-modules/graphviz/paths.patch

···

       1
       1
        
       diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py

     

       2
       2
       -
       index 60654bd..2c62b47 100644

     

       2
       2
       +
       index 3a62a85..a38bb9b 100644

     

       3
       3
        
       --- a/graphviz/backend/dot_command.py

     

       4
       4
        
       +++ b/graphviz/backend/dot_command.py

     

       5
       5
        
       @@ -9,7 +9,7 @@ from .. import parameters

     
···

       38
       38
        
            kwargs = {'stderr': subprocess.DEVNULL} if quiet else {}

     

       39
       39
        
            subprocess.Popen(cmd, **kwargs)

     

       40
       40
        
       diff --git a/tests/_common.py b/tests/_common.py

     

       41
       41
       -
       index 87b4cbd..4188beb 100644

     

       41
       41
       +
       index edc1309..42d730c 100644

     

       42
       42
        
       --- a/tests/_common.py

     

       43
       43
        
       +++ b/tests/_common.py

     

       44
       44
       -
       @@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY', 'EXPECTED_UNFLATTEN_BINARY',

     

       44
       44
       +
       @@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY',

     

       45
       45
        
                   'as_cwd',

     

       46
       46
        
                   'check_startupinfo', 'StartupinfoMatcher']

     

       47
       47
        
        

     

       48
       48
       -
       -EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('dot'))

     

       49
       49
       -
       +EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/dot'))

     

       48
       48
       +
       -EXPECTED_DOT_BINARY = pathlib.Path('dot')

     

       49
       49
       +
       +EXPECTED_DOT_BINARY = pathlib.Path('@graphviz@/bin/dot')

     

       50
       50
        
        

     

       51
       51
       -
       -EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('unflatten'))

     

       52
       52
       -
       +EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/unflatten'))

     

       51
       51
       +
       -EXPECTED_UNFLATTEN_BINARY = pathlib.Path('unflatten')

     

       52
       52
       +
       +EXPECTED_UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten')

     

       53
       53
        
        

     

       54
       54
       -
        EXPECTED_DEFAULT_ENCODING = 'utf-8'

     

       54
       54
       +
        EXPECTED_DEFAULT_ENGINE = 'dot'

     

       55
       55
        
        

     

       56
       56
        
       diff --git a/tests/backend/test_execute.py b/tests/backend/test_execute.py

     

       57
       57
        
       index 2cb853a..8093dfe 100644

+4 -4

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "ical";

     

       19
       19
       -
         version = "7.0.3";

     

       19
       19
       +
         version = "8.0.0";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.10";

     
···

       25
       25
        
           owner = "allenporter";

     

       26
       26
        
           repo = "ical";

     

       27
       27
        
           rev = "refs/tags/${version}";

     

       28
       28
       -
           hash = "sha256-RiwWnRSe0HdeGVo592A+Rk+IvA1Lfp6mY+/ZEyqJBDU=";

     

       28
       28
       +
           hash = "sha256-nwF6iInQzHdOtmcC1fi6CS2LnYRCxc/DS9bg8IxTlFg=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [

     

       31
       31
       +
         build-system = [

     

       32
       32
        
           setuptools

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       -
         propagatedBuildInputs = [

     

       35
       35
       +
         dependencies = [

     

       36
       36
        
           python-dateutil

     

       37
       37
        
           tzdata

     

       38
       38
        
           pydantic

+11 -10

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

···

       9
       9
        
       , jbig2enc

     

       10
       10
        
       , packaging

     

       11
       11
        
       , pdfminer-six

     

       12
       12
       +
       , pillow-heif

     

       12
       13
        
       , pikepdf

     

       13
       14
        
       , pillow

     

       14
       15
        
       , pluggy

     
···

       18
       19
        
       , pythonOlder

     

       19
       20
        
       , rich

     

       20
       21
        
       , reportlab

     

       21
       21
       -
       , setuptools

     

       22
       22
        
       , setuptools-scm

     

       23
       23
        
       , substituteAll

     

       24
       24
        
       , tesseract

     

       25
       25
        
       , tqdm

     

       26
       26
       -
       , typing-extensions

     

       27
       26
        
       , unpaper

     

       28
       27
        
       , installShellFiles

     

       29
       28
        
       }:

     

       30
       29
        
       

     

       31
       30
        
       buildPythonPackage rec {

     

       32
       31
        
         pname = "ocrmypdf";

     

       33
       33
       -
         version = "16.1.2";

     

       32
       32
       +
         version = "16.2.0";

     

       34
       33
        
       

     

       35
       34
        
         disabled = pythonOlder "3.10";

     

       36
       35
        
       

     
···

       46
       45
        
           postFetch = ''

     

       47
       46
        
             rm "$out/.git_archival.txt"

     

       48
       47
        
           '';

     

       49
       49
       -
           hash = "sha256-nZvfkfO5u3iuN0g/KITWbhYCRAJngEOKCW48z6IEPMI=";

     

       48
       48
       +
           hash = "sha256-sqhuQ+no6UymxbVtDtWiYQK8kKpO1y37NxLDmRT1LEQ=";

     

       50
       49
        
         };

     

       51
       50
        
       

     

       52
       51
        
         patches = [

     

       52
       52
       +
           ./use-pillow-heif.patch

     

       53
       53
        
           (substituteAll {

     

       54
       54
        
             src = ./paths.patch;

     

       55
       55
        
             gs = lib.getExe ghostscript;

     
···

       60
       60
        
           })

     

       61
       61
        
         ];

     

       62
       62
        
       

     

       63
       63
       +
         build-system = [

     

       64
       64
       +
           setuptools-scm

     

       65
       65
       +
         ];

     

       66
       66
       +
       

     

       63
       67
        
         nativeBuildInputs = [

     

       64
       64
       -
           setuptools

     

       65
       65
       -
           setuptools-scm

     

       66
       68
        
           installShellFiles

     

       67
       69
        
         ];

     

       68
       70
        
       

     

       69
       69
       -
         propagatedBuildInputs = [

     

       71
       71
       +
         dependencies = [

     

       70
       72
        
           deprecation

     

       71
       73
        
           img2pdf

     

       72
       74
        
           packaging

     

       73
       75
        
           pdfminer-six

     

       76
       76
       +
           pillow-heif

     

       74
       77
        
           pikepdf

     

       75
       78
        
           pillow

     

       76
       79
        
           pluggy

     

       77
       77
       -
           reportlab

     

       78
       80
        
           rich

     

       79
       79
       -
         ] ++ lib.optionals (pythonOlder "3.10") [

     

       80
       80
       -
           typing-extensions

     

       81
       81
        
         ];

     

       82
       82
        
       

     

       83
       83
        
         nativeCheckInputs = [

     

       84
       84
        
           hypothesis

     

       85
       85
        
           pytest-xdist

     

       86
       86
        
           pytestCheckHook

     

       87
       87
       +
           reportlab

     

       87
       88
        
         ];

     

       88
       89
        
       

     

       89
       90
        
         pythonImportsCheck = [

+26

pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch

···

       1
       1
       +
       diff --git a/pyproject.toml b/pyproject.toml

     

       2
       2
       +
       index d045458f..efa9161d 100644

     

       3
       3
       +
       --- a/pyproject.toml

     

       4
       4
       +
       +++ b/pyproject.toml

     

       5
       5
       +
       @@ -16,7 +16,7 @@ dependencies = [

     

       6
       6
       +
          "img2pdf>=0.5",

     

       7
       7
       +
          "packaging>=20",

     

       8
       8
       +
          "pdfminer.six>=20220319",

     

       9
       9
       +
       -  "pi-heif",                # Heif image format - maintainers: if this is removed, it will NOT break

     

       10
       10
       +
       +  "pillow-heif",                # Heif image format - maintainers: if this is removed, it will NOT break

     

       11
       11
       +
          "pikepdf>=8.10.1",

     

       12
       12
       +
          "Pillow>=10.0.1",

     

       13
       13
       +
          "pluggy>=1",

     

       14
       14
       +
       diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py

     

       15
       15
       +
       index 043a78a0..522197b1 100644

     

       16
       16
       +
       --- a/src/ocrmypdf/_pipeline.py

     

       17
       17
       +
       +++ b/src/ocrmypdf/_pipeline.py

     

       18
       18
       +
       @@ -42,7 +42,7 @@ from ocrmypdf.pdfinfo import Colorspace, Encoding, PageInfo, PdfInfo

     

       19
       19
       +
        from ocrmypdf.pluginspec import OrientationConfidence

     

       20
       20
       +
        

     

       21
       21
       +
        try:

     

       22
       22
       +
       -    from pi_heif import register_heif_opener

     

       23
       23
       +
       +    from pillow_heif import register_heif_opener

     

       24
       24
       +
        except ImportError:

     

       25
       25
       +
        

     

       26
       26
       +
            def register_heif_opener():

+6 -2

pkgs/development/python-modules/pillow-heif/default.nix

···

       57
       57
        
           x265

     

       58
       58
        
         ];

     

       59
       59
        
       

     

       60
       60
       -
         # clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument]

     

       61
       61
       -
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

     

       60
       60
       +
         env = {

     

       61
       61
       +
           # clang-16: error: argument unused during compilation: '-fno-strict-overflow'

     

       62
       62
       +
           NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

     

       63
       63
       +
       

     

       64
       64
       +
           RELEASE_FULL_FLAG = 1;

     

       65
       65
       +
         };

     

       62
       66
        
       

     

       63
       67
        
         propagatedBuildInputs = [

     

       64
       68
        
           pillow

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pyaml";

     

       11
       11
       -
         version = "23.12.0";

     

       11
       11
       +
         version = "24.4.0";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-zm9kjv37GzpVefjO2wT6zw+h6PZIRrY5MJtYW7MitOU=";

     

       16
       16
       +
           hash = "sha256-Dkg9kokBDnR6Ml3EMXG8w51lYt0d1HGejMfnyWyZ/OY=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

+2 -2

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

···

       54
       54
        
       

     

       55
       55
        
       buildPythonPackage rec {

     

       56
       56
        
         pname = "transformers";

     

       57
       57
       -
         version = "4.40.0";

     

       57
       57
       +
         version = "4.40.1";

     

       58
       58
        
         pyproject = true;

     

       59
       59
        
       

     

       60
       60
        
         disabled = pythonOlder "3.8";

     
···

       63
       63
        
           owner = "huggingface";

     

       64
       64
        
           repo = "transformers";

     

       65
       65
        
           rev = "refs/tags/v${version}";

     

       66
       66
       -
           hash = "sha256-k0AloOG7fRQhTW8IF6uQSfav8p1KC5633SaLNYZrZ2M=";

     

       66
       66
       +
           hash = "sha256-w9BVJwYS2QV58UTOpcoQwdC+dxZuhLS2h8PqN5W2Yjc=";

     

       67
       67
        
         };

     

       68
       68
        
       

     

       69
       69
        
         build-system = [

-22

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

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       buildPythonPackage rec {

     

       7
       7
       -
         pname = "units";

     

       8
       8
       -
         version = "0.07";

     

       9
       9
       -
         format = "setuptools";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchPypi {

     

       12
       12
       -
           inherit pname version;

     

       13
       13
       -
           sha256 = "43eb3e073e1b11289df7b1c3f184b5b917ccad178b717b03933298716f200e14";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         meta = with lib; {

     

       17
       17
       -
           description = "Python support for quantities with units";

     

       18
       18
       -
           homepage = "https://bitbucket.org/adonohue/units/";

     

       19
       19
       -
           license = licenses.psfl;

     

       20
       20
       -
           maintainers = [ ];

     

       21
       21
       -
         };

     

       22
       22
       -
       }

+2 -2

pkgs/development/tools/algolia-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "algolia-cli";

     

       5
       5
       -
         version = "1.6.6";

     

       5
       5
       +
         version = "1.6.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "algolia";

     

       9
       9
        
           repo = "cli";

     

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

     

       11
       11
       -
           hash = "sha256-yLsyby3u1oz5fnQ/zQ0sjy2w+Pv0KHySojsDc4vnFF0=";

     

       11
       11
       +
           hash = "sha256-g6UNFE1EEo40pqdTAmidG4/A+cQ89UZNp++B+q6AzeA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk=";

+1 -4

pkgs/development/tools/continuous-integration/github-runner/default.nix

···

       1
       1
       -
       { autoPatchelfHook

     

       2
       2
       -
       , autoSignDarwinBinariesHook

     

       1
       1
       +
       { autoSignDarwinBinariesHook

     

       3
       2
        
       , buildDotnetModule

     

       4
       3
        
       , dotnetCorePackages

     

       5
       4
        
       , fetchFromGitHub

     
···

       114
       113
        
         nativeBuildInputs = [

     

       115
       114
        
           which

     

       116
       115
        
           git

     

       117
       117
       -
         ] ++ lib.optionals stdenv.isLinux [

     

       118
       118
       -
           autoPatchelfHook

     

       119
       116
        
         ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [

     

       120
       117
        
           autoSignDarwinBinariesHook

     

       121
       118
        
         ];

+4 -4

pkgs/development/tools/misc/texlab/default.nix

···

       15
       15
        
       in

     

       16
       16
        
       rustPlatform.buildRustPackage rec {

     

       17
       17
        
         pname = "texlab";

     

       18
       18
       -
         version = "5.14.1";

     

       18
       18
       +
         version = "5.15.0";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "latex-lsp";

     

       22
       22
        
           repo = "texlab";

     

       23
       23
        
           rev = "refs/tags/v${version}";

     

       24
       24
       -
           hash = "sha256-OqnV0ZpriiH69cTlmqPxorCgeO3x5h15e5Crn7DPwBM=";

     

       24
       24
       +
           hash = "sha256-V2+2fiQsU55Ig6GoxDJB0RCTh8nhuiGIYM3NeR4pU+k=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoHash = "sha256-V5FP24Cz1umffFD1Am4/IG3c7zKpT7MdghLpKvDxZwA=";

     

       27
       27
       +
         cargoHash = "sha256-MPhG+YZ52fvv3+cKNebIkWwvruUsaRnOqPI1fs3osNI=";

     

       28
       28
        
       

     

       29
       29
        
         outputs = [ "out" ] ++ lib.optional (!isCross) "man";

     

       30
       30
        
       

     
···

       41
       41
        
         # generate the man page

     

       42
       42
        
         postInstall = lib.optionalString (!isCross) ''

     

       43
       43
        
           # TexLab builds man page separately in CI:

     

       44
       44
       -
           # https://github.com/latex-lsp/texlab/blob/v5.14.1/.github/workflows/publish.yml#L117-L121

     

       44
       44
       +
           # https://github.com/latex-lsp/texlab/blob/v5.15.0/.github/workflows/publish.yml#L117-L121

     

       45
       45
        
           help2man --no-info "$out/bin/texlab" > texlab.1

     

       46
       46
        
           installManPage texlab.1

     

       47
       47
        
         '';

+2 -2

pkgs/development/tools/ocaml/dune/3.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "dune";

     

       9
       9
       -
         version = "3.15.1";

     

       9
       9
       +
         version = "3.15.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";

     

       13
       13
       -
           hash = "sha256-tbeKSgLU3QiUI02/cYv/R3/Nheff3/6OzgC5oM89VHs=";

     

       13
       13
       +
           hash = "sha256-+VmYBULKhZCbPz+Om+ZcK4o3XzpOO9g8etegfy4HeTM=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ ocaml findlib ];

+51

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

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         pname = "rtl8852bu";

     

       5
       5
       +
         version = "${kernel.version}-unstable-2024-03-28";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "morrownr";

     

       9
       9
       +
           repo = "rtl8852bu";

     

       10
       10
       +
           rev = "f6aaa3c0094c541d9b0347926c76c1e9cc4a49d1";

     

       11
       11
       +
           hash = "sha256-Jbd6nixo873LU74klhhQU1qD3ahxEnywdqcF89LTRxc=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;

     

       15
       15
       +
         hardeningDisable = [ "pic" "format" ];

     

       16
       16
       +
       

     

       17
       17
       +
         postPatch = ''

     

       18
       18
       +
           substituteInPlace ./Makefile \

     

       19
       19
       +
             --replace-fail /sbin/depmod \# \

     

       20
       20
       +
             --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"

     

       21
       21
       +
           substituteInPlace ./platform/i386_pc.mk \

     

       22
       22
       +
             --replace-fail /lib/modules "${kernel.dev}/lib/modules"

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         makeFlags = [

     

       26
       26
       +
           "ARCH=${stdenv.hostPlatform.linuxArch}"

     

       27
       27
       +
           ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))

     

       28
       28
       +
           ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))

     

       29
       29
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       30
       30
       +
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         preInstall = ''

     

       34
       34
       +
           mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"

     

       35
       35
       +
           mkdir -p "$out/usr/lib/systemd/system-sleep"

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         postInstall = ''

     

       39
       39
       +
           nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         enableParallelBuilding = true;

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with lib; {

     

       45
       45
       +
           description = "Driver for Realtek rtl8852au and rtl8832bu chipsets, provides the 8852au mod";

     

       46
       46
       +
           homepage = "https://github.com/morrownr/rtl8852bu";

     

       47
       47
       +
           license = licenses.gpl2Only;

     

       48
       48
       +
           platforms = platforms.linux;

     

       49
       49
       +
           maintainers = with maintainers; [ lonyelon ];

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+2 -2

pkgs/servers/dns/bind/default.nix

···

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
        
         pname = "bind";

     

       27
       27
       -
         version = "9.18.25";

     

       27
       27
       +
         version = "9.18.26";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchurl {

     

       30
       30
        
           url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";

     

       31
       31
       -
           hash = "sha256-WkpwQyoz0Anw5unbsyiq56XidQfpjii/PAxrJQzLKrM=";

     

       31
       31
       +
           hash = "sha256-df/uUnMelgTISbZY3ynpJ/HE8B1aceo+vL62NwLLZlE=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

+44 -10

pkgs/servers/home-assistant/intents.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
        
       , pythonOlder

     

       5
       5
        
       

     

       6
       6
        
       # build-system

     

       7
       7
        
       , setuptools

     

       8
       8
       +
       

     

       9
       9
       +
       # codegen

     

       10
       10
       +
       , hassil

     

       11
       11
       +
       , python

     

       12
       12
       +
       , pyyaml

     

       13
       13
       +
       , voluptuous

     

       14
       14
       +
       , regex

     

       15
       15
       +
       , jinja2

     

       16
       16
       +
       

     

       17
       17
       +
       # tests

     

       18
       18
       +
       , pytest-xdist

     

       19
       19
       +
       , pytestCheckHook

     

       8
       20
        
       }:

     

       9
       21
        
       

     

       10
       22
        
       buildPythonPackage rec {

     

       11
       23
        
         pname = "home-assistant-intents";

     

       12
       24
        
         version = "2024.4.3";

     

       13
       13
       -
         format = "wheel";

     

       25
       25
       +
         pyproject = true;

     

       14
       26
        
       

     

       15
       27
        
         disabled = pythonOlder "3.9";

     

       16
       28
        
       

     

       17
       17
       -
         src = fetchPypi {

     

       18
       18
       -
           inherit version format;

     

       19
       19
       -
           pname = "home_assistant_intents";

     

       20
       20
       -
           dist = "py3";

     

       21
       21
       -
           python = "py3";

     

       22
       22
       -
           hash = "sha256-GraYVtioKIoKlPRBhhhzlbBfI6heXAaA1MQpUqAgEDQ=";

     

       29
       29
       +
         src = fetchFromGitHub {

     

       30
       30
       +
           owner = "home-assistant";

     

       31
       31
       +
           repo = "intents-package";

     

       32
       32
       +
           rev = "refs/tags/${version}";

     

       33
       33
       +
           hash = "sha256-hcstD1qkngZAl/jKLez+4qDs/ZIandkVkY2jrvZqph8=";

     

       34
       34
       +
           fetchSubmodules = true;

     

       23
       35
        
         };

     

       36
       36
       +
       

     

       37
       37
       +
         postPatch = ''

     

       38
       38
       +
           substituteInPlace pyproject.toml \

     

       39
       39
       +
             --replace-fail "setuptools~=62.3" "setuptools" \

     

       40
       40
       +
             --replace-fail "wheel~=0.37.1" "wheel"

     

       41
       41
       +
         '';

     

       24
       42
        
       

     

       25
       43
        
         build-system = [

     

       26
       44
        
           setuptools

     

       45
       45
       +
       

     

       46
       46
       +
           # build-time codegen; https://github.com/home-assistant/intents/blob/main/requirements.txt#L1-L5

     

       47
       47
       +
           hassil

     

       48
       48
       +
           pyyaml

     

       49
       49
       +
           voluptuous

     

       50
       50
       +
           regex

     

       51
       51
       +
           jinja2

     

       27
       52
        
         ];

     

       28
       53
        
       

     

       29
       29
       -
         # sdist/wheel do not ship tests

     

       30
       30
       -
         doCheck = false;

     

       54
       54
       +
         postInstall = ''

     

       55
       55
       +
           # https://github.com/home-assistant/intents-package/blob/main/script/package#L23-L24

     

       56
       56
       +
           PACKAGE_DIR=$out/${python.sitePackages}/home_assistant_intents

     

       57
       57
       +
           ${python.pythonOnBuildForHost.interpreter} script/merged_output.py $PACKAGE_DIR/data

     

       58
       58
       +
           ${python.pythonOnBuildForHost.interpreter} script/write_languages.py $PACKAGE_DIR/data > $PACKAGE_DIR/languages.py

     

       59
       59
       +
         '';

     

       60
       60
       +
       

     

       61
       61
       +
         nativeCheckInputs = [

     

       62
       62
       +
           pytest-xdist

     

       63
       63
       +
           pytestCheckHook

     

       64
       64
       +
         ];

     

       31
       65
        
       

     

       32
       66
        
         pytestFlagsArray = [

     

       33
       67
        
           "intents/tests"

+1 -1

pkgs/servers/jellyseerr/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "jellyseerr",

     

       3
       3
       -
         "version": "1.7.0",

     

       3
       3
       +
         "version": "1.8.1",

     

       4
       4
        
         "private": true,

     

       5
       5
        
         "scripts": {

     

       6
       6
        
           "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",

+3 -3

pkgs/servers/jellyseerr/pin.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "1.7.0",

     

       3
       3
       -
         "srcHash": "sha256-9ILP2HH7p8ELwrQOBnqPbvHdUnNrqEkA4OmxOuhNbEc=",

     

       4
       4
       -
         "yarnSha256": "1ygb8pmwra570wmdkn7mxv9j90cgjh063b9cl0wl9hsmg687sk9h"

     

       2
       2
       +
         "version": "1.8.1",

     

       3
       3
       +
         "srcHash": "sha256-B8Hnpi4XwK0WrHRgj7OSVUh49oRH9SVEHdzGbnDa8p8=",

     

       4
       4
       +
         "yarnSha256": "ME19kHlVw0Q5oCytYQCUj4Ek0+712NkqB6eozOtF6/k="

     

       5
       5
        
       }

-8

pkgs/tools/games/opentracker/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         buildDotnetModule,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       -
         autoPatchelfHook,

     

       7
       6
        
         wrapGAppsHook,

     

       8
       7
        
         dotnetCorePackages,

     

       9
       8
        
         fontconfig,

     
···

       40
       39
        
         ];

     

       41
       40
        
       

     

       42
       41
        
         nativeBuildInputs = [

     

       43
       43
       -
           autoPatchelfHook

     

       44
       42
        
           wrapGAppsHook

     

       45
       43
        
         ];

     

       46
       44
        
       

     
···

       63
       61
        
             libX11

     

       64
       62
        
             libXi

     

       65
       63
        
           ]);

     

       66
       66
       -
       

     

       67
       67
       -
         # Attempts to patchelf unneeded SOs

     

       68
       68
       -
         autoPatchelfIgnoreMissingDeps = [

     

       69
       69
       -
           "libc.musl-x86_64.so.1"

     

       70
       70
       -
           "libintl.so.8"

     

       71
       71
       -
         ];

     

       72
       64
        
       

     

       73
       65
        
         meta = with lib; {

     

       74
       66
        
           description = "A tracking application for A Link to the Past Randomizer";

+3 -3

pkgs/tools/graphics/oxipng/default.nix

···

       1
       1
        
       { lib, stdenv, fetchCrate, rustPlatform }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
       -
         version = "9.0.0";

     

       4
       4
       +
         version = "9.1.1";

     

       5
       5
        
         pname = "oxipng";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit version pname;

     

       9
       9
       -
           hash = "sha256-1OpSweosYiqtLqCcAw1EsAtBAYVc/VH8kRtVSpmTytM=";

     

       9
       9
       +
           hash = "sha256-I+1yQQEzhGApvHxPM8W1wySQtDglGp3V4vkwoTd92EU=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoHash = "sha256-kPdAfqMNOoQPSdv+VLRDUr6AXGPy47UnldXwvpwKp6s=";

     

       12
       12
       +
         cargoHash = "sha256-miXrQVFahz9WYRCduSF5+RSY4j/XNEt8lnSuOohBUFU=";

     

       13
       13
        
       

     

       14
       14
        
         doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;

     

       15
       15

+7 -7

pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix

···

       12
       12
        
         zip-codes = fetchFromGitHub {

     

       13
       13
        
           owner = "musjj";

     

       14
       14
        
           repo = "jp-zip-codes";

     

       15
       15
       -
           rev = "a1eed9bae0ba909c8c8f5387008b08ff490f5e57";

     

       16
       16
       -
           hash = "sha256-VfI8qAMPPCC2H4vjm4a6sAmSwc1YkXlMyLm1cnufvrU=";

     

       15
       15
       +
           rev = "119c888a38032a92e139c52cd26f45bb495c4d54";

     

       16
       16
       +
           hash = "sha256-uyAL2TcFJsYZACFDAxIQ4LE40Hi4PVrQRnJl5O5+RmU=";

     

       17
       17
        
         };

     

       18
       18
        
       in

     

       19
       19
        
       buildBazelPackage rec {

     

       20
       20
        
         pname = "ibus-mozc";

     

       21
       21
       -
         version = "2.29.5268.102";

     

       21
       21
       +
         version = "2.29.5374.102";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "google";

     

       25
       25
        
           repo = "mozc";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           hash = "sha256-B7hG8OUaQ1jmmcOPApJlPVcB8h1Rw06W5LAzlTzI9rU=";

     

       27
       27
       +
           hash = "sha256-AcIN5sWPBe4JotAUYv1fytgQw+mJzdFhKuVPLR48soA=";

     

       28
       28
        
           fetchSubmodules = true;

     

       29
       29
        
         };

     

       30
       30
        
       

     
···

       38
       38
        
         inherit bazel;

     

       39
       39
        
       

     

       40
       40
        
         fetchAttrs = {

     

       41
       41
       -
           sha256 = "sha256-17QHh1MJUu8OK/T+WSpLXEx83DmRORLN7yLzILqP7vw=";

     

       41
       41
       +
           sha256 = "sha256-TJ5ksmGCZ8Vy3WmwqQQqQh+kYZvrBeGXc4zcOt1ZYI4=";

     

       42
       42
        
       

     

       43
       43
       -
           # remove references of buildInputs

     

       43
       43
       +
           # remove references of buildInputs and zip code files

     

       44
       44
        
           preInstall = ''

     

       45
       45
       -
             rm -rv $bazelOut/external/{ibus,qt_linux}

     

       45
       45
       +
             rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*}

     

       46
       46
        
           '';

     

       47
       47
        
         };

     

       48
       48

pkgs/tools/misc/btrfs-assistant/default.nix pkgs/by-name/bt/btrfs-assistant/package.nix

pkgs/tools/misc/dooit/default.nix pkgs/by-name/do/dooit/package.nix

+5 -2

pkgs/tools/misc/fastfetch/default.nix pkgs/by-name/fa/fastfetch/package.nix

···

       21
       21
        
       , nix-update-script

     

       22
       22
        
       , ocl-icd

     

       23
       23
        
       , opencl-headers

     

       24
       24
       +
       , overrideSDK

     

       24
       25
        
       , pcre

     

       25
       26
        
       , pcre2

     

       26
       27
        
       , pkg-config

     
···

       40
       41
        
       , waylandSupport ? true

     

       41
       42
        
       , x11Support ? true

     

       42
       43
        
       }:

     

       43
       43
       -
       

     

       44
       44
       -
       stdenv.mkDerivation (finalAttrs: {

     

       44
       44
       +
       let

     

       45
       45
       +
         stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;

     

       46
       46
       +
       in

     

       47
       47
       +
       stdenv'.mkDerivation (finalAttrs: {

     

       45
       48
        
         pname = "fastfetch";

     

       46
       49
        
         version = "2.9.2";

     

       47
       50

-6

pkgs/tools/networking/mqttmultimeter/default.nix

···

       4
       4
        
       , dotnet-runtime_8

     

       5
       5
        
       , buildDotnetModule

     

       6
       6
        
       , fetchFromGitHub

     

       7
       7
       -
       , autoPatchelfHook

     

       8
       7
        
       , fontconfig

     

       9
       8
        
       , xorg

     

       10
       9
        
       , libglvnd

     

       11
       10
        
       , makeDesktopItem

     

       12
       11
        
       , copyDesktopItems

     

       13
       12
        
       }:

     

       14
       14
       -
       

     

       15
       15
       -
       # NOTES:

     

       16
       16
       -
       # 1. we need autoPatchelfHook for quite a number of things in $out/lib

     

       17
       13
        
       

     

       18
       14
        
       buildDotnetModule rec {

     

       19
       15
        
         pname = "mqttmultimeter";

     
···

       35
       31
        
         executables = [ "mqttMultimeter" ];

     

       36
       32
        
       

     

       37
       33
        
         nativeBuildInputs = [

     

       38
       38
       -
           autoPatchelfHook

     

       39
       34
        
           copyDesktopItems

     

       40
       35
        
         ];

     

       41
       36
        
       

     

       42
       37
        
         buildInputs = [ stdenv.cc.cc.lib fontconfig ];

     

       43
       38
        
       

     

       44
       44
       -
         # don't care about musl and windows versions, as they fail autoPatchelfHook

     

       45
       39
        
         postInstall = ''

     

       46
       40
        
           rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}

     

       47
       41
        
         '';

+8

pkgs/tools/security/cryptomator/default.nix

···

       33
       33
        
       

     

       34
       34
        
         # This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh

     

       35
       35
        
         installPhase = ''

     

       36
       36
       +
           runHook preInstall

     

       37
       37
       +
       

     

       36
       38
        
           mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/

     

       37
       39
        
       

     

       38
       40
        
           cp target/libs/* $out/share/cryptomator/libs/

     
···

       70
       72
        
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator256.png $out/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png

     

       71
       73
        
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator512.png $out/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png

     

       72
       74
        
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg

     

       75
       75
       +
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg

     

       76
       76
       +
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg

     

       77
       77
       +
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg $out/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked-symbolic.svg

     

       78
       78
       +
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray.svg $out/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-symbolic.svg

     

       73
       79
        
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.desktop $out/share/applications/org.cryptomator.Cryptomator.desktop

     

       74
       80
        
           cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml $out/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml

     

       75
       81
        
           cp ${src}/dist/linux/common/application-vnd.cryptomator.vault.xml $out/share/mime/packages/application-vnd.cryptomator.vault.xml

     

       82
       82
       +
       

     

       83
       83
       +
           runHook postInstall

     

       76
       84
        
         '';

     

       77
       85
        
       

     

       78
       86
        
         nativeBuildInputs = [

+3 -3

pkgs/tools/security/prs/default.nix

···

       14
       14
        
       

     

       15
       15
        
       rustPlatform.buildRustPackage rec {

     

       16
       16
        
         pname = "prs";

     

       17
       17
       -
         version = "0.5.0";

     

       17
       17
       +
         version = "0.5.1";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitLab {

     

       20
       20
        
           owner = "timvisee";

     

       21
       21
        
           repo = "prs";

     

       22
       22
        
           rev = "refs/tags/v${version}";

     

       23
       23
       -
           hash = "sha256-9/XKz+yOCFEB1VI2EK0xF5ecyBPeGztpGPo/aXQ6v5E=";

     

       23
       23
       +
           hash = "sha256-MvQ0B35NF/AuGHBMa201FkFlU/UX0WXMcBRxTJwpUFw=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         cargoHash = "sha256-kxIgToqhJhUgJcxnGRGG6I+YqM2diFgQDyn1jBxWAw8=";

     

       26
       26
       +
         cargoHash = "sha256-YDcAjBIdUboOKvGSnGW6b1JVbhQaB3ccXcSmK78M7DI=";

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

     

       29
       29
        
           # The GPGME backend is recommended

+1 -19

pkgs/top-level/all-packages.nix

···

       428
       428
        
       

     

       429
       429
        
         catatonit = callPackage ../applications/virtualization/catatonit { };

     

       430
       430
        
       

     

       431
       431
       -
         catppuccin = callPackage ../data/themes/catppuccin { };

     

       432
       432
       -
       

     

       433
       431
        
         catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { };

     

       434
       432
        
       

     

       435
       433
        
         catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { };

     
···

       441
       439
        
         catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };

     

       442
       440
        
       

     

       443
       441
        
         catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { };

     

       444
       444
       -
       

     

       445
       445
       -
         catppuccin-sddm-corners = callPackage ../data/themes/catppuccin-sddm-corners { };

     

       446
       442
        
       

     

       447
       443
        
         btdu = callPackage ../tools/misc/btdu { };

     

       448
       444
        
       

     
···

       1776
       1772
        
         dwarfs = callPackage ../tools/filesystems/dwarfs { };

     

       1777
       1773
        
       

     

       1778
       1774
        
         dysk = callPackage ../tools/filesystems/dysk { };

     

       1779
       1779
       -
       

     

       1780
       1780
       -
         fastfetch = callPackage ../tools/misc/fastfetch {

     

       1781
       1781
       -
           stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;

     

       1782
       1782
       -
         };

     

       1783
       1775
        
       

     

       1784
       1776
        
         fscan = callPackage ../tools/security/fscan { };

     

       1785
       1777
        
       

     
···

       3554
       3546
        
         botamusique = callPackage ../tools/audio/botamusique { };

     

       3555
       3547
        
       

     

       3556
       3548
        
         boulder = callPackage ../tools/admin/boulder { };

     

       3557
       3557
       -
       

     

       3558
       3558
       -
         btrfs-assistant = qt6.callPackage ../tools/misc/btrfs-assistant { };

     

       3559
       3549
        
       

     

       3560
       3550
        
         btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };

     

       3561
       3551
        
       

     
···

       3723
       3713
        
       

     

       3724
       3714
        
         dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };

     

       3725
       3715
        
       

     

       3726
       3726
       -
         dooit = callPackage ../tools/misc/dooit { };

     

       3727
       3727
       -
       

     

       3728
       3716
        
         doona = callPackage ../tools/security/doona { };

     

       3729
       3717
        
       

     

       3730
       3718
        
         dotter = callPackage ../tools/misc/dotter {

     
···

       13091
       13079
        
           inherit (darwin.apple_sdk_11_0.frameworks) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight;

     

       13092
       13080
        
         };

     

       13093
       13081
        
       

     

       13094
       13094
       -
         sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { };

     

       13095
       13095
       -
       

     

       13096
       13082
        
         skippy-xd = callPackage ../tools/X11/skippy-xd { };

     

       13097
       13083
        
       

     

       13098
       13084
        
         sks = callPackage ../servers/sks {

     
···

       17336
       17322
        
         };

     

       17337
       17323
        
       

     

       17338
       17324
        
         inherit (beam.interpreters)

     

       17339
       17339
       -
           erlang erlang_27-rc2 erlang_26 erlang_25 erlang_24

     

       17325
       17325
       +
           erlang erlang_27-rc3 erlang_26 erlang_25 erlang_24

     

       17340
       17326
        
           erlang_odbc erlang_javac erlang_odbc_javac

     

       17341
       17327
        
           elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10

     

       17342
       17328
        
           elixir-ls;

     
···

       31959
       31945
        
       

     

       31960
       31946
        
         rootbar = callPackage ../applications/misc/rootbar { };

     

       31961
       31947
        
       

     

       31962
       31962
       -
         waybar = callPackage ../applications/misc/waybar { };

     

       31963
       31963
       -
       

     

       31964
       31948
        
         waycorner = callPackage ../applications/misc/waycorner { };

     

       31965
       31949
        
       

     

       31966
       31950
        
         waylock = callPackage ../applications/misc/waylock { };

     
···

       41293
       41277
        
         dict-cc-py = callPackage ../applications/misc/dict-cc-py { };

     

       41294
       41278
        
       

     

       41295
       41279
        
         sirikali = libsForQt5.callPackage ../tools/security/sirikali { };

     

       41296
       41296
       -
       

     

       41297
       41297
       -
         wttrbar = callPackage ../applications/misc/wttrbar { };

     

       41298
       41280
        
       

     

       41299
       41281
        
         wpm = callPackage ../applications/misc/wpm { };

     

       41300
       41282

+1 -1

pkgs/top-level/beam-packages.nix

···

       41
       41
        
       

     

       42
       42
        
           # Standard Erlang versions, using the generic builder.

     

       43
       43
        
       

     

       44
       44
       -
           erlang_27-rc2 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc2.nix {

     

       44
       44
       +
           erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix {

     

       45
       45
        
             wxGTK = wxGTK32;

     

       46
       46
        
             parallelBuild = true;

     

       47
       47
        
             autoconf = buildPackages.autoconf269;

+2

pkgs/top-level/linux-kernels.nix

···

       443
       443
        
       

     

       444
       444
        
           rtl8852au = callPackage ../os-specific/linux/rtl8852au { };

     

       445
       445
        
       

     

       446
       446
       +
           rtl8852bu = callPackage ../os-specific/linux/rtl8852bu { };

     

       447
       447
       +
       

     

       446
       448
        
           rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack {};

     

       447
       449
        
       

     

       448
       450
        
           rtl8821au = callPackage ../os-specific/linux/rtl8821au { };

+2 -2

pkgs/top-level/python-packages.nix

···

       2700
       2700
        
       

     

       2701
       2701
        
         dask-awkward = callPackage ../development/python-modules/dask-awkward { };

     

       2702
       2702
        
       

     

       2703
       2703
       +
         dask-expr = callPackage ../development/python-modules/dask-expr { };

     

       2704
       2704
       +
       

     

       2703
       2705
        
         dask-gateway = callPackage ../development/python-modules/dask-gateway { };

     

       2704
       2706
        
       

     

       2705
       2707
        
         dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { };

     
···

       16348
       16350
        
         unifiled = callPackage ../development/python-modules/unifiled { };

     

       16349
       16351
        
       

     

       16350
       16352
        
         unique-log-filter = callPackage ../development/python-modules/unique-log-filter { };

     

       16351
       16351
       -
       

     

       16352
       16352
       -
         units = callPackage ../development/python-modules/units { };

     

       16353
       16353
        
       

     

       16354
       16354
        
         unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { };

     

       16355
       16355