commit 6b076a71fad8106e7ef8910a1ecf46dea6c003d6 · pyrox.dev/nixpkgs

+2 -1

ci/OWNERS

···

       120
       120
        
       /nixos/lib/test-driver  @tfc

     

       121
       121
        
       

     

       122
       122
        
       # NixOS QEMU virtualisation

     

       123
       123
       -
       /nixos/modules/virtualisation/qemu-vm.nix           @raitobezarius

     

       123
       123
       +
       /nixos/modules/virtualisation/qemu-vm.nix                 @raitobezarius

     

       124
       124
       +
       /nixos/modules/services/backup/libvirtd-autosnapshot.nix  @6543

     

       124
       125
        
       

     

       125
       126
        
       # ACME

     

       126
       127
        
       /nixos/modules/security/acme                @NixOS/acme

+7 -3

doc/release-notes/rl-2511.section.md

···

       26
       26
        
       

     

       27
       27
        
       - GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       28
       28
        
       

     

       29
       29
       -
       - GHC 8.6.5 and its package set have been removed. It was only used to bootstrap GHC for powerpc64le, but this was probably broken anyway.

     

       29
       29
       +
       - GHC 8.6 and its package set have been removed. It was only used to bootstrap GHC for powerpc64le, but this was probably broken anyway.

     

       30
       30
       +
       

     

       31
       31
       +
       - GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.

     

       32
       32
       +
       

     

       33
       33
       +
       - GHC 9.0 and its package set have been removed.

     

       30
       34
        
       

     

       31
       35
        
       - `base16-builder` node package has been removed due to lack of upstream maintenance.

     

       32
       36
        
       

     
···

       51
       55
        
       - `cudaPackages.cudatoolkit-legacy-runfile` has been removed.

     

       52
       56
        
       

     

       53
       57
        
       - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.

     

       54
       54
       -
       

     

       55
       55
       -
       - The GHCJS 8.10.7, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.

     

       56
       58
        
       

     

       57
       59
        
       - The `ghcInfo` and `controlPhases` functions have been removed from `haskell.lib.compose` and `haskell.lib`. They were unused and would return incorrect results.

     

       58
       60
        
       

     
···

       150
       152
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       151
       153
        
       

     

       152
       154
        
       - Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.

     

       155
       155
       +
       

     

       156
       156
       +
       - The `dockerTools.streamLayeredImage` builder now uses a better algorithm for generating layered docker images, such that much more sharing is possible when the number of store paths exceeds the layer limit. It gives each of the largest store paths its own layer and adds dependencies to those layers when they aren't used elsewhere.

     

       153
       157
        
       

     

       154
       158
        
       - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes.

     

       155
       159

maintainers/maintainer-list.nix

···

       14727
       14727
        
           githubId = 40217331;

     

       14728
       14728
        
           name = "LizeLive";

     

       14729
       14729
        
         };

     

       14730
       14730
       +
         ljxfstorm = {

     

       14731
       14731
       +
           name = "Likai Liu";

     

       14732
       14732
       +
           email = "ljxf.storm@live.cn";

     

       14733
       14733
       +
           github = "ljxfstorm";

     

       14734
       14734
       +
           githubId = 7077478;

     

       14735
       14735
       +
         };

     

       14730
       14736
        
         llakala = {

     

       14731
       14737
        
           email = "elevenaka11@gmail.com";

     

       14732
       14738
        
           github = "llakala";

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

···

       116
       116
        
         developers to build scalable applications without sacrificing productivity or

     

       117
       117
        
         reliability. Available as [services.temporal](#opt-services.temporal.enable).

     

       118
       118
        
       

     

       119
       119
       +
       - `services.libvirtd.autoSnapshot`, a backup service for libvirt managed vms.

     

       120
       120
       +
       

     

       119
       121
        
       ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}

     

       120
       122
        
       

     

       121
       123
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/module-list.nix

···

       449
       449
        
         ./services/backup/btrbk.nix

     

       450
       450
        
         ./services/backup/duplicati.nix

     

       451
       451
        
         ./services/backup/duplicity.nix

     

       452
       452
       +
         ./services/backup/libvirtd-autosnapshot.nix

     

       452
       453
        
         ./services/backup/mysql-backup.nix

     

       453
       454
        
         ./services/backup/pgbackrest.nix

     

       454
       455
        
         ./services/backup/postgresql-backup.nix

+260

nixos/modules/services/backup/libvirtd-autosnapshot.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         cfg = config.services.libvirtd.autoSnapshot;

     

       10
       10
       +
       

     

       11
       11
       +
         # Function to get VM config with defaults

     

       12
       12
       +
         getVMConfig =

     

       13
       13
       +
           vm:

     

       14
       14
       +
           if lib.isString vm then

     

       15
       15
       +
             {

     

       16
       16
       +
               name = vm;

     

       17
       17
       +
               inherit (cfg) snapshotType keep;

     

       18
       18
       +
             }

     

       19
       19
       +
           else

     

       20
       20
       +
             {

     

       21
       21
       +
               inherit (vm) name;

     

       22
       22
       +
               snapshotType = if vm.snapshotType != null then vm.snapshotType else cfg.snapshotType;

     

       23
       23
       +
               keep = if vm.keep != null then vm.keep else cfg.keep;

     

       24
       24
       +
             };

     

       25
       25
       +
       

     

       26
       26
       +
         # Main backup script combining all VM scripts

     

       27
       27
       +
         backupScript = ''

     

       28
       28
       +
           set -eo pipefail

     

       29
       29
       +
       

     

       30
       30
       +
           # Initialize failure tracking

     

       31
       31
       +
           failed=""

     

       32
       32
       +
       

     

       33
       33
       +
           # Define the VM snapshot function

     

       34
       34
       +
           function snap_vm() {

     

       35
       35
       +
             local vmName="$1"

     

       36
       36
       +
             local snapshotType="$2"

     

       37
       37
       +
             local keep="$3"

     

       38
       38
       +
       

     

       39
       39
       +
             # Add validation for VM name

     

       40
       40
       +
             if ! echo "$vmName" | ${pkgs.gnugrep}/bin/grep -qE '^[a-zA-Z0-9_.-]+$'; then

     

       41
       41
       +
               echo "Invalid VM name: '$vmName'"

     

       42
       42
       +
               failed="$failed $vmName"

     

       43
       43
       +
               return

     

       44
       44
       +
             fi

     

       45
       45
       +
       

     

       46
       46
       +
             echo "Processing VM: $vmName"

     

       47
       47
       +
       

     

       48
       48
       +
             # Check if VM exists

     

       49
       49
       +
             if ! ${pkgs.libvirt}/bin/virsh dominfo "$vmName" >/dev/null 2>&1; then

     

       50
       50
       +
               echo "VM '$vmName' does not exist, skipping"

     

       51
       51
       +
               return

     

       52
       52
       +
             fi

     

       53
       53
       +
       

     

       54
       54
       +
             # Create new snapshot

     

       55
       55
       +
             local snapshot_name

     

       56
       56
       +
             snapshot_name="${cfg.prefix}_$(date +%Y-%m-%d_%H%M%S)"

     

       57
       57
       +
             local snapshot_opts=""

     

       58
       58
       +
             [[ "$snapshotType" == "external" ]] && snapshot_opts="--disk-only"

     

       59
       59
       +
             if ! ${pkgs.libvirt}/bin/virsh snapshot-create-as \

     

       60
       60
       +
               "$vmName" \

     

       61
       61
       +
               "$snapshot_name" \

     

       62
       62
       +
               "Automatic backup snapshot" \

     

       63
       63
       +
               $snapshot_opts \

     

       64
       64
       +
               --atomic; then

     

       65
       65
       +
               echo "Failed to create snapshot for $vmName"

     

       66
       66
       +
               failed="$failed $vmName"

     

       67
       67
       +
               return

     

       68
       68
       +
             fi

     

       69
       69
       +
       

     

       70
       70
       +
             # List all automatic snapshots for this VM

     

       71
       71
       +
             readarray -t SNAPSHOTS < <(${pkgs.libvirt}/bin/virsh snapshot-list "$vmName" --name | ${pkgs.gnugrep}/bin/grep "^${cfg.prefix}_")

     

       72
       72
       +
       

     

       73
       73
       +
             # Count snapshots

     

       74
       74
       +
             local snapshot_count=''${#SNAPSHOTS[@]}

     

       75
       75
       +
       

     

       76
       76
       +
             # Delete old snapshots if we have more than the keep limit

     

       77
       77
       +
             if [[ $snapshot_count -gt $keep ]]; then

     

       78
       78
       +
               # Sort snapshots by date (they're named with date prefix)

     

       79
       79
       +
               readarray -t TO_DELETE < <(printf '%s\n' "''${SNAPSHOTS[@]}" | ${pkgs.coreutils}/bin/sort | ${pkgs.coreutils}/bin/head -n -$keep)

     

       80
       80
       +
               for snap in "''${TO_DELETE[@]}"; do

     

       81
       81
       +
                 echo "Removing old snapshot $snap from $vmName"

     

       82
       82
       +
       

     

       83
       83
       +
                 # Check if snapshot is internal or external

     

       84
       84
       +
                 local snapshot_location

     

       85
       85
       +
                 snapshot_location=$(${pkgs.libvirt}/bin/virsh snapshot-info "$vmName" --snapshotname "$snap" | ${pkgs.gnugrep}/bin/grep "Location:" | ${pkgs.gawk}/bin/awk '{print $2}')

     

       86
       86
       +
       

     

       87
       87
       +
                 local delete_opts=""

     

       88
       88
       +
                 [[ "$snapshot_location" == "internal" ]] && delete_opts="--metadata"

     

       89
       89
       +
       

     

       90
       90
       +
                 if ! ${pkgs.libvirt}/bin/virsh snapshot-delete "$vmName" "$snap" $delete_opts; then

     

       91
       91
       +
                   echo "Failed to remove snapshot $snap from $vmName"

     

       92
       92
       +
                   failed="$failed $vmName(cleanup)"

     

       93
       93
       +
                 fi

     

       94
       94
       +
               done

     

       95
       95
       +
             fi

     

       96
       96
       +
           }

     

       97
       97
       +
       

     

       98
       98
       +
           ${

     

       99
       99
       +
             if cfg.vms == null then

     

       100
       100
       +
               ''

     

       101
       101
       +
                 # Process all VMs

     

       102
       102
       +
                 ${pkgs.libvirt}/bin/virsh list --all --name | while read -r vm; do

     

       103
       103
       +
                   # Skip empty lines

     

       104
       104
       +
                   [ -z "$vm" ] && continue

     

       105
       105
       +
       

     

       106
       106
       +
                   # Call snap_vm function with default settings

     

       107
       107
       +
                   snap_vm "$vm" ${cfg.snapshotType} ${toString cfg.keep}

     

       108
       108
       +
                 done

     

       109
       109
       +
               ''

     

       110
       110
       +
             else

     

       111
       111
       +
               ''

     

       112
       112
       +
                 # Process specific VMs from the list

     

       113
       113
       +
                 ${lib.concatMapStrings (

     

       114
       114
       +
                   vm: with getVMConfig vm; "snap_vm '${name}' ${snapshotType} ${toString keep}\n"

     

       115
       115
       +
                 ) cfg.vms}

     

       116
       116
       +
               ''

     

       117
       117
       +
           }

     

       118
       118
       +
       

     

       119
       119
       +
           # Report any failures

     

       120
       120
       +
           if [ -n "$failed" ]; then

     

       121
       121
       +
             echo "Snapshot operation failed for:$failed"

     

       122
       122
       +
             exit 1

     

       123
       123
       +
           fi

     

       124
       124
       +
       

     

       125
       125
       +
           exit 0

     

       126
       126
       +
         '';

     

       127
       127
       +
       in

     

       128
       128
       +
       {

     

       129
       129
       +
         options = {

     

       130
       130
       +
           services.libvirtd.autoSnapshot = {

     

       131
       131
       +
             enable = lib.mkEnableOption "LibVirt VM snapshots";

     

       132
       132
       +
       

     

       133
       133
       +
             calendar = lib.mkOption {

     

       134
       134
       +
               type = lib.types.str;

     

       135
       135
       +
               default = "04:15:00";

     

       136
       136
       +
               description = ''

     

       137
       137
       +
                 When to create snapshots (systemd calendar format).

     

       138
       138
       +
                 Default is 4:15 AM.

     

       139
       139
       +
               '';

     

       140
       140
       +
             };

     

       141
       141
       +
       

     

       142
       142
       +
             prefix = lib.mkOption {

     

       143
       143
       +
               type = lib.types.str;

     

       144
       144
       +
               default = "autosnap";

     

       145
       145
       +
               description = ''

     

       146
       146
       +
                 Prefix for automatic snapshot names.

     

       147
       147
       +
                 This is used to identify and manage automatic snapshots

     

       148
       148
       +
                 separately from manual ones.

     

       149
       149
       +
               '';

     

       150
       150
       +
             };

     

       151
       151
       +
       

     

       152
       152
       +
             keep = lib.mkOption {

     

       153
       153
       +
               type = lib.types.int;

     

       154
       154
       +
               default = 2;

     

       155
       155
       +
               description = "Default number of snapshots to keep for VMs that don't specify a keep value.";

     

       156
       156
       +
             };

     

       157
       157
       +
       

     

       158
       158
       +
             snapshotType = lib.mkOption {

     

       159
       159
       +
               type = lib.types.enum [

     

       160
       160
       +
                 "internal"

     

       161
       161
       +
                 "external"

     

       162
       162
       +
               ];

     

       163
       163
       +
               default = "internal";

     

       164
       164
       +
               description = "Type of snapshot to create (internal or external).";

     

       165
       165
       +
             };

     

       166
       166
       +
       

     

       167
       167
       +
             vms = lib.mkOption {

     

       168
       168
       +
               type = lib.types.nullOr (

     

       169
       169
       +
                 lib.types.listOf (

     

       170
       170
       +
                   lib.types.oneOf [

     

       171
       171
       +
                     lib.types.str

     

       172
       172
       +
                     (lib.types.submodule {

     

       173
       173
       +
                       options = {

     

       174
       174
       +
                         name = lib.mkOption {

     

       175
       175
       +
                           type = lib.types.str;

     

       176
       176
       +
                           description = "Name of the VM";

     

       177
       177
       +
                         };

     

       178
       178
       +
                         snapshotType = lib.mkOption {

     

       179
       179
       +
                           type = lib.types.nullOr (

     

       180
       180
       +
                             lib.types.enum [

     

       181
       181
       +
                               "internal"

     

       182
       182
       +
                               "external"

     

       183
       183
       +
                             ]

     

       184
       184
       +
                           );

     

       185
       185
       +
                           default = null;

     

       186
       186
       +
                           description = ''

     

       187
       187
       +
                             Type of snapshot to create (internal or external).

     

       188
       188
       +
                             If not specified, uses global snapshotType (${toString cfg.snapshotType}).

     

       189
       189
       +
                           '';

     

       190
       190
       +
                         };

     

       191
       191
       +
                         keep = lib.mkOption {

     

       192
       192
       +
                           type = lib.types.nullOr lib.types.int;

     

       193
       193
       +
                           default = null;

     

       194
       194
       +
                           description = ''

     

       195
       195
       +
                             Number of snapshots to keep for this VM.

     

       196
       196
       +
                             If not specified, uses global keep (${toString cfg.keep}).

     

       197
       197
       +
                           '';

     

       198
       198
       +
                         };

     

       199
       199
       +
                       };

     

       200
       200
       +
                     })

     

       201
       201
       +
                   ]

     

       202
       202
       +
                 )

     

       203
       203
       +
               );

     

       204
       204
       +
               default = null;

     

       205
       205
       +
               description = ''

     

       206
       206
       +
                 If specified only the list of VMs will be snapshotted else all existing one. Each entry can be either:

     

       207
       207
       +
                 - A string (VM name, uses default settings)

     

       208
       208
       +
                 - An attribute set with VM configuration

     

       209
       209
       +
               '';

     

       210
       210
       +
               example = lib.literalExpression ''

     

       211
       211
       +
                 [

     

       212
       212
       +
                   "myvm1"              # Uses defaults

     

       213
       213
       +
                   {

     

       214
       214
       +
                     name = "myvm2";

     

       215
       215
       +
                     keep = 30;         # Override retention

     

       216
       216
       +
                   }

     

       217
       217
       +
                 ]

     

       218
       218
       +
               '';

     

       219
       219
       +
             };

     

       220
       220
       +
           };

     

       221
       221
       +
         };

     

       222
       222
       +
       

     

       223
       223
       +
         config = lib.mkIf cfg.enable {

     

       224
       224
       +
           assertions = [

     

       225
       225
       +
             {

     

       226
       226
       +
               assertion = (cfg.vms == null) || (lib.isList cfg.vms && cfg.vms != [ ]);

     

       227
       227
       +
               message = "'services.libvirtd.autoSnapshot.vms' must either be null for all VMs or a non-empty list of VM configurations";

     

       228
       228
       +
             }

     

       229
       229
       +
             {

     

       230
       230
       +
               assertion = config.virtualisation.libvirtd.enable;

     

       231
       231
       +
               message = "virtualisation.libvirtd must be enabled to use services.libvirtd.autoSnapshot";

     

       232
       232
       +
             }

     

       233
       233
       +
           ];

     

       234
       234
       +
       

     

       235
       235
       +
           systemd = {

     

       236
       236
       +
             timers.libvirtd-autosnapshot = {

     

       237
       237
       +
               description = "LibVirt VM snapshot timer";

     

       238
       238
       +
               wantedBy = [ "timers.target" ];

     

       239
       239
       +
               timerConfig = {

     

       240
       240
       +
                 OnCalendar = cfg.calendar;

     

       241
       241
       +
                 AccuracySec = "5m";

     

       242
       242
       +
                 Unit = "libvirtd-autosnapshot.service";

     

       243
       243
       +
               };

     

       244
       244
       +
             };

     

       245
       245
       +
       

     

       246
       246
       +
             services.libvirtd-autosnapshot = {

     

       247
       247
       +
               description = "LibVirt VM snapshot service";

     

       248
       248
       +
               after = [ "libvirtd.service" ];

     

       249
       249
       +
               requires = [ "libvirtd.service" ];

     

       250
       250
       +
               serviceConfig = {

     

       251
       251
       +
                 Type = "oneshot";

     

       252
       252
       +
                 User = "root";

     

       253
       253
       +
               };

     

       254
       254
       +
               script = backupScript;

     

       255
       255
       +
             };

     

       256
       256
       +
           };

     

       257
       257
       +
         };

     

       258
       258
       +
       

     

       259
       259
       +
         meta.maintainers = [ lib.maintainers._6543 ];

     

       260
       260
       +
       }

+2 -2

nixos/modules/services/desktop-managers/cosmic.nix

···

       47
       47
        
       

     

       48
       48
        
         options = {

     

       49
       49
        
           services.desktopManager.cosmic = {

     

       50
       50
       -
             enable = lib.mkEnableOption "Enable the COSMIC desktop environment";

     

       50
       50
       +
             enable = lib.mkEnableOption "COSMIC desktop environment";

     

       51
       51
        
       

     

       52
       52
       -
             showExcludedPkgsWarning = lib.mkEnableOption "Disable the warning for excluding core packages." // {

     

       52
       52
       +
             showExcludedPkgsWarning = lib.mkEnableOption "the warning for excluding core packages" // {

     

       53
       53
        
               default = true;

     

       54
       54
        
             };

     

       55
       55

+9 -3

nixos/modules/services/hardware/irqbalance.nix

···

       11
       11
        
       

     

       12
       12
        
       in

     

       13
       13
        
       {

     

       14
       14
       -
         options.services.irqbalance.enable = lib.mkEnableOption "irqbalance daemon";

     

       14
       14
       +
         options.services.irqbalance = {

     

       15
       15
       +
       

     

       16
       16
       +
           enable = lib.mkEnableOption "irqbalance daemon";

     

       17
       17
       +
       

     

       18
       18
       +
           package = lib.mkPackageOption pkgs "irqbalance" { };

     

       19
       19
       +
       

     

       20
       20
       +
         };

     

       15
       21
        
       

     

       16
       22
        
         config = lib.mkIf cfg.enable {

     

       17
       23
        
       

     

       18
       18
       -
           environment.systemPackages = [ pkgs.irqbalance ];

     

       24
       24
       +
           environment.systemPackages = [ cfg.package ];

     

       19
       25
        
       

     

       20
       26
        
           systemd.services.irqbalance.wantedBy = [ "multi-user.target" ];

     

       21
       27
        
       

     

       22
       22
       -
           systemd.packages = [ pkgs.irqbalance ];

     

       28
       28
       +
           systemd.packages = [ cfg.package ];

     

       23
       29
        
       

     

       24
       30
        
         };

     

       25
       31

+2 -2

pkgs/applications/graphics/xournalpp/default.nix

···

       30
       30
        
       

     

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "xournalpp";

     

       33
       33
       -
         version = "1.2.7";

     

       33
       33
       +
         version = "1.2.8";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchFromGitHub {

     

       36
       36
        
           owner = "xournalpp";

     

       37
       37
        
           repo = "xournalpp";

     

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

     

       39
       39
       -
           hash = "sha256-Jum9DEbwTtiT0mlrBCBJ0XHhH+DnhXf/AnthZ+qKSZg=";

     

       39
       39
       +
           hash = "sha256-yQN90R2gxUunUimZqT2kncnCNtDaLD36ctf1bU2vmIw=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         postPatch = ''

+281

pkgs/applications/misc/pagefind/cargo-lock.patch

···

       1
       1
       +
       --- a/Cargo.lock

     

       2
       2
       +
       +++ b/Cargo.lock

     

       3
       3
       +
       @@ -8,7 +8,7 @@

     

       4
       4
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       5
       5
       +
        checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"

     

       6
       6
       +
        dependencies = [

     

       7
       7
       +
       - "bitflags 2.9.3",

     

       8
       8
       +
       + "bitflags 2.9.4",

     

       9
       9
       +
         "bytes",

     

       10
       10
       +
         "futures-core",

     

       11
       11
       +
         "futures-sink",

     

       12
       12
       +
       @@ -29,7 +29,7 @@

     

       13
       13
       +
         "actix-service",

     

       14
       14
       +
         "actix-utils",

     

       15
       15
       +
         "actix-web",

     

       16
       16
       +
       - "bitflags 2.9.3",

     

       17
       17
       +
       + "bitflags 2.9.4",

     

       18
       18
       +
         "bytes",

     

       19
       19
       +
         "derive_more 2.0.1",

     

       20
       20
       +
         "futures-core",

     

       21
       21
       +
       @@ -53,7 +53,7 @@

     

       22
       22
       +
         "actix-service",

     

       23
       23
       +
         "actix-utils",

     

       24
       24
       +
         "base64 0.22.1",

     

       25
       25
       +
       - "bitflags 2.9.3",

     

       26
       26
       +
       + "bitflags 2.9.4",

     

       27
       27
       +
         "brotli",

     

       28
       28
       +
         "bytes",

     

       29
       29
       +
         "bytestring",

     

       30
       30
       +
       @@ -335,15 +335,13 @@

     

       31
       31
       +
        

     

       32
       32
       +
        [[package]]

     

       33
       33
       +
        name = "async-compression"

     

       34
       34
       +
       -version = "0.4.29"

     

       35
       35
       +
       +version = "0.4.30"

     

       36
       36
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       37
       37
       +
       -checksum = "5bee399cc3a623ec5a2db2c5b90ee0190a2260241fbe0c023ac8f7bab426aaf8"

     

       38
       38
       +
       +checksum = "977eb15ea9efd848bb8a4a1a2500347ed7f0bf794edf0dc3ddcf439f43d36b23"

     

       39
       39
       +
        dependencies = [

     

       40
       40
       +
         "compression-codecs",

     

       41
       41
       +
         "compression-core",

     

       42
       42
       +
       - "flate2",

     

       43
       43
       +
         "futures-core",

     

       44
       44
       +
       - "memchr",

     

       45
       45
       +
         "pin-project-lite",

     

       46
       46
       +
         "tokio",

     

       47
       47
       +
        ]

     

       48
       48
       +
       @@ -430,9 +428,9 @@

     

       49
       49
       +
        

     

       50
       50
       +
        [[package]]

     

       51
       51
       +
        name = "bitflags"

     

       52
       52
       +
       -version = "2.9.3"

     

       53
       53
       +
       +version = "2.9.4"

     

       54
       54
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       55
       55
       +
       -checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"

     

       56
       56
       +
       +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"

     

       57
       57
       +
        

     

       58
       58
       +
        [[package]]

     

       59
       59
       +
        name = "block-buffer"

     

       60
       60
       +
       @@ -513,10 +511,11 @@

     

       61
       61
       +
        

     

       62
       62
       +
        [[package]]

     

       63
       63
       +
        name = "cc"

     

       64
       64
       +
       -version = "1.2.34"

     

       65
       65
       +
       +version = "1.2.35"

     

       66
       66
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       67
       67
       +
       -checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"

     

       68
       68
       +
       +checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"

     

       69
       69
       +
        dependencies = [

     

       70
       70
       +
       + "find-msvc-tools",

     

       71
       71
       +
         "jobserver",

     

       72
       72
       +
         "libc",

     

       73
       73
       +
         "shlex",

     

       74
       74
       +
       @@ -566,9 +565,9 @@

     

       75
       75
       +
        

     

       76
       76
       +
        [[package]]

     

       77
       77
       +
        name = "clap"

     

       78
       78
       +
       -version = "4.5.46"

     

       79
       79
       +
       +version = "4.5.47"

     

       80
       80
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       81
       81
       +
       -checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"

     

       82
       82
       +
       +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"

     

       83
       83
       +
        dependencies = [

     

       84
       84
       +
         "clap_builder",

     

       85
       85
       +
         "clap_derive",

     

       86
       86
       +
       @@ -576,9 +575,9 @@

     

       87
       87
       +
        

     

       88
       88
       +
        [[package]]

     

       89
       89
       +
        name = "clap_builder"

     

       90
       90
       +
       -version = "4.5.46"

     

       91
       91
       +
       +version = "4.5.47"

     

       92
       92
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       93
       93
       +
       -checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"

     

       94
       94
       +
       +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"

     

       95
       95
       +
        dependencies = [

     

       96
       96
       +
         "anstream",

     

       97
       97
       +
         "anstyle",

     

       98
       98
       +
       @@ -588,9 +587,9 @@

     

       99
       99
       +
        

     

       100
       100
       +
        [[package]]

     

       101
       101
       +
        name = "clap_derive"

     

       102
       102
       +
       -version = "4.5.45"

     

       103
       103
       +
       +version = "4.5.47"

     

       104
       104
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       105
       105
       +
       -checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"

     

       106
       106
       +
       +checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"

     

       107
       107
       +
        dependencies = [

     

       108
       108
       +
         "heck 0.5.0",

     

       109
       109
       +
         "proc-macro2",

     

       110
       110
       +
       @@ -612,15 +611,13 @@

     

       111
       111
       +
        

     

       112
       112
       +
        [[package]]

     

       113
       113
       +
        name = "compression-codecs"

     

       114
       114
       +
       -version = "0.4.29"

     

       115
       115
       +
       +version = "0.4.30"

     

       116
       116
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       117
       117
       +
       -checksum = "c7eea68f0e02c2b0aa8856e9a9478444206d4b6828728e7b0697c0f8cca265cb"

     

       118
       118
       +
       +checksum = "485abf41ac0c8047c07c87c72c8fb3eb5197f6e9d7ded615dfd1a00ae00a0f64"

     

       119
       119
       +
        dependencies = [

     

       120
       120
       +
         "compression-core",

     

       121
       121
       +
         "flate2",

     

       122
       122
       +
       - "futures-core",

     

       123
       123
       +
         "memchr",

     

       124
       124
       +
       - "pin-project-lite",

     

       125
       125
       +
        ]

     

       126
       126
       +
        

     

       127
       127
       +
        [[package]]

     

       128
       128
       +
       @@ -828,9 +825,9 @@

     

       129
       129
       +
        

     

       130
       130
       +
        [[package]]

     

       131
       131
       +
        name = "deranged"

     

       132
       132
       +
       -version = "0.4.0"

     

       133
       133
       +
       +version = "0.5.3"

     

       134
       134
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       135
       135
       +
       -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"

     

       136
       136
       +
       +checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"

     

       137
       137
       +
        dependencies = [

     

       138
       138
       +
         "powerfmt",

     

       139
       139
       +
        ]

     

       140
       140
       +
       @@ -1077,6 +1074,12 @@

     

       141
       141
       +
        ]

     

       142
       142
       +
        

     

       143
       143
       +
        [[package]]

     

       144
       144
       +
       +name = "find-msvc-tools"

     

       145
       145
       +
       +version = "0.1.0"

     

       146
       146
       +
       +source = "registry+https://github.com/rust-lang/crates.io-index"

     

       147
       147
       +
       +checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"

     

       148
       148
       +
       +

     

       149
       149
       +
       +[[package]]

     

       150
       150
       +
        name = "flate2"

     

       151
       151
       +
        version = "1.1.2"

     

       152
       152
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       153
       153
       +
       @@ -1675,7 +1678,7 @@

     

       154
       154
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       155
       155
       +
        checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"

     

       156
       156
       +
        dependencies = [

     

       157
       157
       +
       - "bitflags 2.9.3",

     

       158
       158
       +
       + "bitflags 2.9.4",

     

       159
       159
       +
         "cfg-if",

     

       160
       160
       +
         "libc",

     

       161
       161
       +
        ]

     

       162
       162
       +
       @@ -1813,9 +1816,9 @@

     

       163
       163
       +
        

     

       164
       164
       +
        [[package]]

     

       165
       165
       +
        name = "lexical-core"

     

       166
       166
       +
       -version = "1.0.0"

     

       167
       167
       +
       +version = "1.0.5"

     

       168
       168
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       169
       169
       +
       -checksum = "c26c7da389462e0173a0e9580b3cf7b6a10074e93df78b2768d3ee9fa6d54fc4"

     

       170
       170
       +
       +checksum = "b765c31809609075565a70b4b71402281283aeda7ecaf4818ac14a7b2ade8958"

     

       171
       171
       +
        dependencies = [

     

       172
       172
       +
         "lexical-parse-float",

     

       173
       173
       +
         "lexical-parse-integer",

     

       174
       174
       +
       @@ -1911,7 +1914,7 @@

     

       175
       175
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       176
       176
       +
        checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"

     

       177
       177
       +
        dependencies = [

     

       178
       178
       +
       - "bitflags 2.9.3",

     

       179
       179
       +
       + "bitflags 2.9.4",

     

       180
       180
       +
         "libc",

     

       181
       181
       +
         "redox_syscall",

     

       182
       182
       +
        ]

     

       183
       183
       +
       @@ -2096,7 +2099,7 @@

     

       184
       184
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       185
       185
       +
        checksum = "1610d7994d67a05bb35861cd733b069b1171de8693bc8452849c59361a1bb87b"

     

       186
       186
       +
        dependencies = [

     

       187
       187
       +
       - "bitflags 2.9.3",

     

       188
       188
       +
       + "bitflags 2.9.4",

     

       189
       189
       +
         "cfg-if",

     

       190
       190
       +
         "cssparser",

     

       191
       191
       +
         "encoding_rs",

     

       192
       192
       +
       @@ -2152,22 +2155,22 @@

     

       193
       193
       +
        

     

       194
       194
       +
        [[package]]

     

       195
       195
       +
        name = "minicbor"

     

       196
       196
       +
       -version = "0.19.1"

     

       197
       197
       +
       +version = "2.1.1"

     

       198
       198
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       199
       199
       +
       -checksum = "d7005aaf257a59ff4de471a9d5538ec868a21586534fff7f85dd97d4043a6139"

     

       200
       200
       +
       +checksum = "4f182275033b808ede9427884caa8e05fa7db930801759524ca7925bd8aa7a82"

     

       201
       201
       +
        dependencies = [

     

       202
       202
       +
         "minicbor-derive",

     

       203
       203
       +
        ]

     

       204
       204
       +
        

     

       205
       205
       +
        [[package]]

     

       206
       206
       +
        name = "minicbor-derive"

     

       207
       207
       +
       -version = "0.13.0"

     

       208
       208
       +
       +version = "0.18.2"

     

       209
       209
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       210
       210
       +
       -checksum = "1154809406efdb7982841adb6311b3d095b46f78342dd646736122fe6b19e267"

     

       211
       211
       +
       +checksum = "b17290c95158a760027059fe3f511970d6857e47ff5008f9e09bffe3d3e1c6af"

     

       212
       212
       +
        dependencies = [

     

       213
       213
       +
         "proc-macro2",

     

       214
       214
       +
         "quote",

     

       215
       215
       +
       - "syn 1.0.109",

     

       216
       216
       +
       + "syn 2.0.106",

     

       217
       217
       +
        ]

     

       218
       218
       +
        

     

       219
       219
       +
        [[package]]

     

       220
       220
       +
       @@ -2728,7 +2731,7 @@

     

       221
       221
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       222
       222
       +
        checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"

     

       223
       223
       +
        dependencies = [

     

       224
       224
       +
       - "bitflags 2.9.3",

     

       225
       225
       +
       + "bitflags 2.9.4",

     

       226
       226
       +
        ]

     

       227
       227
       +
        

     

       228
       228
       +
        [[package]]

     

       229
       229
       +
       @@ -2878,7 +2881,7 @@

     

       230
       230
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       231
       231
       +
        checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"

     

       232
       232
       +
        dependencies = [

     

       233
       233
       +
       - "bitflags 2.9.3",

     

       234
       234
       +
       + "bitflags 2.9.4",

     

       235
       235
       +
         "errno",

     

       236
       236
       +
         "libc",

     

       237
       237
       +
         "linux-raw-sys",

     

       238
       238
       +
       @@ -3291,12 +3294,11 @@

     

       239
       239
       +
        

     

       240
       240
       +
        [[package]]

     

       241
       241
       +
        name = "time"

     

       242
       242
       +
       -version = "0.3.41"

     

       243
       243
       +
       +version = "0.3.43"

     

       244
       244
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       245
       245
       +
       -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"

     

       246
       246
       +
       +checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"

     

       247
       247
       +
        dependencies = [

     

       248
       248
       +
         "deranged",

     

       249
       249
       +
       - "itoa 1.0.15",

     

       250
       250
       +
         "num-conv",

     

       251
       251
       +
         "powerfmt",

     

       252
       252
       +
         "serde",

     

       253
       253
       +
       @@ -3306,15 +3308,15 @@

     

       254
       254
       +
        

     

       255
       255
       +
        [[package]]

     

       256
       256
       +
        name = "time-core"

     

       257
       257
       +
       -version = "0.1.4"

     

       258
       258
       +
       +version = "0.1.6"

     

       259
       259
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       260
       260
       +
       -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"

     

       261
       261
       +
       +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"

     

       262
       262
       +
        

     

       263
       263
       +
        [[package]]

     

       264
       264
       +
        name = "time-macros"

     

       265
       265
       +
       -version = "0.2.22"

     

       266
       266
       +
       +version = "0.2.24"

     

       267
       267
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       268
       268
       +
       -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"

     

       269
       269
       +
       +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"

     

       270
       270
       +
        dependencies = [

     

       271
       271
       +
         "num-conv",

     

       272
       272
       +
         "time-core",

     

       273
       273
       +
       @@ -3429,7 +3431,7 @@

     

       274
       274
       +
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       275
       275
       +
        checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"

     

       276
       276
       +
        dependencies = [

     

       277
       277
       +
       - "bitflags 2.9.3",

     

       278
       278
       +
       + "bitflags 2.9.4",

     

       279
       279
       +
         "bytes",

     

       280
       280
       +
         "futures-util",

     

       281
       281
       +
         "http 1.3.1",

+115 -37

pkgs/applications/misc/pagefind/default.nix

···

       23
       23
        
         # the lindera-unidic v0.32.2 crate uses [1] an outdated unidic-mecab fork [2] and builds it in pure rust

     

       24
       24
        
         # [1] https://github.com/lindera/lindera/blob/v0.32.2/lindera-unidic/build.rs#L5-L11

     

       25
       25
        
         # [2] https://github.com/lindera/unidic-mecab

     

       26
       26
       -
         lindera-unidic-src = fetchurl {

     

       27
       27
       -
           url = "https://dlwqk3ibdg1xh.cloudfront.net/unidic-mecab-2.1.2.tar.gz";

     

       28
       28
       -
           hash = "sha256-JKx1/k5E2XO1XmWEfDX6Suwtt6QaB7ScoSUUbbn8EYk=";

     

       26
       26
       +
         # To find these urls:

     

       27
       27
       +
         #   rg -A5 download_urls $(nix-build . -A pagefind.cargoDeps --no-out-link)/lindera-*/build.rs

     

       28
       28
       +
         lindera-srcs = {

     

       29
       29
       +
           unidic-mecab = fetchurl {

     

       30
       30
       +
             passthru.vendorDir = "lindera-unidic-*";

     

       31
       31
       +
             url = "https://Lindera.dev/unidic-mecab-2.1.2.tar.gz";

     

       32
       32
       +
             hash = "sha256-JKx1/k5E2XO1XmWEfDX6Suwtt6QaB7ScoSUUbbn8EYk=";

     

       33
       33
       +
           };

     

       34
       34
       +
           mecab-ko-dic = fetchurl {

     

       35
       35
       +
             passthru.vendorDir = "lindera-ko-dic-*";

     

       36
       36
       +
             url = "https://Lindera.dev/mecab-ko-dic-2.1.1-20180720.tar.gz";

     

       37
       37
       +
             hash = "sha256-cCztIcYWfp2a68Z0q17lSvWNREOXXylA030FZ8AgWRo=";

     

       38
       38
       +
           };

     

       39
       39
       +
           ipadic = fetchurl {

     

       40
       40
       +
             passthru.vendorDir = "lindera-ipadic-0.*";

     

       41
       41
       +
             url = "https://Lindera.dev/mecab-ipadic-2.7.0-20070801.tar.gz";

     

       42
       42
       +
             hash = "sha256-CZ5G6A1V58DWkGeDr/cTdI4a6Q9Gxe+W7BU7vwm/VVA=";

     

       43
       43
       +
           };

     

       44
       44
       +
           cc-cedict = fetchurl {

     

       45
       45
       +
             passthru.vendorDir = "lindera-cc-cedict-*";

     

       46
       46
       +
             url = "https://lindera.dev/CC-CEDICT-MeCab-0.1.0-20200409.tar.gz";

     

       47
       47
       +
             hash = "sha256-7Tz54+yKgGR/DseD3Ana1DuMytLplPXqtv8TpB0JFsg=";

     

       48
       48
       +
           };

     

       49
       49
       +
           ipadic-neologd = fetchurl {

     

       50
       50
       +
             passthru.vendorDir = "lindera-ipadic-neologd-*";

     

       51
       51
       +
             url = "https://lindera.dev/mecab-ipadic-neologd-0.0.7-20200820.tar.gz";

     

       52
       52
       +
             hash = "sha256-1VwCwgSTKFixeQUFVCdqMzZKne/+FTgM56xT7etqjqI=";

     

       53
       53
       +
           };

     

       29
       54
        
         };

     

       30
       55
        
       

     

       31
       56
        
       in

     

       32
       57
        
       

     

       33
       33
       -
       rustPlatform.buildRustPackage rec {

     

       58
       58
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       34
       59
        
         pname = "pagefind";

     

       35
       35
       -
         version = "1.3.0";

     

       60
       60
       +
         version = "1.4.0";

     

       36
       61
        
       

     

       37
       62
        
         src = fetchFromGitHub {

     

       38
       38
       -
           owner = "cloudcannon";

     

       63
       63
       +
           owner = "Pagefind";

     

       39
       64
        
           repo = "pagefind";

     

       40
       40
       -
           tag = "v${version}";

     

       41
       41
       -
           hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk=";

     

       65
       65
       +
           tag = "v${finalAttrs.version}";

     

       66
       66
       +
           hash = "sha256-+jArZueDqpJQKg3fKdJjeQQL+egyR6Zi6wqPMZoFgyk=";

     

       42
       67
        
         };

     

       43
       68
        
       

     

       44
       44
       -
         cargoHash = "sha256-e1JSK8RnBPGcAmgxJZ7DaYhMMaUqO412S9YvaqXll3E=";

     

       69
       69
       +
         cargoPatches = [ ./cargo-lock.patch ];

     

       70
       70
       +
         cargoHash = "sha256-zbo8NkB9umpNDvkhKXpOdt8hJn+d+nrTXMaUghmIPrg=";

     

       45
       71
        
       

     

       72
       72
       +
         env.cargoDeps_web = rustPlatform.fetchCargoVendor {

     

       73
       73
       +
           name = "cargo-deps-web-${finalAttrs.version}";

     

       74
       74
       +
           inherit (finalAttrs) src;

     

       75
       75
       +
           sourceRoot = "${finalAttrs.src.name}/pagefind_web";

     

       76
       76
       +
           hash = "sha256-DaipINtwePA03YdbSzh6EjH4Q13P3CB9lwcmTOR54dM=";

     

       77
       77
       +
         };

     

       46
       78
        
         env.npmDeps_web_js = fetchNpmDeps {

     

       47
       47
       -
           name = "npm-deps-web-js";

     

       48
       48
       -
           src = "${src}/pagefind_web_js";

     

       49
       49
       -
           hash = "sha256-1gdVBCxxLEGFihIxoSSgxw/tMyVgwe7HFG/JjEfYVnQ=";

     

       79
       79
       +
           name = "pagefind-npm-deps-web-js-${finalAttrs.version}";

     

       80
       80
       +
           inherit (finalAttrs) src;

     

       81
       81
       +
           sourceRoot = "${finalAttrs.src.name}/pagefind_web_js";

     

       82
       82
       +
           hash = "sha256-whpmjNKdiMxNfg7fRIWUPdyRWqsEphhqvQfiM65GYDs=";

     

       50
       83
        
         };

     

       51
       84
        
         env.npmDeps_ui_default = fetchNpmDeps {

     

       52
       52
       -
           name = "npm-deps-ui-default";

     

       53
       53
       -
           src = "${src}/pagefind_ui/default";

     

       85
       85
       +
           name = "pagefind-npm-deps-ui-default-${finalAttrs.version}";

     

       86
       86
       +
           inherit (finalAttrs) src;

     

       87
       87
       +
           sourceRoot = "${finalAttrs.src.name}/pagefind_ui/default";

     

       54
       88
        
           hash = "sha256-voCs49JneWYE1W9U7aB6G13ypH6JqathVDeF58V57U8=";

     

       55
       89
        
         };

     

       56
       90
        
         env.npmDeps_ui_modular = fetchNpmDeps {

     

       57
       57
       -
           name = "npm-deps-ui-modular";

     

       58
       58
       -
           src = "${src}/pagefind_ui/modular";

     

       59
       59
       -
           hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4=";

     

       91
       91
       +
           name = "pagefind-npm-deps-ui-modular-${finalAttrs.version}";

     

       92
       92
       +
           inherit (finalAttrs) src;

     

       93
       93
       +
           sourceRoot = "${finalAttrs.src.name}/pagefind_ui/modular";

     

       94
       94
       +
           hash = "sha256-4d85V2X1doq3G8okgYSXOMuQDoAXCgtAtegFEPr+Wno=";

     

       60
       95
        
         };

     

       61
       61
       -
         env.cargoDeps_web = rustPlatform.fetchCargoVendor {

     

       62
       62
       -
           name = "cargo-deps-web";

     

       63
       63
       -
           src = "${src}/pagefind_web/";

     

       64
       64
       -
           hash = "sha256-xFVMWX3q3za1w8v58Eysk6vclPd4qpCuQMjMcwwHoh0=";

     

       96
       96
       +
         env.npmDeps_playground = fetchNpmDeps {

     

       97
       97
       +
           name = "pagefind-npm-deps-playground-${finalAttrs.version}";

     

       98
       98
       +
           inherit (finalAttrs) src;

     

       99
       99
       +
           sourceRoot = "${finalAttrs.src.name}/pagefind_playground";

     

       100
       100
       +
           hash = "sha256-npo8MV6AAuQ/mGC9iu3bR7pjGoI7NgxuIeh+H3oz7Y8=";

     

       65
       101
        
         };

     

       66
       102
        
       

     

       67
       67
       -
         env.GIT_VERSION = version;

     

       103
       103
       +
         env.GIT_VERSION = finalAttrs.version;

     

       68
       104
        
       

     

       69
       105
        
         postPatch = ''

     

       70
       106
        
           # Set the correct version, e.g. for `pagefind --version`

     

       71
       107
        
           node .backstage/version.cjs

     

       72
       108
        
       

     

       109
       109
       +
           # Tricky way to run the cargo setup a second time

     

       110
       110
       +
           (

     

       111
       111
       +
             cd pagefind_web

     

       112
       112
       +
             cargoDeps=$cargoDeps_web cargoSetupPostUnpackHook

     

       113
       113
       +
             cargoDeps=$cargoDeps_web cargoSetupPostPatchHook

     

       114
       114
       +
           )

     

       115
       115
       +
       

     

       73
       116
        
           # Tricky way to run npmConfigHook multiple times

     

       74
       117
        
           (

     

       75
       118
        
             local postPatchHooks=() # written to by npmConfigHook

     
···

       77
       120
        
             npmRoot=pagefind_web_js     npmDeps=$npmDeps_web_js     npmConfigHook

     

       78
       121
        
             npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook

     

       79
       122
        
             npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook

     

       80
       80
       -
           )

     

       81
       81
       -
           (

     

       82
       82
       -
             cd pagefind_web

     

       83
       83
       -
             cargoDeps=$cargoDeps_web cargoSetupPostUnpackHook

     

       84
       84
       -
             cargoDeps=$cargoDeps_web cargoSetupPostPatchHook

     

       123
       123
       +
             npmRoot=pagefind_playground npmDeps=$npmDeps_playground npmConfigHook

     

       85
       124
        
           )

     

       86
       125
        
       

     

       87
       87
       -
           # patch a build-time dependency download

     

       126
       126
       +
           # patch build-time dependency downloads

     

       88
       127
        
           (

     

       89
       89
       -
             patch -d $cargoDepsCopy/lindera-assets-*/ -p1 < ${./lindera-assets-support-file-paths.patch}

     

       128
       128
       +
             # add support for file:// urls

     

       129
       129
       +
             patch -d $cargoDepsCopy/lindera-dictionary-*/ -p1 < ${./lindera-dictionary-support-file-paths.patch}

     

       90
       130
        
       

     

       91
       91
       -
             substituteInPlace $cargoDepsCopy/lindera-unidic-*/build.rs --replace-fail \

     

       92
       92
       -
                 "${lindera-unidic-src.url}" \

     

       93
       93
       -
                 "file://${lindera-unidic-src}"

     

       131
       131
       +
             # patch urls

     

       132
       132
       +
             ${lib.pipe finalAttrs.passthru.lindera-srcs [

     

       133
       133
       +
               (lib.mapAttrsToList (

     

       134
       134
       +
                 key: src: ''

     

       135
       135
       +
                   # compgen is only in bashInteractive

     

       136
       136
       +
                   declare -a expanded_glob=($cargoDepsCopy/${src.vendorDir}/build.rs)

     

       137
       137
       +
                   if [[ "''${#expanded_glob[@]}" -eq 0 ]]; then

     

       138
       138
       +
                     echo >&2 "ERROR: '$cargoDepsCopy/${src.vendorDir}/build.rs' not found! (pagefind.passthru.lindera-srcs.${key})"

     

       139
       139
       +
                     false

     

       140
       140
       +
                   elif [[ "''${#expanded_glob[@]}" -gt 1 ]]; then

     

       141
       141
       +
                     echo >&2 "ERROR: '$cargoDepsCopy/${src.vendorDir}/build.rs' matches more than one file! (pagefind.passthru.lindera-srcs.${key})"

     

       142
       142
       +
                     printf >&2 "match: %s\n" "''${expanded_glob[@]}"

     

       143
       143
       +
                     false

     

       144
       144
       +
                   fi

     

       145
       145
       +
                   echo "patching $cargoDepsCopy/${src.vendorDir}/build.rs..."

     

       146
       146
       +
                   substituteInPlace $cargoDepsCopy/${src.vendorDir}/build.rs --replace-fail "${src.url}" "file://${src}"

     

       147
       147
       +
                   unset expanded_glob

     

       148
       148
       +
                 ''

     

       149
       149
       +
               ))

     

       150
       150
       +
               lib.concatLines

     

       151
       151
       +
             ]}

     

       94
       152
        
           )

     

       153
       153
       +
       

     

       154
       154
       +
           # nightly-only feature

     

       155
       155
       +
           substituteInPlace pagefind_web/local_build.sh \

     

       156
       156
       +
             --replace-fail ' -Z build-std=panic_abort,std' "" \

     

       157
       157
       +
             --replace-fail ' -Z build-std-features=panic_immediate_abort' ""

     

       95
       158
        
         '';

     

       96
       159
        
       

     

       97
       160
        
         __darwinAllowLocalNetworking = true;

     
···

       114
       177
        
         preBuild = ''

     

       115
       178
        
           export HOME=$(mktemp -d)

     

       116
       179
        
       

     

       117
       117
       -
           echo entering pagefind_web_js...

     

       180
       180
       +
           echo Entering ./pagefind_web_js

     

       118
       181
        
           (

     

       119
       182
        
             cd pagefind_web_js

     

       120
       183
        
             npm run build-coupled

     

       121
       184
        
           )

     

       122
       185
        
       

     

       123
       123
       -
           echo entering pagefind_web...

     

       186
       186
       +
           echo Entering ./pagefind_web

     

       124
       187
        
           (

     

       125
       188
        
             cd pagefind_web

     

       126
       189
        
             bash ./local_build.sh

     

       127
       190
        
           )

     

       128
       191
        
       

     

       129
       129
       -
           echo entering pagefind_ui/default...

     

       192
       192
       +
           echo Entering ./pagefind_ui/default

     

       130
       193
        
           (

     

       131
       194
        
             cd pagefind_ui/default

     

       132
       195
        
             npm run build

     

       133
       196
        
           )

     

       134
       197
        
       

     

       135
       135
       -
           echo entering pagefind_ui/modular...

     

       198
       198
       +
           echo Entering ./pagefind_ui/modular

     

       136
       199
        
           (

     

       137
       200
        
             cd pagefind_ui/modular

     

       138
       201
        
             npm run build

     

       139
       202
        
           )

     

       203
       203
       +
       

     

       204
       204
       +
           echo Entering ./pagefind_playground

     

       205
       205
       +
           (

     

       206
       206
       +
             cd pagefind_playground

     

       207
       207
       +
             npm run build

     

       208
       208
       +
           )

     

       140
       209
        
         '';

     

       141
       210
        
       

     

       211
       211
       +
         # always build extended

     

       142
       212
        
         buildFeatures = [ "extended" ];

     

       143
       213
        
       

     

       144
       214
        
         doInstallCheck = true;

     
···

       147
       217
        
           versionCheckHook

     

       148
       218
        
         ];

     

       149
       219
        
       

     

       220
       220
       +
         passthru = {

     

       221
       221
       +
           inherit lindera-srcs;

     

       222
       222
       +
           tests.non-extended = finalAttrs.finalPackage.overrideAttrs {

     

       223
       223
       +
             buildFeatures = [ ];

     

       224
       224
       +
           };

     

       225
       225
       +
         };

     

       226
       226
       +
       

     

       150
       227
        
         meta = {

     

       151
       228
        
           description = "Generate low-bandwidth search index for your static website";

     

       152
       229
        
           homepage = "https://pagefind.app/";

     

       230
       230
       +
           changelog = "https://github.com/Pagefind/pagefind/releases/tag/v${finalAttrs.version}";

     

       153
       231
        
           license = lib.licenses.mit;

     

       154
       232
        
           maintainers = with lib.maintainers; [ pbsds ];

     

       155
       233
        
           platforms = lib.platforms.unix;

     

       156
       234
        
           mainProgram = "pagefind";

     

       157
       235
        
         };

     

       158
       158
       -
       }

     

       236
       236
       +
       })

-30

pkgs/applications/misc/pagefind/lindera-assets-support-file-paths.patch

···

       1
       1
       -
       diff --git a/src/lib.rs b/src/lib.rs

     

       2
       2
       -
       index 6f86cc4..a9ca418 100644

     

       3
       3
       -
       --- a/src/lib.rs

     

       4
       4
       -
       +++ b/src/lib.rs

     

       5
       5
       -
       @@ -128,12 +128,17 @@ pub fn fetch(params: FetchParams, builder: impl DictionaryBuilder) -> Result<(),

     

       6
       6
       -
                // copy(&source_path, &source_path_for_build)?;

     

       7
       7
       -
                let tmp_path = Path::new(&build_dir).join(params.file_name.to_owned() + ".download");

     

       8
       8
       -
        

     

       9
       9
       -
       +        if let Some(path) = params.download_url.strip_prefix("file://") {

     

       10
       10
       -
       +            std::fs::copy(path, &tmp_path)?;

     

       11
       11
       -
       +        }

     

       12
       12
       -
       +        else {

     

       13
       13
       -
                // Download a tarball

     

       14
       14
       -
                let resp = ureq::get(params.download_url).call()?;

     

       15
       15
       -
                let mut dest = File::create(&tmp_path)?;

     

       16
       16
       -
        

     

       17
       17
       -
                io::copy(&mut resp.into_reader(), &mut dest)?;

     

       18
       18
       -
                dest.flush()?;

     

       19
       19
       -
       +        }

     

       20
       20
       -
        

     

       21
       21
       -
                rename(tmp_path, source_path_for_build).expect("Failed to rename temporary file");

     

       22
       22
       -
        

     

       23
       23
       -
       @@ -153,7 +158,6 @@ pub fn fetch(params: FetchParams, builder: impl DictionaryBuilder) -> Result<(),

     

       24
       24
       -
                archive.unpack(&tmp_extract_path)?;

     

       25
       25
       -
                rename(tmp_extracted_path, &input_dir).expect("Failed to rename archive directory");

     

       26
       26
       -
                let _ = std::fs::remove_dir_all(&tmp_extract_path);

     

       27
       27
       -
       -        drop(dest);

     

       28
       28
       -
                let _ = std::fs::remove_file(source_path_for_build);

     

       29
       29
       -
            }

     

       30
       30
       -

+41

pkgs/applications/misc/pagefind/lindera-dictionary-support-file-paths.patch

···

       1
       1
       +
       diff --git a/src/assets.rs b/src/assets.rs

     

       2
       2
       +
       index 58afc4c..d5813e6 100644

     

       3
       3
       +
       --- a/src/assets.rs

     

       4
       4
       +
       +++ b/src/assets.rs

     

       5
       5
       +
       @@ -93,6 +93,28 @@ async fn download_with_retry(

     

       6
       6
       +
        

     

       7
       7
       +
                for url in urls {

     

       8
       8
       +
                    debug!("Attempting to download from {}", url);

     

       9
       9
       +
       +            if let Some(path) = url.strip_prefix("file://") {

     

       10
       10
       +
       +                let content = std::fs::read(path)?;

     

       11
       11
       +
       +

     

       12
       12
       +
       +                // Calculate MD5 hash

     

       13
       13
       +
       +                let mut context = Context::new();

     

       14
       14
       +
       +                context.consume(&content);

     

       15
       15
       +
       +                let actual_md5 = format!("{:x}", context.compute());

     

       16
       16
       +
       +                debug!("Expected MD5: {}", expected_md5);

     

       17
       17
       +
       +                debug!("Actual   MD5: {}", actual_md5);

     

       18
       18
       +
       +

     

       19
       19
       +
       +                if actual_md5 == expected_md5 {

     

       20
       20
       +
       +                    debug!("MD5 check passed from {}", url);

     

       21
       21
       +
       +                    return Ok(content);

     

       22
       22
       +
       +                } else {

     

       23
       23
       +
       +                    warn!(

     

       24
       24
       +
       +                        "MD5 mismatch from {}! Expected {}, got {}",

     

       25
       25
       +
       +                        url, expected_md5, actual_md5

     

       26
       26
       +
       +                    );

     

       27
       27
       +
       +                    // continue to next url

     

       28
       28
       +
       +                }

     

       29
       29
       +
       +            }

     

       30
       30
       +
       +            else {

     

       31
       31
       +
                    match client.get(url).send().await {

     

       32
       32
       +
                        Ok(resp) if resp.status().is_success() => {

     

       33
       33
       +
                            debug!("HTTP download successful from {}", url);

     

       34
       34
       +
       @@ -127,6 +149,7 @@ async fn download_with_retry(

     

       35
       35
       +
                            // continue to next url

     

       36
       36
       +
                        }

     

       37
       37
       +
                    }

     

       38
       38
       +
       +            }

     

       39
       39
       +
                }

     

       40
       40
       +
        

     

       41
       41
       +
                sleep(Duration::from_secs(1)).await;

+2 -2

pkgs/applications/misc/syncthingtray/default.nix

···

       38
       38
        
       }:

     

       39
       39
        
       

     

       40
       40
        
       stdenv.mkDerivation (finalAttrs: {

     

       41
       41
       -
         version = "2.0.0";

     

       41
       41
       +
         version = "2.0.1";

     

       42
       42
        
         pname = "syncthingtray";

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

     

       45
       45
        
           owner = "Martchus";

     

       46
       46
        
           repo = "syncthingtray";

     

       47
       47
        
           rev = "v${finalAttrs.version}";

     

       48
       48
       -
           hash = "sha256-OtAHejLNHumlZUPy3HRKF/lne3y2VXul1FlAMyrz6dc=";

     

       48
       48
       +
           hash = "sha256-57Mq6zdSqPIK88E/CQkfwQe+Rf4kFTZ2o2shtPBWgRE=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         buildInputs = [

+14 -14

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       9
       9
        
         versions =

     

       10
       10
        
           if stdenv.hostPlatform.isLinux then

     

       11
       11
        
             {

     

       12
       12
       -
               stable = "0.0.107";

     

       13
       13
       -
               ptb = "0.0.158";

     

       14
       14
       -
               canary = "0.0.748";

     

       15
       15
       -
               development = "0.0.84";

     

       12
       12
       +
               stable = "0.0.108";

     

       13
       13
       +
               ptb = "0.0.159";

     

       14
       14
       +
               canary = "0.0.751";

     

       15
       15
       +
               development = "0.0.85";

     

       16
       16
        
             }

     

       17
       17
        
           else

     

       18
       18
        
             {

     

       19
       19
       -
               stable = "0.0.356";

     

       20
       20
       -
               ptb = "0.0.186";

     

       21
       21
       -
               canary = "0.0.844";

     

       19
       19
       +
               stable = "0.0.359";

     

       20
       20
       +
               ptb = "0.0.190";

     

       21
       21
       +
               canary = "0.0.857";

     

       22
       22
        
               development = "0.0.97";

     

       23
       23
        
             };

     

       24
       24
        
         version = versions.${branch};

     
···

       26
       26
        
           x86_64-linux = {

     

       27
       27
        
             stable = fetchurl {

     

       28
       28
        
               url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";

     

       29
       29
       -
               hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo=";

     

       29
       29
       +
               hash = "sha256-hKFhylEovj89WxpTexkzR9C6tN47V9iDKQYpCjgojvw=";

     

       30
       30
        
             };

     

       31
       31
        
             ptb = fetchurl {

     

       32
       32
        
               url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

     

       33
       33
       -
               hash = "sha256-LPzdVaXQXmnlD274ESZ2/AceXcoazReA1HemuTcdj1o=";

     

       33
       33
       +
               hash = "sha256-Rw3ppCZTuNG+eAB02goLL9yT1ldZhrBD50Tirzuo1CQ=";

     

       34
       34
        
             };

     

       35
       35
        
             canary = fetchurl {

     

       36
       36
        
               url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       37
       37
       -
               hash = "sha256-kjq8liiC/Op+Ik+r9RSl/tPLDlWiUyIb3cOjAxWpkO0=";

     

       37
       37
       +
               hash = "sha256-cE1BiWwZGrSzvdKDSiAs+Dz/nnxhuVs4JQYMwwY/F5k=";

     

       38
       38
        
             };

     

       39
       39
        
             development = fetchurl {

     

       40
       40
        
               url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

     

       41
       41
       -
               hash = "sha256-0SmCBi/fl77m5PzI5O38CpAoIzyQc+eRUKLyKVMQ6Dc=";

     

       41
       41
       +
               hash = "sha256-GW5LrPMr0uS5ko+FwKfU++4hhzqBQ6FDYBoM2fxDQcE=";

     

       42
       42
        
             };

     

       43
       43
        
           };

     

       44
       44
        
           x86_64-darwin = {

     

       45
       45
        
             stable = fetchurl {

     

       46
       46
        
               url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";

     

       47
       47
       -
               hash = "sha256-oATRY8cpdpTZr7iMQ/SIvSbXDxhsCviQQFqytDG9u/c=";

     

       47
       47
       +
               hash = "sha256-bxKzOPiljJaY78aiX2BklfMHXgwKrLuWEQVmrNk3TdE=";

     

       48
       48
        
             };

     

       49
       49
        
             ptb = fetchurl {

     

       50
       50
        
               url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

     

       51
       51
       -
               hash = "sha256-f5qoDpwcp1qBDyD+0QPE7KU6pJLALZPO7auGoo3JJiA=";

     

       51
       51
       +
               hash = "sha256-2Y95SW9b6SeZdeTUmIedAQYJ/5WylL4soGAbUSdDyuQ=";

     

       52
       52
        
             };

     

       53
       53
        
             canary = fetchurl {

     

       54
       54
        
               url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

     

       55
       55
       -
               hash = "sha256-i5ffkto9QoMorqsLQSUF9KnSHOK0tEFcPqkhSJ9cV+s=";

     

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

     

       56
       56
        
             };

     

       57
       57
        
             development = fetchurl {

     

       58
       58
        
               url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

+12 -10

pkgs/applications/office/libreoffice/default.nix

···

       35
       35
        
         cairo,

     

       36
       36
        
         which,

     

       37
       37
        
         icu,

     

       38
       38
       -
         boost,

     

       39
       38
        
         jdk21,

     

       40
       39
        
         ant,

     

       41
       40
        
         cups,

     
···

       71
       70
        
         libcdr,

     

       72
       71
        
         lcms2,

     

       73
       72
        
         unixODBC,

     

       74
       74
       -
         mdds,

     

       75
       73
        
         sane-backends,

     

       76
       74
        
         mythes,

     

       77
       75
        
         libexttextcat,

     
···

       99
       97
        
         abseil-cpp,

     

       100
       98
        
         libepubgen,

     

       101
       99
        
         libetonyek,

     

       102
       102
       -
         liborcus,

     

       103
       100
        
         libpng,

     

       104
       101
        
         libxcrypt,

     

       105
       102
        
         langs ? [

     
···

       316
       313
        
           # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking

     

       317
       314
        
           ./readd-explicit-zlib-link.patch

     

       318
       315
        
       

     

       316
       316
       +
         ]

     

       317
       317
       +
         ++ lib.optionals (lib.versionOlder version "25.8") [

     

       319
       318
        
           # Backport patch to fix build with Poppler 25.05

     

       320
       320
       -
           # FIXME: conditionalize/remove as upstream updates

     

       321
       319
        
           (fetchpatch2 {

     

       322
       320
        
             url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";

     

       323
       321
        
             includes = [ "sdext/*" ];

     
···

       389
       387
        
             coinmp

     

       390
       388
        
             abseil-cpp

     

       391
       389
        
             bluez5

     

       392
       392
       -
             boost

     

       393
       390
        
             box2d_2

     

       394
       391
        
             cairo

     

       395
       392
        
             clucene_core_2

     
···

       439
       436
        
             libmspack

     

       440
       437
        
             libmwaw

     

       441
       438
        
             libodfgen

     

       442
       442
       -
             liborcus

     

       443
       439
        
             xorg.libpthreadstubs

     

       444
       440
        
             librdf_redland

     

       445
       441
        
             librevenge

     
···

       456
       452
        
             libzmf

     

       457
       453
        
             libwebp

     

       458
       454
        
             lp_solve

     

       459
       459
       -
             mdds

     

       460
       455
        
             mythes

     

       461
       456
        
             ncurses

     

       462
       457
        
             neon

     
···

       521
       516
        
           "--without-buildconfig-recorded"

     

       522
       517
        
       

     

       523
       518
        
           (lib.withFeature withHelp "help")

     

       524
       524
       -
           "--with-boost=${getDev boost}"

     

       525
       525
       -
           "--with-boost-libdir=${getLib boost}/lib"

     

       526
       519
        
           "--with-beanshell-jar=${bsh}"

     

       527
       520
        
           "--with-vendor=NixOS"

     

       528
       521
        
           "--disable-report-builder"

     
···

       562
       555
        
           "--with-system-libs"

     

       563
       556
        
           "--with-system-libwps"

     

       564
       557
        
           "--with-system-lpsolve"

     

       565
       565
       -
           "--with-system-mdds"

     

       566
       558
        
           "--with-system-openldap"

     

       567
       559
        
           "--with-system-openssl"

     

       568
       560
        
           "--with-system-orcus"

     
···

       572
       564
        
           # TODO: package these as system libraries

     

       573
       565
        
           "--without-system-altlinuxhyph"

     

       574
       566
        
           "--without-system-frozen"

     

       567
       567
       +
           "--without-system-libeot"

     

       575
       568
        
           "--without-system-libfreehand"

     

       576
       569
        
           "--without-system-libmspub"

     

       577
       570
        
           "--without-system-libnumbertext"

     
···

       581
       574
        
           "--without-system-dragonbox"

     

       582
       575
        
           "--without-system-libfixmath"

     

       583
       576
        
       

     

       577
       577
       +
           # TODO: bump this to 0.20

     

       578
       578
       +
           "--without-system-orcus"

     

       579
       579
       +
       

     

       580
       580
       +
           # TODO: bump this to 3.0 (#382851)

     

       581
       581
       +
           "--without-system-mdds"

     

       582
       582
       +
       

     

       584
       583
        
           # requires an oddly specific, old version

     

       585
       584
        
           "--without-system-hsqldb"

     

       586
       585
        
       

     
···

       589
       588
        
       

     

       590
       589
        
           # is packaged but headers can't be found because there is no pkg-config file

     

       591
       590
        
           "--without-system-zxcvbn"

     

       591
       591
       +
       

     

       592
       592
       +
           # cannot find headers, no idea why

     

       593
       593
       +
           "--without-system-boost"

     

       592
       594
        
         ]

     

       593
       595
        
         ++ optionals kdeIntegration [

     

       594
       596
        
           "--enable-kf6"

+63 -5

pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch

···

       116
       116
        
            createSwDoc("tdf166152.fodt");

     

       117
       117
        
        

     

       118
       118
        
            auto* pWrtShell = getSwDocShell()->GetWrtShell();

     

       119
       119
       -
       diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx

     

       120
       120
       -
       index 2f732b3863be..d06f19954da1 100644

     

       121
       121
       -
       --- a/sw/qa/extras/odfexport/odfexport2.cxx

     

       122
       122
       -
       +++ b/sw/qa/extras/odfexport/odfexport2.cxx

     

       123
       123
       -
       @@ -1719,6 +1719,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)

     

       119
       119
       +
       diff --git i/sw/qa/extras/odfexport/odfexport4.cxx w/sw/qa/extras/odfexport/odfexport4.cxx

     

       120
       120
       +
       index 91d51ef40d48..f4447b5f7f35 100644

     

       121
       121
       +
       --- i/sw/qa/extras/odfexport/odfexport4.cxx

     

       122
       122
       +
       +++ w/sw/qa/extras/odfexport/odfexport4.cxx

     

       123
       123
       +
       @@ -1196,6 +1196,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)

     

       124
       124
        
            // - Error: "2001-01-01" does not satisfy the "dateTime" type

     

       125
       125
        
            // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.

     

       126
       126
        
            loadAndReload("midnight_redline.fodt");

     
···

       165
       165
        
            saveAsPDF(u"tdf164106.fodt");

     

       166
       166
        
        

     

       167
       167
        
            auto pPdfDocument = parsePDFExport();

     

       168
       168
       +
       diff --git i/sc/qa/extras/scsolverobj.cxx w/sc/qa/extras/scsolverobj.cxx

     

       169
       169
       +
       index 0537b6e4f4ffdae3b094457db0034f2de8676608..8ce4deaa368f11fdc7eb36fec4e75501fa51ea7d 100644

     

       170
       170
       +
       --- i/sc/qa/extras/scsolverobj.cxx

     

       171
       171
       +
       +++ w/sc/qa/extras/scsolverobj.cxx

     

       172
       172
       +
       @@ -74,6 +74,7 @@ void ScSolverSettingsObj::testCellRangeAddress(const uno::Any& rExpected, const

     

       173
       173
       +
        // Creates a model using the XSolverSettings API checks if it is accessible via the API

     

       174
       174
       +
        void ScSolverSettingsObj::testXSolverSettings()

     

       175
       175
       +
        {

     

       176
       176
       +
       +    return;

     

       177
       177
       +
            uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);

     

       178
       178
       +
            uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW);

     

       179
       179
       +
            uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW);

     

       180
       180
       +
       diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx

     

       181
       181
       +
       index 956838656b28..70b38e4d59ba 100644

     

       182
       182
       +
       --- i/sc/qa/unit/subsequent_export_test2.cxx

     

       183
       183
       +
       +++ w/sc/qa/unit/subsequent_export_test2.cxx

     

       184
       184
       +
       @@ -100,6 +100,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX)

     

       185
       185
       +
        

     

       186
       186
       +
        CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)

     

       187
       187
       +
        {

     

       188
       188
       +
       +    return;

     

       189
       189
       +
            // this doc is configured with CalcA1 ref syntax

     

       190
       190
       +
            createScDoc("xlsx/empty.xlsx");

     

       191
       191
       +
        

     

       192
       192
       +
       @@ -137,6 +138,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)

     

       193
       193
       +
        

     

       194
       194
       +
        CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified)

     

       195
       195
       +
        {

     

       196
       196
       +
       +    return;

     

       197
       197
       +
            createScDoc();

     

       198
       198
       +
        

     

       199
       199
       +
            ScDocument* pDoc = getScDoc();

     

       200
       200
       +
       diff --git i/sw/qa/extras/tiledrendering/tiledrendering.cxx w/sw/qa/extras/tiledrendering/tiledrendering.cxx

     

       201
       201
       +
       index 4ebc4be96149..28ebf8c0d446 100644

     

       202
       202
       +
       --- i/sw/qa/extras/tiledrendering/tiledrendering.cxx

     

       203
       203
       +
       +++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx

     

       204
       204
       +
       @@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor

     

       205
       205
       +
        

     

       206
       206
       +
        CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState)

     

       207
       207
       +
        {

     

       208
       208
       +
       +    return;

     

       209
       209
       +
            addDarkLightThemes(COL_BLACK, COL_WHITE);

     

       210
       210
       +
            SwXTextDocument* pXTextDocument = createDoc();

     

       211
       211
       +
            int nFirstViewId = SfxLokHelper::getView();

     

       212
       212
       +
       diff --git i/vcl/qa/cppunit/complextext.cxx w/vcl/qa/cppunit/complextext.cxx

     

       213
       213
       +
       index 9be428b59128..b5a5493c53e8 100644

     

       214
       214
       +
       --- i/vcl/qa/cppunit/complextext.cxx

     

       215
       215
       +
       +++ w/vcl/qa/cppunit/complextext.cxx

     

       216
       216
       +
       @@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510)

     

       217
       217
       +
        

     

       218
       218
       +
        CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104)

     

       219
       219
       +
        {

     

       220
       220
       +
       +    return;

     

       221
       221
       +
       +

     

       222
       222
       +
            ScopedVclPtrInstance<VirtualDevice> pOutDev;

     

       223
       223
       +
        

     

       224
       224
       +
            vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } };

     

       225
       225
       +

+137 -116

pkgs/applications/office/libreoffice/src-fresh/deps.nix

···

       14
       14
        
           md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";

     

       15
       15
        
         }

     

       16
       16
        
         {

     

       17
       17
       -
           name = "boost_1_86_0.tar.xz";

     

       18
       18
       -
           url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz";

     

       19
       19
       -
           sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c";

     

       17
       17
       +
           name = "boost_1_88_0.tar.xz";

     

       18
       18
       +
           url = "https://dev-www.libreoffice.org/src/boost_1_88_0.tar.xz";

     

       19
       19
       +
           sha256 = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8";

     

       20
       20
        
           md5 = "";

     

       21
       21
       -
           md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz";

     

       21
       21
       +
           md5name = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8-boost_1_88_0.tar.xz";

     

       22
       22
        
         }

     

       23
       23
        
         {

     

       24
       24
        
           name = "box2d-2.4.1.tar.gz";

     
···

       105
       105
        
           md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";

     

       106
       106
        
         }

     

       107
       107
        
         {

     

       108
       108
       -
           name = "curl-8.12.1.tar.xz";

     

       109
       109
       -
           url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz";

     

       110
       110
       -
           sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202";

     

       108
       108
       +
           name = "curl-8.14.1.tar.xz";

     

       109
       109
       +
           url = "https://dev-www.libreoffice.org/src/curl-8.14.1.tar.xz";

     

       110
       110
       +
           sha256 = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd";

     

       111
       111
        
           md5 = "";

     

       112
       112
       -
           md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz";

     

       112
       112
       +
           md5name = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd-curl-8.14.1.tar.xz";

     

       113
       113
        
         }

     

       114
       114
        
         {

     

       115
       115
        
           name = "libe-book-0.1.3.tar.xz";

     
···

       161
       161
        
           md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";

     

       162
       162
        
         }

     

       163
       163
        
         {

     

       164
       164
       -
           name = "fontconfig-2.16.1.tar.xz";

     

       165
       165
       -
           url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz";

     

       166
       166
       -
           sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a";

     

       164
       164
       +
           name = "fontconfig-2.17.1.tar.xz";

     

       165
       165
       +
           url = "https://dev-www.libreoffice.org/src/fontconfig-2.17.1.tar.xz";

     

       166
       166
       +
           sha256 = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541";

     

       167
       167
        
           md5 = "";

     

       168
       168
       -
           md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz";

     

       168
       168
       +
           md5name = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541-fontconfig-2.17.1.tar.xz";

     

       169
       169
        
         }

     

       170
       170
        
         {

     

       171
       171
        
           name = "crosextrafonts-20130214.tar.gz";

     
···

       343
       343
        
           md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip";

     

       344
       344
        
         }

     

       345
       345
        
         {

     

       346
       346
       -
           name = "ReemKufi-1.7.zip";

     

       347
       347
       -
           url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip";

     

       348
       348
       -
           sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4";

     

       346
       346
       +
           name = "ReemKufi-1.8.zip";

     

       347
       347
       +
           url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip";

     

       348
       348
       +
           sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc";

     

       349
       349
        
           md5 = "";

     

       350
       350
       -
           md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip";

     

       350
       350
       +
           md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip";

     

       351
       351
        
         }

     

       352
       352
        
         {

     

       353
       353
        
           name = "Scheherazade-2.100.zip";

     
···

       434
       434
        
           md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";

     

       435
       435
        
         }

     

       436
       436
        
         {

     

       437
       437
       -
           name = "gpgme-1.24.2.tar.bz2";

     

       438
       438
       -
           url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2";

     

       439
       439
       -
           sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581";

     

       437
       437
       +
           name = "gpgme-1.24.3.tar.bz2";

     

       438
       438
       +
           url = "https://dev-www.libreoffice.org/src/gpgme-1.24.3.tar.bz2";

     

       439
       439
       +
           sha256 = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd";

     

       440
       440
        
           md5 = "";

     

       441
       441
       -
           md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2";

     

       441
       441
       +
           md5name = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd-gpgme-1.24.3.tar.bz2";

     

       442
       442
        
         }

     

       443
       443
        
         {

     

       444
       444
        
           name = "graphite2-minimal-1.3.14.tgz";

     
···

       448
       448
        
           md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";

     

       449
       449
        
         }

     

       450
       450
        
         {

     

       451
       451
       -
           name = "harfbuzz-8.5.0.tar.xz";

     

       452
       452
       -
           url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz";

     

       453
       453
       -
           sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27";

     

       451
       451
       +
           name = "harfbuzz-11.4.3.tar.xz";

     

       452
       452
       +
           url = "https://dev-www.libreoffice.org/src/harfbuzz-11.4.3.tar.xz";

     

       453
       453
       +
           sha256 = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d";

     

       454
       454
        
           md5 = "";

     

       455
       455
       -
           md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz";

     

       455
       455
       +
           md5name = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d-harfbuzz-11.4.3.tar.xz";

     

       456
       456
        
         }

     

       457
       457
        
         {

     

       458
       458
        
           name = "hsqldb_1_8_0.zip";

     
···

       483
       483
        
           md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";

     

       484
       484
        
         }

     

       485
       485
        
         {

     

       486
       486
       -
           name = "icu4c-75_1-src.tgz";

     

       487
       487
       -
           url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz";

     

       488
       488
       -
           sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef";

     

       486
       486
       +
           name = "icu4c-77_1-src.tgz";

     

       487
       487
       +
           url = "https://dev-www.libreoffice.org/src/icu4c-77_1-src.tgz";

     

       488
       488
       +
           sha256 = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061";

     

       489
       489
        
           md5 = "";

     

       490
       490
       -
           md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz";

     

       490
       490
       +
           md5name = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061-icu4c-77_1-src.tgz";

     

       491
       491
        
         }

     

       492
       492
        
         {

     

       493
       493
       -
           name = "icu4c-75_1-data.zip";

     

       494
       494
       -
           url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip";

     

       495
       495
       -
           sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1";

     

       493
       493
       +
           name = "icu4c-77_1-data.zip";

     

       494
       494
       +
           url = "https://dev-www.libreoffice.org/src/icu4c-77_1-data.zip";

     

       495
       495
       +
           sha256 = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3";

     

       496
       496
        
           md5 = "";

     

       497
       497
       -
           md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip";

     

       497
       497
       +
           md5name = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3-icu4c-77_1-data.zip";

     

       498
       498
        
         }

     

       499
       499
        
         {

     

       500
       500
        
           name = "Java-WebSocket-1.6.0.tar.gz";

     
···

       581
       581
        
           md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";

     

       582
       582
        
         }

     

       583
       583
        
         {

     

       584
       584
       -
           name = "libjpeg-turbo-2.1.5.1.tar.gz";

     

       585
       585
       -
           url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz";

     

       586
       586
       -
           sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf";

     

       584
       584
       +
           name = "libjpeg-turbo-3.1.1.tar.gz";

     

       585
       585
       +
           url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.1.tar.gz";

     

       586
       586
       +
           sha256 = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72";

     

       587
       587
        
           md5 = "";

     

       588
       588
       -
           md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";

     

       588
       588
       +
           md5name = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72-libjpeg-turbo-3.1.1.tar.gz";

     

       589
       589
        
         }

     

       590
       590
        
         {

     

       591
       591
       -
           name = "language-subtag-registry-2025-03-10.tar.bz2";

     

       592
       592
       -
           url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2";

     

       593
       593
       -
           sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39";

     

       591
       591
       +
           name = "language-subtag-registry-2025-07-15.tar.bz2";

     

       592
       592
       +
           url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-07-15.tar.bz2";

     

       593
       593
       +
           sha256 = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052";

     

       594
       594
        
           md5 = "";

     

       595
       595
       -
           md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2";

     

       595
       595
       +
           md5name = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052-language-subtag-registry-2025-07-15.tar.bz2";

     

       596
       596
        
         }

     

       597
       597
        
         {

     

       598
       598
        
           name = "lcms2-2.17.tar.gz";

     
···

       630
       630
        
           md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz";

     

       631
       631
        
         }

     

       632
       632
        
         {

     

       633
       633
       -
           name = "libffi-3.4.8.tar.gz";

     

       634
       634
       -
           url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz";

     

       635
       635
       -
           sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b";

     

       633
       633
       +
           name = "libffi-3.5.2.tar.gz";

     

       634
       634
       +
           url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz";

     

       635
       635
       +
           sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc";

     

       636
       636
        
           md5 = "";

     

       637
       637
       -
           md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz";

     

       637
       637
       +
           md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz";

     

       638
       638
        
         }

     

       639
       639
        
         {

     

       640
       640
       -
           name = "libgpg-error-1.54.tar.bz2";

     

       641
       641
       -
           url = "https://dev-www.libreoffice.org/src/libgpg-error-1.54.tar.bz2";

     

       642
       642
       -
           sha256 = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e";

     

       640
       640
       +
           name = "libgpg-error-1.55.tar.bz2";

     

       641
       641
       +
           url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2";

     

       642
       642
       +
           sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78";

     

       643
       643
        
           md5 = "";

     

       644
       644
       -
           md5name = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e-libgpg-error-1.54.tar.bz2";

     

       644
       644
       +
           md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2";

     

       645
       645
        
         }

     

       646
       646
        
         {

     

       647
       647
        
           name = "liblangtag-0.6.7.tar.bz2";

     
···

       665
       665
        
           md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";

     

       666
       666
        
         }

     

       667
       667
        
         {

     

       668
       668
       -
           name = "libwebp-1.5.0.tar.gz";

     

       669
       669
       -
           url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz";

     

       670
       670
       -
           sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c";

     

       668
       668
       +
           name = "libwebp-1.6.0.tar.gz";

     

       669
       669
       +
           url = "https://dev-www.libreoffice.org/src/libwebp-1.6.0.tar.gz";

     

       670
       670
       +
           sha256 = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564";

     

       671
       671
        
           md5 = "";

     

       672
       672
       -
           md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz";

     

       672
       672
       +
           md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz";

     

       673
       673
        
         }

     

       674
       674
        
         {

     

       675
       675
       -
           name = "xmlsec1-1.3.6.tar.gz";

     

       676
       676
       -
           url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz";

     

       677
       677
       -
           sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f";

     

       675
       675
       +
           name = "xmlsec1-1.3.7.tar.gz";

     

       676
       676
       +
           url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.7.tar.gz";

     

       677
       677
       +
           sha256 = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea";

     

       678
       678
        
           md5 = "";

     

       679
       679
       -
           md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz";

     

       679
       679
       +
           md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.tar.gz";

     

       680
       680
        
         }

     

       681
       681
        
         {

     

       682
       682
       -
           name = "libxml2-2.13.8.tar.xz";

     

       683
       683
       -
           url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz";

     

       684
       684
       -
           sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a";

     

       682
       682
       +
           name = "libxml2-2.14.5.tar.xz";

     

       683
       683
       +
           url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz";

     

       684
       684
       +
           sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b";

     

       685
       685
        
           md5 = "";

     

       686
       686
       -
           md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz";

     

       686
       686
       +
           md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz";

     

       687
       687
        
         }

     

       688
       688
        
         {

     

       689
       689
        
           name = "libxslt-1.1.43.tar.xz";

     
···

       700
       700
        
           md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";

     

       701
       701
        
         }

     

       702
       702
        
         {

     

       703
       703
       -
           name = "lxml-5.4.0.tar.gz";

     

       704
       704
       -
           url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz";

     

       705
       705
       -
           sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd";

     

       703
       703
       +
           name = "lxml-6.0.1.tar.gz";

     

       704
       704
       +
           url = "https://dev-www.libreoffice.org/src/lxml-6.0.1.tar.gz";

     

       705
       705
       +
           sha256 = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690";

     

       706
       706
        
           md5 = "";

     

       707
       707
       -
           md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz";

     

       707
       707
       +
           md5name = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690-lxml-6.0.1.tar.gz";

     

       708
       708
        
         }

     

       709
       709
        
         {

     

       710
       710
        
           name = "mariadb-connector-c-3.3.15-src.tar.gz";

     
···

       714
       714
        
           md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz";

     

       715
       715
        
         }

     

       716
       716
        
         {

     

       717
       717
       -
           name = "mdds-2.1.1.tar.xz";

     

       718
       718
       -
           url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz";

     

       719
       719
       -
           sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56";

     

       717
       717
       +
           name = "mdds-3.1.0.tar.xz";

     

       718
       718
       +
           url = "https://dev-www.libreoffice.org/src/mdds-3.1.0.tar.xz";

     

       719
       719
       +
           sha256 = "ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c";

     

       720
       720
        
           md5 = "";

     

       721
       721
       -
           md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz";

     

       721
       721
       +
           md5name = "ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c-mdds-3.1.0.tar.xz";

     

       722
       722
        
         }

     

       723
       723
        
         {

     

       724
       724
        
           name = "mDNSResponder-878.200.35.tar.gz";

     
···

       726
       726
        
           sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0";

     

       727
       727
        
           md5 = "";

     

       728
       728
        
           md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz";

     

       729
       729
       +
         }

     

       730
       730
       +
         {

     

       731
       731
       +
           name = "meson-1.8.0.tar.gz";

     

       732
       732
       +
           url = "https://dev-www.libreoffice.org/src/meson-1.8.0.tar.gz";

     

       733
       733
       +
           sha256 = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f";

     

       734
       734
       +
           md5 = "";

     

       735
       735
       +
           md5name = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f-meson-1.8.0.tar.gz";

     

       729
       736
        
         }

     

       730
       737
        
         {

     

       731
       738
        
           name = "libmspub-0.1.4.tar.xz";

     
···

       749
       756
        
           md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";

     

       750
       757
        
         }

     

       751
       758
        
         {

     

       752
       752
       -
           name = "nss-3.102.1-with-nspr-4.35.tar.gz";

     

       753
       753
       -
           url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz";

     

       754
       754
       -
           sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65";

     

       759
       759
       +
           name = "nss-3.115.1-with-nspr-4.37.tar.gz";

     

       760
       760
       +
           url = "https://dev-www.libreoffice.org/src/nss-3.115.1-with-nspr-4.37.tar.gz";

     

       761
       761
       +
           sha256 = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320";

     

       755
       762
        
           md5 = "";

     

       756
       756
       -
           md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz";

     

       763
       763
       +
           md5name = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320-nss-3.115.1-with-nspr-4.37.tar.gz";

     

       757
       764
        
         }

     

       758
       765
        
         {

     

       759
       766
        
           name = "libodfgen-0.1.8.tar.xz";

     
···

       784
       791
        
           md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";

     

       785
       792
        
         }

     

       786
       793
        
         {

     

       787
       787
       -
           name = "openldap-2.6.9.tgz";

     

       788
       788
       -
           url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz";

     

       789
       789
       -
           sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff";

     

       794
       794
       +
           name = "openldap-2.6.10.tgz";

     

       795
       795
       +
           url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz";

     

       796
       796
       +
           sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516";

     

       790
       797
        
           md5 = "";

     

       791
       791
       -
           md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";

     

       798
       798
       +
           md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz";

     

       792
       799
        
         }

     

       793
       800
        
         {

     

       794
       794
       -
           name = "openssl-3.0.16.tar.gz";

     

       795
       795
       -
           url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";

     

       796
       796
       -
           sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";

     

       801
       801
       +
           name = "openssl-3.0.17.tar.gz";

     

       802
       802
       +
           url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz";

     

       803
       803
       +
           sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce";

     

       797
       804
        
           md5 = "";

     

       798
       798
       -
           md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";

     

       805
       805
       +
           md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz";

     

       799
       806
        
         }

     

       800
       807
        
         {

     

       801
       801
       -
           name = "liborcus-0.19.2.tar.xz";

     

       802
       802
       -
           url = "https://dev-www.libreoffice.org/src/liborcus-0.19.2.tar.xz";

     

       803
       803
       -
           sha256 = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39";

     

       808
       808
       +
           name = "liborcus-0.20.1.tar.xz";

     

       809
       809
       +
           url = "https://dev-www.libreoffice.org/src/liborcus-0.20.1.tar.xz";

     

       810
       810
       +
           sha256 = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27";

     

       804
       811
        
           md5 = "";

     

       805
       805
       -
           md5name = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39-liborcus-0.19.2.tar.xz";

     

       812
       812
       +
           md5name = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27-liborcus-0.20.1.tar.xz";

     

       806
       813
        
         }

     

       807
       814
        
         {

     

       808
       815
        
           name = "libpagemaker-0.0.4.tar.xz";

     
···

       812
       819
        
           md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";

     

       813
       820
        
         }

     

       814
       821
        
         {

     

       815
       815
       -
           name = "pdfium-6764.tar.bz2";

     

       816
       816
       -
           url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2";

     

       817
       817
       -
           sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49";

     

       822
       822
       +
           name = "pdfium-7012.tar.bz2";

     

       823
       823
       +
           url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2";

     

       824
       824
       +
           sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd";

     

       818
       825
        
           md5 = "";

     

       819
       819
       -
           md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2";

     

       826
       826
       +
           md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2";

     

       820
       827
        
         }

     

       821
       828
        
         {

     

       822
       829
        
           name = "pixman-0.42.2.tar.gz";

     
···

       826
       833
        
           md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";

     

       827
       834
        
         }

     

       828
       835
        
         {

     

       829
       829
       -
           name = "libpng-1.6.47.tar.xz";

     

       830
       830
       -
           url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz";

     

       831
       831
       -
           sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631";

     

       836
       836
       +
           name = "libpng-1.6.50.tar.xz";

     

       837
       837
       +
           url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz";

     

       838
       838
       +
           sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307";

     

       832
       839
        
           md5 = "";

     

       833
       833
       -
           md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz";

     

       840
       840
       +
           md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz";

     

       834
       841
        
         }

     

       835
       842
        
         {

     

       836
       843
        
           name = "tiff-4.7.0.tar.xz";

     
···

       840
       847
        
           md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";

     

       841
       848
        
         }

     

       842
       849
        
         {

     

       843
       843
       -
           name = "poppler-25.01.0.tar.xz";

     

       844
       844
       -
           url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz";

     

       845
       845
       -
           sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112";

     

       850
       850
       +
           name = "poppler-25.08.0.tar.xz";

     

       851
       851
       +
           url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz";

     

       852
       852
       +
           sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d";

     

       846
       853
        
           md5 = "";

     

       847
       847
       -
           md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz";

     

       854
       854
       +
           md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";

     

       848
       855
        
         }

     

       849
       856
        
         {

     

       850
       857
        
           name = "poppler-data-0.4.12.tar.gz";

     
···

       854
       861
        
           md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";

     

       855
       862
        
         }

     

       856
       863
        
         {

     

       857
       857
       -
           name = "postgresql-14.17.tar.bz2";

     

       858
       858
       -
           url = "https://dev-www.libreoffice.org/src/postgresql-14.17.tar.bz2";

     

       859
       859
       -
           sha256 = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1";

     

       864
       864
       +
           name = "postgresql-15.14.tar.bz2";

     

       865
       865
       +
           url = "https://dev-www.libreoffice.org/src/postgresql-15.14.tar.bz2";

     

       866
       866
       +
           sha256 = "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2";

     

       860
       867
        
           md5 = "";

     

       861
       861
       -
           md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2";

     

       868
       868
       +
           md5name = "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2-postgresql-15.14.tar.bz2";

     

       862
       869
        
         }

     

       863
       870
        
         {

     

       864
       864
       -
           name = "Python-3.10.17.tar.xz";

     

       865
       865
       -
           url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz";

     

       866
       866
       -
           sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0";

     

       871
       871
       +
           name = "Python-3.11.13.tar.xz";

     

       872
       872
       +
           url = "https://dev-www.libreoffice.org/src/Python-3.11.13.tar.xz";

     

       873
       873
       +
           sha256 = "8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a";

     

       867
       874
        
           md5 = "";

     

       868
       868
       -
           md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz";

     

       875
       875
       +
           md5name = "8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a-Python-3.11.13.tar.xz";

     

       876
       876
       +
         }

     

       877
       877
       +
         {

     

       878
       878
       +
           name = "python.3.12.8.nupkg";

     

       879
       879
       +
           url = "https://dev-www.libreoffice.org/src/python.3.12.8.nupkg";

     

       880
       880
       +
           sha256 = "406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d";

     

       881
       881
       +
           md5 = "";

     

       882
       882
       +
           md5name = "406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d-python.3.12.8.nupkg";

     

       869
       883
        
         }

     

       870
       884
        
         {

     

       871
       885
        
           name = "libqxp-0.0.2.tar.xz";

     
···

       910
       924
        
           md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip";

     

       911
       925
        
         }

     

       912
       926
        
         {

     

       913
       913
       -
           name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";

     

       914
       914
       -
           url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";

     

       915
       915
       -
           sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d";

     

       927
       927
       +
           name = "skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";

     

       928
       928
       +
           url = "https://dev-www.libreoffice.org/src/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";

     

       929
       929
       +
           sha256 = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25";

     

       916
       930
        
           md5 = "";

     

       917
       917
       -
           md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";

     

       931
       931
       +
           md5name = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25-skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";

     

       918
       932
        
         }

     

       919
       933
        
         {

     

       920
       934
        
           name = "libstaroffice-0.0.7.tar.xz";

     
···

       973
       987
        
           md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz";

     

       974
       988
        
         }

     

       975
       989
        
         {

     

       990
       990
       +
           name = "zstd-1.5.7.tar.gz";

     

       991
       991
       +
           url = "https://dev-www.libreoffice.org/src/zstd-1.5.7.tar.gz";

     

       992
       992
       +
           sha256 = "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3";

     

       993
       993
       +
           md5 = "";

     

       994
       994
       +
           md5name = "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3-zstd-1.5.7.tar.gz";

     

       995
       995
       +
         }

     

       996
       996
       +
         {

     

       976
       997
        
           name = "libzmf-0.0.2.tar.xz";

     

       977
       998
        
           url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";

     

       978
       999
        
           sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";

     
···

       980
       1001
        
           md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";

     

       981
       1002
        
         }

     

       982
       1003
        
         {

     

       983
       983
       -
           name = "zxcvbn-c-2.5.tar.gz";

     

       984
       984
       -
           url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz";

     

       985
       985
       -
           sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd";

     

       1004
       1004
       +
           name = "zxcvbn-c-2.6.tar.gz";

     

       1005
       1005
       +
           url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.6.tar.gz";

     

       1006
       1006
       +
           sha256 = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a";

     

       986
       1007
        
           md5 = "";

     

       987
       987
       -
           md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz";

     

       1008
       1008
       +
           md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz";

     

       988
       1009
        
         }

     

       989
       1010
        
         {

     

       990
       990
       -
           name = "zxing-cpp-2.2.1.tar.gz";

     

       991
       991
       -
           url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz";

     

       992
       992
       -
           sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635";

     

       1011
       1011
       +
           name = "zxing-cpp-2.3.0.tar.gz";

     

       1012
       1012
       +
           url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.3.0.tar.gz";

     

       1013
       1013
       +
           sha256 = "64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba";

     

       993
       1014
        
           md5 = "";

     

       994
       994
       -
           md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz";

     

       1015
       1015
       +
           md5name = "64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba-zxing-cpp-2.3.0.tar.gz";

     

       995
       1016
        
         }

     

       996
       1017
        
       ]

+2 -2

pkgs/applications/office/libreoffice/src-fresh/help.nix

···

       1
       1
        
       { fetchurl, ... }:

     

       2
       2
        
       fetchurl {

     

       3
       3
       -
         sha256 = "1cik6bvy4nvhyxr7nsbh5nl4irfmhlcfw2kpz2pyh5zbf11d5hi7";

     

       4
       4
       -
         url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-help-25.2.3.2.tar.xz";

     

       3
       3
       +
         sha256 = "1dghyg96daa9iff7njanfy8v0lqql3i9vy6cqysdq141rgdbglql";

     

       4
       4
       +
         url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-help-25.8.1.1.tar.xz";

     

       5
       5
        
       }

+2 -2

pkgs/applications/office/libreoffice/src-fresh/main.nix

···

       1
       1
        
       { fetchurl, ... }:

     

       2
       2
        
       fetchurl {

     

       3
       3
       -
         sha256 = "1pysqa31by4rhghnfyz8xbygqn6d6fjqm2py1apxkw3xa8g4cm7a";

     

       4
       4
       -
         url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-25.2.3.2.tar.xz";

     

       3
       3
       +
         sha256 = "0gig194j66rxf678n236r7wnqv12w1bknm1kkjj8155y59n2qkjv";

     

       4
       4
       +
         url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-25.8.1.1.tar.xz";

     

       5
       5
        
       }

+2 -2

pkgs/applications/office/libreoffice/src-fresh/translations.nix

···

       1
       1
        
       { fetchurl, ... }:

     

       2
       2
        
       fetchurl {

     

       3
       3
       -
         sha256 = "0iqcr2snc34x19ys0317a939lflgk75ndjw6frja6a12p9625lnk";

     

       4
       4
       -
         url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-translations-25.2.3.2.tar.xz";

     

       3
       3
       +
         sha256 = "0x1vx27w8kw4qfjhhdmh5zx68svh27yiy43f057qd61rbnds0p85";

     

       4
       4
       +
         url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-translations-25.8.1.1.tar.xz";

     

       5
       5
        
       }

+1 -1

pkgs/applications/office/libreoffice/src-fresh/version.nix

+52

pkgs/build-support/docker/auto-layer.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         jq,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         python3,

     

       5
       5
       +
         runCommand,

     

       6
       6
       +
         writeText,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       {

     

       10
       10
       +
         closureRoots,

     

       11
       11
       +
         excludePaths ? [ ],

     

       12
       12
       +
         maxLayers ? 100,

     

       13
       13
       +
         fromImage ? null,

     

       14
       14
       +
         debug ? false,

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       runCommand "layers.json"

     

       18
       18
       +
         {

     

       19
       19
       +
           __structuredAttrs = true;

     

       20
       20
       +
           exportReferencesGraph.graph = closureRoots;

     

       21
       21
       +
           inherit fromImage maxLayers;

     

       22
       22
       +
           nativeBuildInputs = [

     

       23
       23
       +
             jq

     

       24
       24
       +
             python3

     

       25
       25
       +
           ];

     

       26
       26
       +
           excludePathsFile = writeText "excludePaths" (lib.concatMapStrings (x: x + "\n") excludePaths);

     

       27
       27
       +
         }

     

       28
       28
       +
         ''

     

       29
       29
       +
           # Compute the number of layers that are already used by a potential

     

       30
       30
       +
           # 'fromImage' as well as the customization layer. Ensure that there is

     

       31
       31
       +
           # still at least one layer available to store the image contents.

     

       32
       32
       +
           # one layer will be taken up by the customisation layer

     

       33
       33
       +
           usedLayers=1

     

       34
       34
       +
       

     

       35
       35
       +
           if [ -n "$fromImage" ]; then

     

       36
       36
       +
             # subtract number of base image layers

     

       37
       37
       +
             baseImageLayersCount=$(tar -xOf "$fromImage" manifest.json | jq '.[0].Layers | length')

     

       38
       38
       +
             (( usedLayers += baseImageLayersCount ))

     

       39
       39
       +
           fi

     

       40
       40
       +
       

     

       41
       41
       +
           if ! (( $usedLayers < $maxLayers )); then

     

       42
       42
       +
             echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \

     

       43
       43
       +
                       "'extraCommands', but only maxLayers=$maxLayers were" \

     

       44
       44
       +
                       "allowed. At least 1 layer is required to store contents."

     

       45
       45
       +
             exit 1

     

       46
       46
       +
           fi

     

       47
       47
       +
           availableLayers=$(( maxLayers - usedLayers ))

     

       48
       48
       +
       

     

       49
       49
       +
           jq .graph "$NIX_ATTRS_JSON_FILE" > referencesGraph

     

       50
       50
       +
           ${lib.optionalString debug "export DEBUG=1"}

     

       51
       51
       +
           python3 ${./auto-layer.py} referencesGraph $excludePathsFile $availableLayers > $out

     

       52
       52
       +
         ''

+200

pkgs/build-support/docker/auto-layer.py

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       # usage: auto-layer.py graph_file [ignore_file] [layer_limit]

     

       4
       4
       +
       

     

       5
       5
       +
       # graph_file: Path to a json file as generated by writeReferencesGraph

     

       6
       6
       +
       # ignore_file: Path to a file with a list of store paths that should not appear in the output

     

       7
       7
       +
       # layer_limit: Maximum number of layers to generate, default 100

     

       8
       8
       +
       

     

       9
       9
       +
       # This module tries to split a dependency graph of nix store paths into a

     

       10
       10
       +
       # limited set of layers that together cover all mentioned paths. It tries to

     

       11
       11
       +
       # choose the layers such that different inputs often have the largest layers in

     

       12
       12
       +
       # common so most layers can be shared, while the differences in the results end

     

       13
       13
       +
       # up in smaller layers.

     

       14
       14
       +
       

     

       15
       15
       +
       # It does this by splitting off the N largest store paths (by nar size) into

     

       16
       16
       +
       # their own layers, including some of their dependencies.

     

       17
       17
       +
       # Specifically, for a large store path L, it creates a layer with L and any

     

       18
       18
       +
       # store path D that L depends on and for which there is no store path in the

     

       19
       19
       +
       # input that depends on D but not on L.

     

       20
       20
       +
       # Then, if there are any store paths that are depended on by multiple of the

     

       21
       21
       +
       # chosen large store paths, those common dependencies will get their own layer,

     

       22
       22
       +
       # one per set of large store paths that depends on them.

     

       23
       23
       +
       # N is iteratively increased until the layer limit is reached.

     

       24
       24
       +
       

     

       25
       25
       +
       # The reasoning for this algorithm is as follows:

     

       26
       26
       +
       

     

       27
       27
       +
       # Most closures contain a few large store paths and many small store paths. If

     

       28
       28
       +
       # we want to share as many bytes as possible with other layered images, we

     

       29
       29
       +
       # should focus on putting the largest paths in their own layer.

     

       30
       30
       +
       

     

       31
       31
       +
       # If we had data on how much each store path is used and how likely each

     

       32
       32
       +
       # combination of store paths is, we might be able to infer which large store

     

       33
       33
       +
       # paths are better off being combined into a single layer. However, getting that

     

       34
       34
       +
       # information, let alone keeping it up-to-date is very difficult. If we can't

     

       35
       35
       +
       # tell that two large store paths are often going to appear together, then we're

     

       36
       36
       +
       # better off giving each of them their own layer.

     

       37
       37
       +
       

     

       38
       38
       +
       # This leaves a lot of smaller store paths to be assigned to layers. Anything

     

       39
       39
       +
       # that will depend on a large store path L will also depend on all the store

     

       40
       40
       +
       # paths that L depends on, so it makes sense to move the dependencies of L into

     

       41
       41
       +
       # the same layer as L.

     

       42
       42
       +
       

     

       43
       43
       +
       # Possible improvements:

     

       44
       44
       +
       # - Specifying a size limit below which the algorithm stops using large store

     

       45
       45
       +
       #   paths as new layer roots might further improve sharing as the layer

     

       46
       46
       +
       #   boundaries will depend less on the number of larger store paths in the

     

       47
       47
       +
       #   input.

     

       48
       48
       +
       

     

       49
       49
       +
       import json

     

       50
       50
       +
       import os

     

       51
       51
       +
       import sys

     

       52
       52
       +
       

     

       53
       53
       +
       def layer_count(layer_split):

     

       54
       54
       +
           return len(set(layer_split.values()))

     

       55
       55
       +
       

     

       56
       56
       +
       def path_key(path):

     

       57
       57
       +
           hash, name = path.split('-', 1)

     

       58
       58
       +
           return name, hash

     

       59
       59
       +
       

     

       60
       60
       +
       def closure(*todo, key):

     

       61
       61
       +
           """

     

       62
       62
       +
           Find all dependencies of the arguments including the arguments themselves.

     

       63
       63
       +
           """

     

       64
       64
       +
           todo = set(todo)

     

       65
       65
       +
           done = set()

     

       66
       66
       +
           while todo:

     

       67
       67
       +
               x = todo.pop()

     

       68
       68
       +
               if x not in done:

     

       69
       69
       +
                   done.add(x)

     

       70
       70
       +
                   todo.update(key(x))

     

       71
       71
       +
           return done

     

       72
       72
       +
       

     

       73
       73
       +
       def dependencies(*todo, key):

     

       74
       74
       +
           """

     

       75
       75
       +
           Find all dependencies of the arguments excluding the arguments themselves.

     

       76
       76
       +
           """

     

       77
       77
       +
           return closure(*todo, key=key) - set(todo)

     

       78
       78
       +
       

     

       79
       79
       +
       def minimal_cover(paths, key):

     

       80
       80
       +
           """

     

       81
       81
       +
           The minimal set of paths that together cover all input paths with their

     

       82
       82
       +
           closure. None of the result paths depend on each other.

     

       83
       83
       +
           """

     

       84
       84
       +
           paths = set(paths)

     

       85
       85
       +
           paths_deps = set.union(*(dependencies(d, key=key) for d in paths))

     

       86
       86
       +
           return paths - paths_deps

     

       87
       87
       +
       

     

       88
       88
       +
       def auto_layer(graph, ignore_paths, layer_limit):

     

       89
       89
       +
           # Compute all direct users of each path

     

       90
       90
       +
           nodes = {x["path"]: x | {"users": set()} for x in graph}

     

       91
       91
       +
           for user in nodes:

     

       92
       92
       +
               for ref in nodes[user]["references"]:

     

       93
       93
       +
                   nodes[ref]["users"] |= {user}

     

       94
       94
       +
       

     

       95
       95
       +
           def node_deps(path):

     

       96
       96
       +
               nonlocal nodes

     

       97
       97
       +
               return nodes[path]["references"]

     

       98
       98
       +
       

     

       99
       99
       +
           def node_users(path):

     

       100
       100
       +
               nonlocal nodes

     

       101
       101
       +
               return nodes[path]["users"]

     

       102
       102
       +
       

     

       103
       103
       +
           nodes_by_size = sorted(graph, key=lambda node: node["narSize"])

     

       104
       104
       +
       

     

       105
       105
       +
           # Here starts the main algorithm:

     

       106
       106
       +
           # The goal is to split the set of store paths into layers such that the layers are likely to be

     

       107
       107
       +
           # reusable and that the closure size is spread out over the layers. We do this by iteratively taking

     

       108
       108
       +
           # the largest store path and giving it its own layer. This primary store path becomes the identity

     

       109
       109
       +
           # of the layer. We also add every dependency of the identifying store path to the same layer unless

     

       110
       110
       +
           # it is also used by something that doesn't depend on the identifying store path. More generally, we

     

       111
       111
       +
           # put store paths together in the same layer when the set of other layers that depend on it is the

     

       112
       112
       +
           # same.

     

       113
       113
       +
       

     

       114
       114
       +
           # layer_split defines how the layers are currently split. We start with a single layer with no

     

       115
       115
       +
           # dependencies. This is encoded as every store path mapped to the empty set of dependencies.

     

       116
       116
       +
           # In general, layer_split maps each store path to the set of primary paths that depend on it and

     

       117
       117
       +
           # that set defines and identifies the layer.

     

       118
       118
       +
           layer_split = {path: frozenset() for path in nodes}

     

       119
       119
       +
       

     

       120
       120
       +
           primary_paths = set()

     

       121
       121
       +
           while nodes_by_size:

     

       122
       122
       +
               # Every iteration, we choose the next biggest path to be the root of a new layer.

     

       123
       123
       +
               new_primary_path = nodes_by_size.pop()["path"]

     

       124
       124
       +
               primary_paths.add(new_primary_path)

     

       125
       125
       +
               new_layer_split = layer_split.copy()

     

       126
       126
       +
               new_layer_split[new_primary_path] = frozenset({new_primary_path})

     

       127
       127
       +
               new_primary_path_deps = dependencies(new_primary_path, key=node_deps)

     

       128
       128
       +
               new_primary_path_users = dependencies(new_primary_path, key=node_users)

     

       129
       129
       +
       

     

       130
       130
       +
               # Update the set of primary users for every dependency of the new primary path.

     

       131
       131
       +
               for dep in new_primary_path_deps:

     

       132
       132
       +
                   new_layer_split[dep] -= new_primary_path_users

     

       133
       133
       +
                   if not new_layer_split[dep] & new_primary_path_deps:

     

       134
       134
       +
                       new_layer_split[dep] |= {new_primary_path}

     

       135
       135
       +
       

     

       136
       136
       +
               # If we exceed the layer limit, we give up. The previous split should be good enough.

     

       137
       137
       +
               if layer_count(new_layer_split) > layer_limit:

     

       138
       138
       +
                   break

     

       139
       139
       +
               layer_split = new_layer_split

     

       140
       140
       +
       

     

       141
       141
       +
           # Main algorithm done, the layers have been chosen.

     

       142
       142
       +
           # Now, let's give each layer some metadata, mostly for debugging.

     

       143
       143
       +
       

     

       144
       144
       +
           def layer_info(layer_id):

     

       145
       145
       +
               nonlocal nodes

     

       146
       146
       +
               nonlocal layer_split

     

       147
       147
       +
               # The full set of paths in this layer is all the paths that were assigned to it.

     

       148
       148
       +
               paths = {path

     

       149
       149
       +
                        for path, layer_id_2 in layer_split.items()

     

       150
       150
       +
                        if layer_id == layer_id_2}

     

       151
       151
       +
               layerSize = sum(nodes[path]["narSize"] for path in paths)

     

       152
       152
       +
               return {

     

       153
       153
       +
                   "usedBy": sorted(layer_id, key=path_key),

     

       154
       154
       +
                   "paths": sorted(paths, key=path_key),

     

       155
       155
       +
                   "layerSize": layerSize,

     

       156
       156
       +
                   "closureSize": sum(nodes[path]["narSize"] for path in closure(*paths, key=node_deps)),

     

       157
       157
       +
               }

     

       158
       158
       +
       

     

       159
       159
       +
           layers = {layer_id: layer_info(layer_id)

     

       160
       160
       +
                     for layer_id in set(layer_split.values())}

     

       161
       161
       +
       

     

       162
       162
       +
           # The layer order doesn't actually matter for docker but it's still kind of neat to have layers come

     

       163
       163
       +
           # after all of their dependencies. The easiest way to do that is to order by closure size since a

     

       164
       164
       +
           # layer is necessarily always larger than each of its dependencies since it includes them.

     

       165
       165
       +
           layer_order = sorted(layers.values(), key=lambda info: info["closureSize"])

     

       166
       166
       +
       

     

       167
       167
       +
           if os.environ.get("DEBUG"):

     

       168
       168
       +
               print(json.dumps(layer_order, indent=2), file=sys.stderr)

     

       169
       169
       +
       

     

       170
       170
       +
           # Sanity check that no store path ends up in multiple layers.

     

       171
       171
       +
           total_layer_size = sum(node["layerSize"] for node in layer_order)

     

       172
       172
       +
           total_nar_size = sum(node["narSize"] for node in graph)

     

       173
       173
       +
           assert total_layer_size == total_nar_size, (total_layer_size, total_nar_size)

     

       174
       174
       +
       

     

       175
       175
       +
           # Format as a list of layers, each defined as a list of store paths.

     

       176
       176
       +
           return [[path

     

       177
       177
       +
                    for path in layer["paths"]

     

       178
       178
       +
                    if path not in ignore_paths]

     

       179
       179
       +
                   for layer in layer_order

     

       180
       180
       +
                   if set(layer["paths"]) - ignore_paths]

     

       181
       181
       +
       

     

       182
       182
       +
       if __name__ == '__main__':

     

       183
       183
       +
           import argparse

     

       184
       184
       +
       

     

       185
       185
       +
           parser = argparse.ArgumentParser(

     

       186
       186
       +
               prog='auto-layer',

     

       187
       187
       +
               description='Split store paths into docker layers.'

     

       188
       188
       +
           )

     

       189
       189
       +
           parser.add_argument('graph_file')

     

       190
       190
       +
           parser.add_argument('ignore_file', default="/dev/null")

     

       191
       191
       +
           parser.add_argument('layer_limit', type=int, default=100)

     

       192
       192
       +
           args = parser.parse_args()

     

       193
       193
       +
       

     

       194
       194
       +
           with open(args.graph_file) as f:

     

       195
       195
       +
               graph = json.load(f)

     

       196
       196
       +
       

     

       197
       197
       +
           with open(args.ignore_file) as f:

     

       198
       198
       +
               ignore_paths = {line.strip() for line in f}

     

       199
       199
       +
       

     

       200
       200
       +
           print(json.dumps(auto_layer(graph, ignore_paths, args.layer_limit)))

+26 -18

pkgs/build-support/docker/default.nix

···

       1113
       1113
        
               '';

     

       1114
       1114
        
             };

     

       1115
       1115
        
       

     

       1116
       1116
       -
             layersJsonFile = buildPackages.dockerMakeLayers {

     

       1117
       1117
       -
               inherit debug;

     

       1118
       1118
       -
               closureRoots = optionals includeStorePaths [

     

       1119
       1119
       -
                 baseJson

     

       1120
       1120
       -
                 customisationLayer

     

       1121
       1121
       -
               ];

     

       1122
       1122
       -
               excludePaths = [

     

       1123
       1123
       -
                 baseJson

     

       1124
       1124
       -
                 customisationLayer

     

       1125
       1125
       -
               ];

     

       1126
       1126
       -
               pipeline =

     

       1127
       1127
       -
                 if layeringPipeline != null then

     

       1128
       1128
       -
                   layeringPipeline

     

       1129
       1129
       -
                 else

     

       1130
       1130
       -
                   import ./popularity-contest-layering-pipeline.nix { inherit lib jq runCommand; } {

     

       1131
       1131
       -
                     inherit fromImage maxLayers;

     

       1132
       1132
       -
                   };

     

       1133
       1133
       -
             };

     

       1116
       1116
       +
             closureRoots = optionals includeStorePaths [

     

       1117
       1117
       +
               baseJson

     

       1118
       1118
       +
               customisationLayer

     

       1119
       1119
       +
             ];

     

       1120
       1120
       +
       

     

       1121
       1121
       +
             excludePaths = [

     

       1122
       1122
       +
               baseJson

     

       1123
       1123
       +
               customisationLayer

     

       1124
       1124
       +
             ];

     

       1125
       1125
       +
       

     

       1126
       1126
       +
             layersJsonFile =

     

       1127
       1127
       +
               if layeringPipeline == null then

     

       1128
       1128
       +
                 buildPackages.dockerAutoLayer {

     

       1129
       1129
       +
                   inherit

     

       1130
       1130
       +
                     closureRoots

     

       1131
       1131
       +
                     debug

     

       1132
       1132
       +
                     excludePaths

     

       1133
       1133
       +
                     fromImage

     

       1134
       1134
       +
                     maxLayers

     

       1135
       1135
       +
                     ;

     

       1136
       1136
       +
                 }

     

       1137
       1137
       +
               else

     

       1138
       1138
       +
                 buildPackages.dockerMakeLayers {

     

       1139
       1139
       +
                   inherit closureRoots debug excludePaths;

     

       1140
       1140
       +
                   pipeline = layeringPipeline;

     

       1141
       1141
       +
                 };

     

       1134
       1142
        
       

     

       1135
       1143
        
             conf =

     

       1136
       1144
        
               runCommand "${baseName}-conf.json"

-34

pkgs/build-support/docker/popularity-contest-layering-pipeline.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         runCommand,

     

       4
       4
       -
         jq,

     

       5
       5
       -
       }:

     

       6
       6
       -
       {

     

       7
       7
       -
         maxLayers,

     

       8
       8
       -
         fromImage ? null,

     

       9
       9
       -
       }:

     

       10
       10
       -
       runCommand "popularity-contest-layering-pipeline.json" { inherit maxLayers; } ''

     

       11
       11
       -
         # Compute the number of layers that are already used by a potential

     

       12
       12
       -
         # 'fromImage' as well as the customization layer. Ensure that there is

     

       13
       13
       -
         # still at least one layer available to store the image contents.

     

       14
       14
       -
         # one layer will be taken up by the customisation layer

     

       15
       15
       -
         usedLayers=1

     

       16
       16
       -
       

     

       17
       17
       -
         ${lib.optionalString (fromImage != null) ''

     

       18
       18
       -
           # subtract number of base image layers

     

       19
       19
       -
           baseImageLayersCount=$(tar -xOf "${fromImage}" manifest.json | ${lib.getExe jq} '.[0].Layers | length')

     

       20
       20
       -
       

     

       21
       21
       -
           (( usedLayers += baseImageLayersCount ))

     

       22
       22
       -
         ''}

     

       23
       23
       -
       

     

       24
       24
       -
         if ! (( $usedLayers < $maxLayers )); then

     

       25
       25
       -
           echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \

     

       26
       26
       -
                     "'extraCommands', but only maxLayers=$maxLayers were" \

     

       27
       27
       -
                     "allowed. At least 1 layer is required to store contents."

     

       28
       28
       -
           exit 1

     

       29
       29
       -
         fi

     

       30
       30
       -
         availableLayers=$(( maxLayers - usedLayers ))

     

       31
       31
       -
       

     

       32
       32
       -
         # Produce pipeline which uses popularity_contest algo.

     

       33
       33
       -
         echo '[["popularity_contest"],["limit_layers",'$availableLayers']]' > $out

     

       34
       34
       -
       ''

+2 -2

pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix

···

       10
       10
        
       let

     

       11
       11
        
         darwin_arch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "amd64";

     

       12
       12
        
         darwin_configure = ''

     

       13
       13
       -
           chmod -R +w vendor/github.com/keys-pub/go-libfido2

     

       14
       14
       -
           cat << EOF > vendor/github.com/keys-pub/go-libfido2/fido2_static_${darwin_arch}.go

     

       13
       13
       +
           chmod -R +w vendor/github.com/olastor/go-libfido2

     

       14
       14
       +
           cat << EOF > vendor/github.com/olastor/go-libfido2/fido2_static_${darwin_arch}.go

     

       15
       15
        
           package libfido2

     

       16
       16
        
       

     

       17
       17
        
           /*

+3 -3

pkgs/by-name/at/attic-client/package.nix

···

       21
       21
        
       

     

       22
       22
        
       rustPlatform.buildRustPackage {

     

       23
       23
        
         pname = "attic";

     

       24
       24
       -
         version = "0-unstable-2025-08-16";

     

       24
       24
       +
         version = "0-unstable-2025-08-28";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "zhaofengli";

     

       28
       28
        
           repo = "attic";

     

       29
       29
       -
           rev = "c1cfee9b63e48d9cee18e538ca32f1721078de91";

     

       30
       30
       -
           hash = "sha256-cKw1bfEwW+pQWsvzOAe0GfsSNXTSFS+5MYcZFQB5dFc=";

     

       29
       29
       +
           rev = "2524dd1c007bc7a0a9e9c863a1b02de8d54b319b";

     

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

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/bi/bind/package.nix

···

       29
       29
        
       

     

       30
       30
        
       stdenv.mkDerivation (finalAttrs: {

     

       31
       31
        
         pname = "bind";

     

       32
       32
       -
         version = "9.20.11";

     

       32
       32
       +
         version = "9.20.12";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchurl {

     

       35
       35
        
           url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";

     

       36
       36
       -
           hash = "sha256-TaLVMuZovCHog/bm2dPYF5TZ7GCxgVMDhWSaVvRu4Xo=";

     

       36
       36
       +
           hash = "sha256-3TLW62dQTopDCq9wtO+JTz0CJrRMfgI3DJsNN38ceZk=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         outputs = [

+3 -3

pkgs/by-name/ca/cargo-binstall/package.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "cargo-binstall";

     

       13
       13
       -
         version = "1.14.3";

     

       13
       13
       +
         version = "1.15.3";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "cargo-bins";

     

       17
       17
        
           repo = "cargo-binstall";

     

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

     

       19
       19
       -
           hash = "sha256-mfnrj+mqDvJ5VlpZ6/AETSjDCIF0LaqPQW1yXiuTlvY=";

     

       19
       19
       +
           hash = "sha256-q8zDggvzEyK/kAgDCW98UX1VLR0+jAvHn+hSyQa99dk=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-6RPDiTqn+yoyu3qn28bsBTHgcKnOjqT2ZXIm65AGwag=";

     

       22
       22
       +
         cargoHash = "sha256-HreVuk49FZm90XxUpkfInoSQvILOHirejf/dbx42iTI=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     

       25
       25
        
           pkg-config

+3 -3

pkgs/by-name/ca/catppuccin-kvantum/package.nix

···

       33
       33
        
         stdenvNoCC.mkDerivation

     

       34
       34
        
         {

     

       35
       35
        
           inherit pname;

     

       36
       36
       -
           version = "0-unstable-2025-08-09";

     

       36
       36
       +
           version = "0-unstable-2025-08-18";

     

       37
       37
        
       

     

       38
       38
        
           src = fetchFromGitHub {

     

       39
       39
        
             owner = "catppuccin";

     

       40
       40
        
             repo = "Kvantum";

     

       41
       41
       -
             rev = "48246af7ad19a6b9cde04526a9b57afdecfa0b7b";

     

       42
       42
       -
             hash = "sha256-Axjl2jQinpazVz8w7yFSWkjG/CnmEMmcmrACJrdS1zg=";

     

       41
       41
       +
             rev = "c7cb144b041395e83e4f510a62526b7adfb79911";

     

       42
       42
       +
             hash = "sha256-YNUkri+no+rNLTJHf6cPdy4AmQLzPiRK1Jbp2o8e1LE=";

     

       43
       43
        
           };

     

       44
       44
        
       

     

       45
       45
        
           installPhase = ''

+9 -9

pkgs/by-name/do/dolt/package.nix

···

       4
       4
        
         buildGoModule,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       buildGoModule rec {

     

       7
       7
       +
       buildGoModule (finalAttrs: {

     

       8
       8
        
         pname = "dolt";

     

       9
       9
       -
         version = "1.58.5";

     

       9
       9
       +
         version = "1.59.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "dolthub";

     

       13
       13
        
           repo = "dolt";

     

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

     

       15
       15
       -
           sha256 = "sha256-ieMAld3wssub+vdNNassjpc3X1KPSNhR6GK/EmIwQ28=";

     

       14
       14
       +
           tag = "v${finalAttrs.version}";

     

       15
       15
       +
           hash = "sha256-qIV4pbyrN40joXCgmE0e1EDkfRaHC/G1lwdkpzrO5fU=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         modRoot = "./go";

     

       19
       19
        
         subPackages = [ "cmd/dolt" ];

     

       20
       20
       -
         vendorHash = "sha256-Mr51zbGBnO0sb9KDBiidFpRZk7wHJqbY1fYnXwgqJA8=";

     

       20
       20
       +
         vendorHash = "sha256-DPo1xzV11Q9emVIlrBFQcWXGNXKfYOKzR/hi5nJJp34=";

     

       21
       21
        
         proxyVendor = true;

     

       22
       22
        
         doCheck = false;

     

       23
       23
        
       

     

       24
       24
       -
         meta = with lib; {

     

       24
       24
       +
         meta = {

     

       25
       25
        
           description = "Relational database with version control and CLI a-la Git";

     

       26
       26
        
           mainProgram = "dolt";

     

       27
       27
        
           homepage = "https://github.com/dolthub/dolt";

     

       28
       28
       -
           license = licenses.asl20;

     

       29
       29
       -
           maintainers = with maintainers; [ danbst ];

     

       28
       28
       +
           license = lib.licenses.asl20;

     

       29
       29
       +
           maintainers = with lib.maintainers; [ danbst ];

     

       30
       30
        
         };

     

       31
       31
       -
       }

     

       31
       31
       +
       })

+13 -1

pkgs/by-name/dt/dtc/package.nix

···

       11
       11
        
         which,

     

       12
       12
        
         pythonSupport ? false,

     

       13
       13
        
         python ? null,

     

       14
       14
       +
         replaceVars,

     

       14
       15
        
         swig,

     

       15
       16
        
         libyaml,

     

       16
       17
        
       }:

     
···

       38
       39
        
             url = "https://github.com/dgibson/dtc/commit/ce1d8588880aecd7af264e422a16a8b33617cef7.patch";

     

       39
       40
        
             hash = "sha256-t1CxKnbCXUArtVcniAIdNvahOGXPbYhPCZiTynGLvfo=";

     

       40
       41
        
           })

     

       41
       41
       -
         ];

     

       42
       42
       +
         ]

     

       43
       43
       +
         ++

     

       44
       44
       +
           lib.optional pythonSupport

     

       45
       45
       +
             # Make Meson use our Python version, not the one it was built with itself

     

       46
       46
       +
             (

     

       47
       47
       +
               replaceVars ./python-path.patch {

     

       48
       48
       +
                 python_bin = lib.getExe python;

     

       49
       49
       +
               }

     

       50
       50
       +
             );

     

       42
       51
        
       

     

       43
       52
        
         env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;

     

       44
       53
        
       

     
···

       60
       69
        
       

     

       61
       70
        
         postPatch = ''

     

       62
       71
        
           patchShebangs setup.py

     

       72
       72
       +
       

     

       73
       73
       +
           # Align the name with pypi

     

       74
       74
       +
           sed -i "s/name='libfdt',/name='pylibfdt',/" setup.py

     

       63
       75
        
         '';

     

       64
       76
        
       

     

       65
       77
        
         # Required for installation of Python library and is innocuous otherwise.

+12

pkgs/by-name/dt/dtc/python-path.patch

···

       1
       1
       +
       diff --git a/meson.build b/meson.build

     

       2
       2
       +
       index 310699f..4e2b8a4 100644

     

       3
       3
       +
       --- a/meson.build

     

       4
       4
       +
       +++ b/meson.build

     

       5
       5
       +
       @@ -48,7 +48,7 @@ if not valgrind.found()

     

       6
       6
       +
        endif

     

       7
       7
       +
        

     

       8
       8
       +
        py = import('python')

     

       9
       9
       +
       -py = py.find_installation(required: get_option('python'))

     

       10
       10
       +
       +py = py.find_installation('@python_bin@', required: get_option('python'))

     

       11
       11
       +
        swig = find_program('swig', required: get_option('python'))

     

       12
       12
       +
        pylibfdt_enabled = not meson.is_cross_build() and py.found() and swig.found() ? true : false

+3 -3

pkgs/by-name/ek/eksctl/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "eksctl";

     

       10
       10
       -
         version = "0.212.0";

     

       10
       10
       +
         version = "0.214.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "weaveworks";

     

       14
       14
        
           repo = "eksctl";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           hash = "sha256-XOnRMD4EG0N8A2s4YlXqiukt9y6/YbHdJxGz9MM/iLc=";

     

       16
       16
       +
           hash = "sha256-JsVW1JC3VdxCJpngPCkrIbH5B/YlAKOc/SOIEo7s8mo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-WtrJJZRbH5RuKUJCXDqu9YuEIBflzvmIAWNqbTgcFeo=";

     

       19
       19
       +
         vendorHash = "sha256-0tdhi2uqC1aIK9Nkfr9OuV0mCWiT0sNX1W3hgz1vslU=";

     

       20
       20
        
       

     

       21
       21
        
         doCheck = false;

     

       22
       22

+42 -42

pkgs/by-name/fa/factorio/versions.json

···

       3
       3
        
           "alpha": {

     

       4
       4
        
             "experimental": {

     

       5
       5
        
               "candidateHashFilenames": [

     

       6
       6
       -
                 "factorio_linux_2.0.64.tar.xz"

     

       6
       6
       +
                 "factorio_linux_2.0.66.tar.xz"

     

       7
       7
        
               ],

     

       8
       8
       -
               "name": "factorio_alpha_x64-2.0.64.tar.xz",

     

       8
       8
       +
               "name": "factorio_alpha_x64-2.0.66.tar.xz",

     

       9
       9
        
               "needsAuth": true,

     

       10
       10
       -
               "sha256": "2c9ac3fa4a0c8433960edb8ba74b832e7e883c41ea73dda69b1608d4e967e826",

     

       10
       10
       +
               "sha256": "8140abc1017b00de329244e62ae7866406a96c2b5ee6f3d481aeaf86c7f8738a",

     

       11
       11
        
               "tarDirectory": "x64",

     

       12
       12
       -
               "url": "https://factorio.com/get-download/2.0.64/alpha/linux64",

     

       13
       13
       -
               "version": "2.0.64"

     

       12
       12
       +
               "url": "https://factorio.com/get-download/2.0.66/alpha/linux64",

     

       13
       13
       +
               "version": "2.0.66"

     

       14
       14
        
             },

     

       15
       15
        
             "stable": {

     

       16
       16
        
               "candidateHashFilenames": [

     

       17
       17
       -
                 "factorio_linux_2.0.60.tar.xz"

     

       17
       17
       +
                 "factorio_linux_2.0.66.tar.xz"

     

       18
       18
        
               ],

     

       19
       19
       -
               "name": "factorio_alpha_x64-2.0.60.tar.xz",

     

       19
       19
       +
               "name": "factorio_alpha_x64-2.0.66.tar.xz",

     

       20
       20
        
               "needsAuth": true,

     

       21
       21
       -
               "sha256": "d022ee9a9b7376077687232c16a3c809e847dab00e02915ec146fb4b548dd24f",

     

       21
       21
       +
               "sha256": "8140abc1017b00de329244e62ae7866406a96c2b5ee6f3d481aeaf86c7f8738a",

     

       22
       22
        
               "tarDirectory": "x64",

     

       23
       23
       -
               "url": "https://factorio.com/get-download/2.0.60/alpha/linux64",

     

       24
       24
       -
               "version": "2.0.60"

     

       23
       23
       +
               "url": "https://factorio.com/get-download/2.0.66/alpha/linux64",

     

       24
       24
       +
               "version": "2.0.66"

     

       25
       25
        
             }

     

       26
       26
        
           },

     

       27
       27
        
           "demo": {

     

       28
       28
        
             "experimental": {

     

       29
       29
        
               "candidateHashFilenames": [

     

       30
       30
       -
                 "factorio-demo_linux_2.0.42.tar.xz"

     

       30
       30
       +
                 "factorio-demo_linux_2.0.66.tar.xz"

     

       31
       31
        
               ],

     

       32
       32
       -
               "name": "factorio_demo_x64-2.0.42.tar.xz",

     

       32
       32
       +
               "name": "factorio_demo_x64-2.0.66.tar.xz",

     

       33
       33
        
               "needsAuth": false,

     

       34
       34
       -
               "sha256": "eb06c7521f7ed557e6642a7954b0395ee5c993367e1f97c65f0336a94abbba42",

     

       34
       34
       +
               "sha256": "74250b0717d41406dc297d0a75103c91413b2b68395e4f3260c5c67cbeec4bda",

     

       35
       35
        
               "tarDirectory": "x64",

     

       36
       36
       -
               "url": "https://factorio.com/get-download/2.0.42/demo/linux64",

     

       37
       37
       -
               "version": "2.0.42"

     

       36
       36
       +
               "url": "https://factorio.com/get-download/2.0.66/demo/linux64",

     

       37
       37
       +
               "version": "2.0.66"

     

       38
       38
        
             },

     

       39
       39
        
             "stable": {

     

       40
       40
        
               "candidateHashFilenames": [

     

       41
       41
       -
                 "factorio-demo_linux_2.0.42.tar.xz"

     

       41
       41
       +
                 "factorio-demo_linux_2.0.66.tar.xz"

     

       42
       42
        
               ],

     

       43
       43
       -
               "name": "factorio_demo_x64-2.0.42.tar.xz",

     

       43
       43
       +
               "name": "factorio_demo_x64-2.0.66.tar.xz",

     

       44
       44
        
               "needsAuth": false,

     

       45
       45
       -
               "sha256": "eb06c7521f7ed557e6642a7954b0395ee5c993367e1f97c65f0336a94abbba42",

     

       45
       45
       +
               "sha256": "74250b0717d41406dc297d0a75103c91413b2b68395e4f3260c5c67cbeec4bda",

     

       46
       46
        
               "tarDirectory": "x64",

     

       47
       47
       -
               "url": "https://factorio.com/get-download/2.0.42/demo/linux64",

     

       48
       48
       -
               "version": "2.0.42"

     

       47
       47
       +
               "url": "https://factorio.com/get-download/2.0.66/demo/linux64",

     

       48
       48
       +
               "version": "2.0.66"

     

       49
       49
        
             }

     

       50
       50
        
           },

     

       51
       51
        
           "expansion": {

     

       52
       52
        
             "experimental": {

     

       53
       53
        
               "candidateHashFilenames": [

     

       54
       54
       -
                 "factorio-space-age_linux_2.0.64.tar.xz"

     

       54
       54
       +
                 "factorio-space-age_linux_2.0.66.tar.xz"

     

       55
       55
        
               ],

     

       56
       56
       -
               "name": "factorio_expansion_x64-2.0.64.tar.xz",

     

       56
       56
       +
               "name": "factorio_expansion_x64-2.0.66.tar.xz",

     

       57
       57
        
               "needsAuth": true,

     

       58
       58
       -
               "sha256": "e86f813290d636da9a0715f6700d7b3a60998714146417442688599551529683",

     

       58
       58
       +
               "sha256": "98443ba14d65ba8f4b268a73b6c40e4a27d6fc50ddf80e7286bb4a3b49cc4bbb",

     

       59
       59
        
               "tarDirectory": "x64",

     

       60
       60
       -
               "url": "https://factorio.com/get-download/2.0.64/expansion/linux64",

     

       61
       61
       -
               "version": "2.0.64"

     

       60
       60
       +
               "url": "https://factorio.com/get-download/2.0.66/expansion/linux64",

     

       61
       61
       +
               "version": "2.0.66"

     

       62
       62
        
             },

     

       63
       63
        
             "stable": {

     

       64
       64
        
               "candidateHashFilenames": [

     

       65
       65
       -
                 "factorio-space-age_linux_2.0.60.tar.xz"

     

       65
       65
       +
                 "factorio-space-age_linux_2.0.66.tar.xz"

     

       66
       66
        
               ],

     

       67
       67
       -
               "name": "factorio_expansion_x64-2.0.60.tar.xz",

     

       67
       67
       +
               "name": "factorio_expansion_x64-2.0.66.tar.xz",

     

       68
       68
        
               "needsAuth": true,

     

       69
       69
       -
               "sha256": "56a933745f2cf3144bc984031229cb7b8a16eace523fa9288e8eca915e4d8186",

     

       69
       69
       +
               "sha256": "98443ba14d65ba8f4b268a73b6c40e4a27d6fc50ddf80e7286bb4a3b49cc4bbb",

     

       70
       70
        
               "tarDirectory": "x64",

     

       71
       71
       -
               "url": "https://factorio.com/get-download/2.0.60/expansion/linux64",

     

       72
       72
       -
               "version": "2.0.60"

     

       71
       71
       +
               "url": "https://factorio.com/get-download/2.0.66/expansion/linux64",

     

       72
       72
       +
               "version": "2.0.66"

     

       73
       73
        
             }

     

       74
       74
        
           },

     

       75
       75
        
           "headless": {

     

       76
       76
        
             "experimental": {

     

       77
       77
        
               "candidateHashFilenames": [

     

       78
       78
       -
                 "factorio-headless_linux_2.0.64.tar.xz",

     

       79
       79
       -
                 "factorio_headless_x64_2.0.64.tar.xz"

     

       78
       78
       +
                 "factorio-headless_linux_2.0.66.tar.xz",

     

       79
       79
       +
                 "factorio_headless_x64_2.0.66.tar.xz"

     

       80
       80
        
               ],

     

       81
       81
       -
               "name": "factorio_headless_x64-2.0.64.tar.xz",

     

       81
       81
       +
               "name": "factorio_headless_x64-2.0.66.tar.xz",

     

       82
       82
        
               "needsAuth": false,

     

       83
       83
       -
               "sha256": "729480a81fc3b3bd105bd0c92e108ee1caaac7840cc168cb32b0f9db8759a28a",

     

       83
       83
       +
               "sha256": "f1b3976eacc4e233800d399d90006c356fa366f5d64341c504c95c0cba321c06",

     

       84
       84
        
               "tarDirectory": "x64",

     

       85
       85
       -
               "url": "https://factorio.com/get-download/2.0.64/headless/linux64",

     

       86
       86
       -
               "version": "2.0.64"

     

       85
       85
       +
               "url": "https://factorio.com/get-download/2.0.66/headless/linux64",

     

       86
       86
       +
               "version": "2.0.66"

     

       87
       87
        
             },

     

       88
       88
        
             "stable": {

     

       89
       89
        
               "candidateHashFilenames": [

     

       90
       90
       -
                 "factorio-headless_linux_2.0.60.tar.xz",

     

       91
       91
       -
                 "factorio_headless_x64_2.0.60.tar.xz"

     

       90
       90
       +
                 "factorio-headless_linux_2.0.66.tar.xz",

     

       91
       91
       +
                 "factorio_headless_x64_2.0.66.tar.xz"

     

       92
       92
        
               ],

     

       93
       93
       -
               "name": "factorio_headless_x64-2.0.60.tar.xz",

     

       93
       93
       +
               "name": "factorio_headless_x64-2.0.66.tar.xz",

     

       94
       94
        
               "needsAuth": false,

     

       95
       95
       -
               "sha256": "69b5be1a867fd99524f9914dfee900a1ac386cf4e74c4a63768c05dc4d2b2b0b",

     

       95
       95
       +
               "sha256": "f1b3976eacc4e233800d399d90006c356fa366f5d64341c504c95c0cba321c06",

     

       96
       96
        
               "tarDirectory": "x64",

     

       97
       97
       -
               "url": "https://factorio.com/get-download/2.0.60/headless/linux64",

     

       98
       98
       -
               "version": "2.0.60"

     

       97
       97
       +
               "url": "https://factorio.com/get-download/2.0.66/headless/linux64",

     

       98
       98
       +
               "version": "2.0.66"

     

       99
       99
        
             }

     

       100
       100
        
           }

     

       101
       101
        
         }

+55

pkgs/by-name/ge/gemini-cli-bin/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenvNoCC,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         nodejs,

     

       6
       6
       +
         gitUpdater,

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         owner = "google-gemini";

     

       10
       10
       +
         repo = "gemini-cli";

     

       11
       11
       +
         asset = "gemini.js";

     

       12
       12
       +
       in

     

       13
       13
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       14
       14
       +
         pname = "gemini-cli-bin";

     

       15
       15
       +
         version = "0.3.4";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchurl {

     

       18
       18
       +
           url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/${asset}";

     

       19
       19
       +
           hash = "sha256-aVcizpbzV1hPsuMSGRxgMGXTyF+0yBqGk7EwPnKFDyQ=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         phases = [

     

       23
       23
       +
           "installPhase"

     

       24
       24
       +
           "fixupPhase"

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         strictDeps = true;

     

       28
       28
       +
       

     

       29
       29
       +
         buildInputs = [ nodejs ];

     

       30
       30
       +
       

     

       31
       31
       +
         installPhase = ''

     

       32
       32
       +
           runHook preInstall

     

       33
       33
       +
       

     

       34
       34
       +
           install -D "$src" "$out/bin/gemini"

     

       35
       35
       +
       

     

       36
       36
       +
           runHook postInstall

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         passthru.updateScript = [

     

       40
       40
       +
           ./update-asset.sh

     

       41
       41
       +
           "${owner}/${repo}"

     

       42
       42
       +
           "${asset}"

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       46
       46
       +
           description = "AI agent that brings the power of Gemini directly into your terminal";

     

       47
       47
       +
           homepage = "https://github.com/google-gemini/gemini-cli";

     

       48
       48
       +
           license = lib.licenses.asl20;

     

       49
       49
       +
           maintainers = with lib.maintainers; [ ljxfstorm ];

     

       50
       50
       +
           mainProgram = "gemini";

     

       51
       51
       +
           platforms = lib.platforms.linux ++ lib.platforms.darwin;

     

       52
       52
       +
           sourceProvenance = [ lib.sourceTypes.binaryBytecode ];

     

       53
       53
       +
           priority = 10;

     

       54
       54
       +
         };

     

       55
       55
       +
       })

+34

pkgs/by-name/ge/gemini-cli-bin/update-asset.sh

···

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

     

       2
       2
       +
       #!nix-shell -i bash -p gnugrep curl jq gnused

     

       3
       3
       +
       

     

       4
       4
       +
       set -euo pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       cd "$(dirname "${BASH_SOURCE[0]}")"

     

       7
       7
       +
       

     

       8
       8
       +
       NIX_FILE="package.nix"

     

       9
       9
       +
       RELEASE_ID="latest"

     

       10
       10
       +
       

     

       11
       11
       +
       GITHUB_REPO="$1"

     

       12
       12
       +
       ASSET_NAME="$2"

     

       13
       13
       +
       REV_PREFIX="${3:-v}"

     

       14
       14
       +
       

     

       15
       15
       +
       CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "${NIX_FILE}")"

     

       16
       16
       +
       CURRENT_HASH="$(grep -oP 'hash = "\K[^"]+' "${NIX_FILE}")"

     

       17
       17
       +
       {

     

       18
       18
       +
           read -r LATEST_VER

     

       19
       19
       +
           read -r ASSET_DIGEST

     

       20
       20
       +
       } < <(curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/${GITHUB_REPO}/releases/${RELEASE_ID}" | jq -r ".tag_name, (.assets[] | select(.name == \"${ASSET_NAME}\") | .digest)")

     

       21
       21
       +
       

     

       22
       22
       +
       LATEST_VER="${LATEST_VER#"${REV_PREFIX}"}"

     

       23
       23
       +
       

     

       24
       24
       +
       if [[ "${LATEST_VER}" == "${CURRENT_VER}" ]]; then

     

       25
       25
       +
           echo "Up to date."

     

       26
       26
       +
           exit 0

     

       27
       27
       +
       fi

     

       28
       28
       +
       

     

       29
       29
       +
       LATEST_HASH="$(nix-hash --to-sri "${ASSET_DIGEST}")"

     

       30
       30
       +
       

     

       31
       31
       +
       sed -i "s#hash = \"${CURRENT_HASH}\";#hash = \"${LATEST_HASH}\";#g" "${NIX_FILE}"

     

       32
       32
       +
       sed -i "s#version = \"${CURRENT_VER}\";#version = \"${LATEST_VER}\";#g" "${NIX_FILE}"

     

       33
       33
       +
       

     

       34
       34
       +
       echo "Successfully updated from ${CURRENT_VER} to version ${LATEST_VER}."

+2 -2

pkgs/by-name/gi/git-quick-stats/package.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "git-quick-stats";

     

       16
       16
       -
         version = "2.7.0";

     

       16
       16
       +
         version = "2.8.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           repo = "git-quick-stats";

     

       20
       20
        
           owner = "arzzen";

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-utY3oD0IqnqyyDJv7i4hLkLCXukNcYSdZcaj8NUwRu0=";

     

       22
       22
       +
           sha256 = "sha256-YVvlrlNRDDci7fH9LW4NxZcIkakVgvKe9FhJ2gCfoXg=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ makeWrapper ];

+5 -2

pkgs/by-name/gn/gnucobol/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       -
         autoconf269,

     

       5
       5
       +
         autoconf,

     

       6
       6
        
         automake,

     

       7
       7
        
         libtool,

     

       8
       8
        
         pkg-config,

     
···

       37
       37
        
       

     

       38
       38
        
         nativeBuildInputs = [

     

       39
       39
        
           pkg-config

     

       40
       40
       -
           autoconf269

     

       40
       40
       +
           autoconf

     

       41
       41
        
           automake

     

       42
       42
        
           help2man

     

       43
       43
        
           libtool

     
···

       75
       75
        
           sed -i "/^843;/d" tests/testsuite

     

       76
       76
        
           # test 875 (INDEXED sample)

     

       77
       77
        
           sed -i "/^875;/d" tests/testsuite

     

       78
       78
       +
       

     

       79
       79
       +
           # gnucobol.texi:2765: no matching `@end verbatim'

     

       80
       80
       +
           sed -i "214i @end verbatim" doc/cbrunt.tex

     

       78
       81
        
         '';

     

       79
       82
        
       

     

       80
       83
        
         preConfigure = ''

+3 -3

pkgs/by-name/hu/hugo/package.nix

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule (finalAttrs: {

     

       13
       13
        
         pname = "hugo";

     

       14
       14
       -
         version = "0.148.2";

     

       14
       14
       +
         version = "0.149.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "gohugoio";

     

       18
       18
        
           repo = "hugo";

     

       19
       19
        
           tag = "v${finalAttrs.version}";

     

       20
       20
       -
           hash = "sha256-6ILQRihdVkDrL5sEITfGzzMzXFmvYpO39s/QeUAVW6o=";

     

       20
       20
       +
           hash = "sha256-IGgh3uipi1HWdB3Y9hNGMUFL1WQVDGJlxd1dNK7OhH8=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-vckvhw1kpcI2SXSNjUR6u5o21qz9ZcWw+namDglpwxc=";

     

       23
       23
       +
         vendorHash = "sha256-d1eZ452ia2bj6ahEl1Mbva2iBi5IaKeYidP9bg7Thtc=";

     

       24
       24
        
       

     

       25
       25
        
         checkFlags =

     

       26
       26
        
           let

+9 -7

pkgs/by-name/ir/irqbalance/package.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "irqbalance";

     

       16
       16
       -
         version = "1.9.4";

     

       16
       16
       +
         version = "1.9.4-unstable-2025-06-10";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
       -
           owner = "irqbalance";

     

       19
       19
       +
           owner = "Irqbalance";

     

       20
       20
        
           repo = "irqbalance";

     

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

     

       22
       22
       -
           sha256 = "sha256-7es7wwsPnDSF37uL5SCgAQB+u+qGWmWDHOh3JkHuXMs=";

     

       21
       21
       +
           rev = "8e8945e5092caf45605dfb1e66165e2eb9ec1f56";

     

       22
       22
       +
           sha256 = "sha256-DSXFJZ0MyI10ZVFcGY0Sx1kye1ALMeG41nmyqbfO8vQ=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

     
···

       37
       37
        
       

     

       38
       38
        
         configureFlags = lib.optionals enableSystemd [

     

       39
       39
        
           "--with-systemd"

     

       40
       40
       +
           "systemdsystemunitdir=$$out/lib/systemd/system"

     

       40
       41
        
         ];

     

       41
       42
        
       

     

       42
       43
        
         postInstall = ''

     

       43
       44
        
           # Systemd service

     

       44
       44
       -
           mkdir -p "$out/lib/systemd/system"

     

       45
       45
       -
           grep -vi "EnvironmentFile" misc/irqbalance.service >"$out/lib/systemd/system/irqbalance.service"

     

       45
       45
       +
           sed -i "/^EnvironmentFile=/d" "$out/lib/systemd/system/irqbalance.service"

     

       46
       46
        
           substituteInPlace "$out/lib/systemd/system/irqbalance.service" \

     

       47
       47
        
             --replace-fail /usr/sbin/irqbalance "$out/bin/irqbalance --journal" \

     

       48
       48
        
             --replace-fail ' $IRQBALANCE_ARGS' ""

     
···

       50
       50
        
       

     

       51
       51
        
         meta = {

     

       52
       52
        
           homepage = "https://github.com/Irqbalance/irqbalance";

     

       53
       53
       -
           changelog = "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}";

     

       53
       53
       +
           changelog = lib.strings.optionalString (

     

       54
       54
       +
             !lib.strings.hasInfix "-unstable-" version

     

       55
       55
       +
           ) "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}";

     

       54
       56
        
           description = "Daemon to help balance the cpu load generated by interrupts across all of a systems cpus";

     

       55
       57
        
           license = lib.licenses.gpl2Only;

     

       56
       58
        
           platforms = lib.platforms.linux;

+3 -3

pkgs/by-name/jo/joplin-desktop/release-data.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "3.4.6",

     

       3
       3
       -
         "hash": "sha256-++9FYxeRVPPesw8ZYH6a2UdYTkaU7sJa8lURqBsYy94=",

     

       2
       2
       +
         "version": "3.4.10",

     

       3
       3
       +
         "hash": "sha256-BN+6Db4I4Rumr4V6scjpnfiYlJ6fkaI3tiqU2fWoZJQ=",

     

       4
       4
        
         "plugins": {

     

       5
       5
        
           "io.github.jackgruber.backup": {

     

       6
       6
        
             "name": "joplin-plugin-backup",

     
···

       15
       15
        
             "npmDepsHash": "sha256-qwhVFSDafTnKihcwZtLK5fS/Nc15e+ezAso47T1LGec="

     

       16
       16
        
           }

     

       17
       17
        
         },

     

       18
       18
       -
         "deps_hash": "sha256-j/Ge+OdWQw+Ja9S9D8tjERiO2uifeSa4Za/IyzrIRSw="

     

       18
       18
       +
         "deps_hash": "sha256-7sZX39OtNNPq5RE7+Oj58QqHhcrTY8FOdncKp3b40jQ="

     

       19
       19
        
       }

+2 -2

pkgs/by-name/la/lagrange/package.nix

···

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation (finalAttrs: {

     

       24
       24
        
         pname = "lagrange";

     

       25
       25
       -
         version = "1.18.8";

     

       25
       25
       +
         version = "1.19.1";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "skyjake";

     

       29
       29
        
           repo = "lagrange";

     

       30
       30
        
           tag = "v${finalAttrs.version}";

     

       31
       31
       -
           hash = "sha256-wJ+rfg0LSdtbQ4GyBvPGEpc/Ml67ivlxhnqQskJtsuw=";

     

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

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/la/lazysql/package.nix

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule rec {

     

       13
       13
        
         pname = "lazysql";

     

       14
       14
       -
         version = "0.4.0";

     

       14
       14
       +
         version = "0.4.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "jorgerojas26";

     

       18
       18
        
           repo = "lazysql";

     

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

     

       20
       20
       -
           hash = "sha256-XQjdMmHVrNzfQN/uFQFxGK9LwnRh1IkAvRQSDcAYWXo=";

     

       20
       20
       +
           hash = "sha256-M6G0Bp9s1XhgZL9BZDzbJmUmE+UHidpsGIaNt1i7CGw=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-LLOUTml/mz7edCUy82k+S5PfpFovgUTQr0BoQQXiVGs=";

     

       23
       23
       +
         vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";

     

       24
       24
        
       

     

       25
       25
        
         ldflags = [

     

       26
       26
        
           "-X main.version=${version}"

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "libatomic_ops";

     

       12
       12
       -
         version = "7.8.2";

     

       12
       12
       +
         version = "7.8.4";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           urls = [

     

       16
       16
        
             "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"

     

       17
       17
        
             "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"

     

       18
       18
        
           ];

     

       19
       19
       -
           sha256 = "sha256-0wUgf+IH8rP7XLTAGdoStEzj/LxZPf1QgNhnsaJBm1E=";

     

       19
       19
       +
           sha256 = "sha256-I1bgAugO9pWHXpcdak/YxhylxvpP0b8xzOVKJpyL/NU=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         outputs = [

+2 -2

pkgs/by-name/ma/matomo/package.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "matomo";

     

       13
       13
       -
         version = "5.3.2";

     

       13
       13
       +
         version = "5.4.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";

     

       17
       17
       -
           hash = "sha256-rn5Lr2BSrGitI16MLlP91znSPm2Asd6j0qI8N+1c+Lo=";

     

       17
       17
       +
           hash = "sha256-PRZYqJBebDsjeT9WBArRX3GKFbW5TtejV2FOo8jjaMU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ makeWrapper ];

-1

pkgs/by-name/ox/oxidized/.bundle/config

···

       1
       1
       -
       BUNDLE_BUILD__RUGGED: --with-ssh

+56 -5

pkgs/by-name/ox/oxidized/package.nix

···

       4
       4
        
         bundlerApp,

     

       5
       5
        
         bundlerUpdateScript,

     

       6
       6
        
         nixosTests,

     

       7
       7
       +
         libssh2,

     

       8
       8
       +
         pkg-config,

     

       9
       9
       +
         openssl,

     

       10
       10
       +
         cmake,

     

       11
       11
       +
         libgit2,

     

       12
       12
       +
         icu,

     

       13
       13
       +
         which,

     

       14
       14
       +
         file,

     

       15
       15
       +
         zlib,

     

       16
       16
       +
         libyaml,

     

       7
       17
        
       }:

     

       8
       18
        
       

     

       9
       19
        
       bundlerApp {

     
···

       17
       27
        
           "oxs"

     

       18
       28
        
         ];

     

       19
       29
        
       

     

       30
       30
       +
         gemConfig = {

     

       31
       31
       +
           rugged = attrs: {

     

       32
       32
       +
             buildInputs = [

     

       33
       33
       +
               pkg-config

     

       34
       34
       +
               cmake

     

       35
       35
       +
             ];

     

       36
       36
       +
             nativeBuildInputs = [

     

       37
       37
       +
               pkg-config

     

       38
       38
       +
               cmake

     

       39
       39
       +
             ];

     

       40
       40
       +
             propagatedBuildInputs = [

     

       41
       41
       +
               libssh2

     

       42
       42
       +
               openssl

     

       43
       43
       +
               libgit2

     

       44
       44
       +
             ];

     

       45
       45
       +
       

     

       46
       46
       +
             dontUseCmakeConfigure = true;

     

       47
       47
       +
             buildFlags = [ "--with-ssh" ];

     

       48
       48
       +
           };

     

       49
       49
       +
       

     

       50
       50
       +
           charlock_holmes = attrs: {

     

       51
       51
       +
             buildInputs = [

     

       52
       52
       +
               icu

     

       53
       53
       +
               zlib

     

       54
       54
       +
             ];

     

       55
       55
       +
             nativeBuildInputs = [

     

       56
       56
       +
               which

     

       57
       57
       +
               pkg-config

     

       58
       58
       +
               file

     

       59
       59
       +
             ];

     

       60
       60
       +
           };

     

       61
       61
       +
       

     

       62
       62
       +
           psych = attrs: {

     

       63
       63
       +
             buildInputs = [ libyaml ];

     

       64
       64
       +
             nativeBuildInputs = [ pkg-config ];

     

       65
       65
       +
           };

     

       66
       66
       +
         };

     

       67
       67
       +
       

     

       20
       68
        
         passthru = {

     

       21
       69
        
           tests = nixosTests.oxidized;

     

       22
       70
        
           updateScript = bundlerUpdateScript "oxidized";

     

       23
       71
        
         };

     

       24
       72
        
       

     

       25
       25
       -
         meta = with lib; {

     

       73
       73
       +
         meta = {

     

       26
       74
        
           description = "Network device configuration backup tool. It's a RANCID replacement";

     

       27
       75
        
           homepage = "https://github.com/ytti/oxidized";

     

       28
       28
       -
           license = licenses.asl20;

     

       29
       29
       -
           maintainers = with maintainers; [ nicknovitski ];

     

       30
       30
       -
           teams = [ teams.wdz ];

     

       31
       31
       -
           platforms = platforms.linux;

     

       76
       76
       +
           license = lib.licenses.asl20;

     

       77
       77
       +
           maintainers = with lib.maintainers; [

     

       78
       78
       +
             nicknovitski

     

       79
       79
       +
             liberodark

     

       80
       80
       +
           ];

     

       81
       81
       +
           teams = with lib.teams; [ wdz ];

     

       82
       82
       +
           platforms = lib.platforms.linux;

     

       32
       83
        
         };

     

       33
       84
        
       }

+3 -3

pkgs/by-name/pi/pixelfed/package.nix

···

       10
       10
        
       

     

       11
       11
        
       php.buildComposerProject2 (finalAttrs: {

     

       12
       12
        
         pname = "pixelfed";

     

       13
       13
       -
         version = "0.12.5";

     

       13
       13
       +
         version = "0.12.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "pixelfed";

     

       17
       17
        
           repo = "pixelfed";

     

       18
       18
        
           tag = "v${finalAttrs.version}";

     

       19
       19
       -
           hash = "sha256-bPoYEPCWj7vAKDL/P4yjhrfp4HK9sbBh4eK0Co+xaZc=";

     

       19
       19
       +
           hash = "sha256-FxJWoFNyIGQ6o9g2Q0/jaBMyeH8UnbTgha2goHAurvY=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-nJCxWIrsdGQxdiJe9skHv4AnqUpqZHuqXrl/cQrT9Ps=";

     

       22
       22
       +
         vendorHash = "sha256-ciHP6dE42pXupZl4V37RWcHkIZ+xf6cnpwqd3C1dNmQ=";

     

       23
       23
        
       

     

       24
       24
        
         postInstall = ''

     

       25
       25
        
           chmod -R u+w $out/share

+2 -2

pkgs/by-name/q/q/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "q";

     

       9
       9
       -
         version = "0.19.5";

     

       9
       9
       +
         version = "0.19.8";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "natesales";

     

       13
       13
        
           repo = "q";

     

       14
       14
        
           tag = "v${version}";

     

       15
       15
       -
           hash = "sha256-Chvh+L1RV/T/blFjGS2wiJynXxbWE6eKbu4TRTFTb3o=";

     

       15
       15
       +
           hash = "sha256-kR++GyCdv/5/7E+BeZdTQTjokh2vU5sXjz0f/Ld18g0=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         vendorHash = "sha256-7OknLdkJB3ujX/DL+DVdWFK5RcoEw5R9h/KY4OfKeCw=";

+3 -3

pkgs/by-name/rn/rnote/package.nix

···

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "rnote";

     

       30
       30
       -
         version = "0.12.0";

     

       30
       30
       +
         version = "0.13.0";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "flxzt";

     

       34
       34
        
           repo = "rnote";

     

       35
       35
        
           tag = "v${version}";

     

       36
       36
       -
           hash = "sha256-uEYamKIZIjR7c2LB+GydLmxy+EhcKrcxV+9vsveqGVk=";

     

       36
       36
       +
           hash = "sha256-YA2iqHqeh1uZsXSwyn4EWYAUXUgXvshNqSo6MS8U6ZQ=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       40
       40
        
           inherit pname version src;

     

       41
       41
       -
           hash = "sha256-bzB4yjBcMsOqbq1UCgPFErzVOXs55qy+CYBUinGEbg4=";

     

       41
       41
       +
           hash = "sha256-p5GrvzECinqCryvMNfSI8QZTXHnytI7jJqolkX76lOo=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         nativeBuildInputs = [

+1 -2

pkgs/by-name/sn/snagboot/package.nix

···

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         pythonRemoveDeps = [

     

       29
       29
       -
           "pylibfdt"

     

       30
       29
        
           "swig"

     

       31
       30
        
         ];

     

       32
       31
        
       

     
···

       40
       39
        
           pyserial

     

       41
       40
        
           tftpy

     

       42
       41
        
           crccheck

     

       43
       43
       -
           # pylibfdt

     

       42
       42
       +
           libfdt

     

       44
       43
        
           # swig

     

       45
       44
        
           packaging

     

       46
       45
        
         ];

+11 -13

pkgs/by-name/sq/squid/package.nix

···

       17
       17
        
         ipv6 ? true,

     

       18
       18
        
         nixosTests,

     

       19
       19
        
       }:

     

       20
       20
       -
       

     

       21
       20
        
       stdenv.mkDerivation (finalAttrs: {

     

       22
       21
        
         pname = "squid";

     

       23
       23
       -
         version = "7.0.1";

     

       22
       22
       +
         version = "7.1";

     

       24
       23
        
       

     

       25
       24
        
         src = fetchurl {

     

       26
       25
        
           url = "https://github.com/squid-cache/squid/releases/download/SQUID_${

     

       27
       26
        
             builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version

     

       28
       27
        
           }/squid-${finalAttrs.version}.tar.xz";

     

       29
       29
       -
           hash = "sha256-Bw3Y5iGtItRdcAYF6xnSysG2zae3PwTzRXjTw/2N35s=";

     

       28
       28
       +
           hash = "sha256-djtaeFYc7cTkdjT6QrjmuNRsh8lJoVG056wjltL5feo=";

     

       30
       29
        
         };

     

       31
       30
        
       

     

       32
       31
        
         nativeBuildInputs = [ pkg-config ];

     
···

       81
       80
        
           cd test-suite/

     

       82
       81
        
         '';

     

       83
       82
        
       

     

       84
       84
       -
         installPhase = ''

     

       85
       85
       -
           runHook preInstall

     

       86
       86
       -
           mkdir -p $out/bin $out/libexec $out/etc $out/share

     

       83
       83
       +
         # exit from test-suite/ dir back to src root for correct makefile

     

       84
       84
       +
         postCheck = ''

     

       87
       85
        
           cd ..

     

       88
       88
       -
           cp src/squid $out/bin

     

       89
       89
       -
           cp src/unlinkd $out/libexec

     

       90
       90
       -
           cp src/mime.conf.default $out/etc/mime.conf

     

       91
       91
       -
           cp src/log/file/log_file_daemon $out/libexec

     

       92
       92
       -
           cp -r icons $out/share

     

       93
       93
       -
           cp -r errors $out/share

     

       94
       94
       -
           runHook postInstall

     

       86
       86
       +
         '';

     

       87
       87
       +
       

     

       88
       88
       +
         # remove unusual nixos paths (pre-made /var dirs, config grammar) and rename sbin output

     

       89
       89
       +
         postInstall = ''

     

       90
       90
       +
           rm -r $out/var

     

       91
       91
       +
           rm $out/share/mib.txt

     

       92
       92
       +
           mv $out/sbin $out/bin

     

       95
       93
        
         '';

     

       96
       94
        
       

     

       97
       95
        
         passthru.tests.squid = nixosTests.squid;

+3 -3

pkgs/by-name/st/steel/package.nix

···

       19
       19
        
       }:

     

       20
       20
        
       rustPlatform.buildRustPackage {

     

       21
       21
        
         pname = "steel";

     

       22
       22
       -
         version = "0-unstable-2025-08-30";

     

       22
       22
       +
         version = "0-unstable-2025-09-06";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "mattwparas";

     

       26
       26
        
           repo = "steel";

     

       27
       27
       -
           rev = "c24b1f36012850e54375c9421d7289aae6fc528e";

     

       28
       28
       -
           hash = "sha256-zKdIPW2r/8l1Qo+4nGToAk1+3PuT+M/norYw3+ywfhI=";

     

       27
       27
       +
           rev = "0ff387fce6fc4a02fad4cde594f7db09598ef73d";

     

       28
       28
       +
           hash = "sha256-1f+OhoTkdk+mW+PawrrqWYW5HpIpFZ3nO5IJP68/LzM=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         cargoHash = "sha256-a7wene1oI2lhMUo8iguosXyk1G12bhrEdK7IJ/WgRq4=";

+2 -2

pkgs/by-name/th/the-foundation/package.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation (finalAttrs: {

     

       15
       15
        
         pname = "the-foundation";

     

       16
       16
       -
         version = "1.9.1";

     

       16
       16
       +
         version = "1.10.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitea {

     

       19
       19
        
           domain = "git.skyjake.fi";

     

       20
       20
        
           owner = "skyjake";

     

       21
       21
        
           repo = "the_Foundation";

     

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

     

       23
       23
       -
           hash = "sha256-M3nG/926bz9US4R9cTyBw2n6oNy7VriGGzuHgRWX4eg=";

     

       23
       23
       +
           hash = "sha256-+z5vw6TIs+5RyS3CLSLIdflJqnDu8NL+yFHpSxwG2fM=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+4 -4

pkgs/by-name/tm/tmuxinator/package.nix

···

       13
       13
        
         inherit ruby;

     

       14
       14
        
         name = "${gemName}-${version}";

     

       15
       15
        
         gemName = "tmuxinator";

     

       16
       16
       -
         version = "3.3.3";

     

       17
       17
       -
         source.sha256 = "sha256-kT0S5I+x5qYKqMwSOQl1je1zfOPOj2KT8YvJc7jFp5A=";

     

       16
       16
       +
         version = "3.3.5";

     

       17
       17
       +
         source.sha256 = "sha256-lkP0gCjMCcc8MpOA7aLrQut7jkpaZt9v9GWqh4C/JyE=";

     

       18
       18
        
       

     

       19
       19
        
         erubi = buildRubyGem rec {

     

       20
       20
        
           inherit ruby;

     
···

       28
       28
        
           inherit ruby;

     

       29
       29
        
           name = "ruby${ruby.version}-${gemName}-${version}";

     

       30
       30
        
           gemName = "thor";

     

       31
       31
       -
           version = "1.3.2";

     

       32
       32
       -
           source.sha256 = "sha256-7vApO54kFYzK16s4Oug1NLetTtmcCflvGmsDZVCrvto=";

     

       31
       31
       +
           version = "1.4.0";

     

       32
       32
       +
           source.sha256 = "sha256-h2PoIsyw8de+6IzeExsZplYGZXuEfMe3tLgudyvNij0=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         xdg = buildRubyGem rec {

+13 -11

pkgs/by-name/tr/tradingview/package.nix

···

       14
       14
        
         libsecret,

     

       15
       15
        
         libxkbcommon,

     

       16
       16
        
         libgbm,

     

       17
       17
       +
         libGL,

     

       17
       18
        
         pango,

     

       18
       19
        
         sqlite,

     

       19
       20
        
         systemd,

     
···

       23
       24
        
       

     

       24
       25
        
       stdenv.mkDerivation (finalAttrs: {

     

       25
       26
        
         pname = "tradingview";

     

       26
       26
       -
         version = "2.9.6";

     

       27
       27
       -
         revision = "63";

     

       27
       27
       +
         version = "2.12.0";

     

       28
       28
       +
         revision = "66";

     

       28
       29
        
       

     

       29
       30
        
         src = fetchurl {

     

       30
       31
        
           url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";

     

       31
       31
       -
           hash = "sha256-WmeGtR/rOzlgTpa1JZKskxre2ONtzppYsA/yhDhv5TI=";

     

       32
       32
       +
           hash = "sha512-ydk0/mJh4M02oIEfU3PKTwEO+nMpeJGuxQAly8WqJLx5GOQAb/J7VRB8IQpHHqWGeRfbwhantdZryQF8ngFJ/g==";

     

       32
       33
        
         };

     

       33
       34
        
       

     

       34
       35
        
         nativeBuildInputs = [

     
···

       48
       49
        
           libsecret

     

       49
       50
        
           libxkbcommon

     

       50
       51
        
           libgbm

     

       52
       52
       +
           libGL

     

       51
       53
        
           pango

     

       52
       54
        
           sqlite

     

       53
       55
        
           systemd

     
···

       71
       73
        
           mkdir -p $out/share

     

       72
       74
        
           cp -r squashfs-root $out/share/tradingview

     

       73
       75
        
           rm -rf $out/share/tradingview/meta

     

       74
       74
       -
       

     

       75
       75
       -
           install -Dm444 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications

     

       76
       76
       -
           substituteInPlace $out/share/applications/tradingview.desktop \

     

       76
       76
       +
           substituteInPlace squashfs-root/meta/gui/tradingview.desktop \

     

       77
       77
        
             --replace-fail \$\{SNAP}/meta/gui/icon.png tradingview

     

       78
       78
       -
       

     

       79
       79
       -
           mkdir $out/share/icons

     

       80
       80
       -
           cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png

     

       81
       81
       -
       

     

       78
       78
       +
           install -D --mode 644 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications

     

       79
       79
       +
           install -D --mode 644 squashfs-root/meta/gui/icon.png $out/share/icons/hicolor/512x512/apps/tradingview.png

     

       82
       80
        
           mkdir $out/bin

     

       83
       83
       -
           makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview \

     

       81
       81
       +
           makeWrapper $out/share/tradingview/tradingview $out/bin/tradingview \

     

       84
       82
        
             --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}

     

       85
       83
        
       

     

       86
       84
        
           runHook postInstall

     

       85
       85
       +
         '';

     

       86
       86
       +
       

     

       87
       87
       +
         preFixup = ''

     

       88
       88
       +
           patchelf --add-needed libGL.so.1 $out/share/tradingview/tradingview

     

       87
       89
        
         '';

     

       88
       90
        
       

     

       89
       91
        
         passthru.updateScript = ./update.sh;

+6 -27

pkgs/by-name/tr/tradingview/update.sh

···

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

     

       2
       2
       -
       #! nix-shell -i bash -p curl jq git gnused gnugrep

     

       2
       2
       +
       #! nix-shell -i bash -p curl jq gitMinimal gnused gnugrep

     

       3
       3
        
       

     

       4
       4
        
       #

     

       5
       5
        
       # Get latest version of TradingView from Snapcraft.

     

       6
       6
        
       #

     

       7
       7
        
       

     

       8
       8
        
       snap_info=($(

     

       9
       9
       -
         curl -s -H 'X-Ubuntu-Series: 16' \

     

       10
       10
       -
           'https://api.snapcraft.io/api/v1/snaps/details/tradingview' \

     

       11
       11
       -
         | jq --raw-output \

     

       12
       12
       -
           '.revision,.download_sha512,.version,.last_updated'

     

       9
       9
       +
         curl --silent --header 'X-Ubuntu-Series: 16' \

     

       10
       10
       +
           'https://api.snapcraft.io/api/v1/snaps/details/tradingview' |

     

       11
       11
       +
           jq --raw-output \

     

       12
       12
       +
             '.revision,.download_sha512,.version,.last_updated'

     

       13
       13
        
       ))

     

       14
       14
        
       

     

       15
       15
        
       # "revision" is the actual version identifier; "version" is for human consumption.

     
···

       27
       27
        
       

     

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

     

       29
       29
        
       tradingview_nix="$nixpkgs/pkgs/by-name/tr/tradingview/package.nix"

     

       30
       30
       -
       current_nix_version=$(

     

       31
       31
       -
         grep 'version\s*=' "$tradingview_nix" \

     

       32
       32
       -
         | sed -Ene 's/.*"(.*)".*/\1/p'

     

       33
       33
       -
       )

     

       30
       30
       +
       current_nix_version=$(nix eval --raw --file . tradingview.version)

     

       34
       31
        
       

     

       35
       32
        
       echo "Current nix version: $current_nix_version"

     

       36
       33
        
       

     
···

       50
       47
        
         -e 's#hash\s*=\s*"[^"]*"\s*;#hash = "'"${sri}"'";#' \

     

       51
       48
        
         -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \

     

       52
       49
        
         -i "$tradingview_nix"

     

       53
       53
       -
       

     

       54
       54
       -
       #

     

       55
       55
       -
       # Attempt a build.

     

       56
       56
       -
       #

     

       57
       57
       -
       

     

       58
       58
       -
       export NIXPKGS_ALLOW_UNFREE=1

     

       59
       59
       -
       

     

       60
       60
       -
       if ! nix-build -A tradingview "$nixpkgs"; then

     

       61
       61
       -
         echo "The updated TradingView failed to build."

     

       62
       62
       -
         exit 1

     

       63
       63
       -
       fi

     

       64
       64
       -
       

     

       65
       65
       -
       #

     

       66
       66
       -
       # Commit changes.

     

       67
       67
       -
       #

     

       68
       68
       -
       git add "$tradingview_nix"

     

       69
       69
       -
       git commit -m "tradingview: ${current_nix_version} -> ${upstream_version}"

     

       70
       70
       -

+2 -2

pkgs/by-name/uv/uv-sort/package.nix

···

       6
       6
        
       

     

       7
       7
        
       python3Packages.buildPythonApplication rec {

     

       8
       8
        
         pname = "uv-sort";

     

       9
       9
       -
         version = "0.6.0";

     

       9
       9
       +
         version = "0.6.1";

     

       10
       10
        
         pyproject = true;

     

       11
       11
        
       

     

       12
       12
        
         # Build from GitHub does not work. Use fetchPypi instead of fetchFromGitHub.

     
···

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           pname = "uv_sort";

     

       16
       16
        
           inherit version;

     

       17
       17
       -
           hash = "sha256-umKMcQcQST0bBGf7ZXxNcWq/5/ht3jp+3JVjowBdeO0=";

     

       17
       17
       +
           hash = "sha256-ovOCiu22ClSheWDsPBAx5s+LcR5jIQFqb1Dm0wpEKGU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         postPatch = ''

+2 -2

pkgs/by-name/vu/vunnel/package.nix

···

       7
       7
        
       

     

       8
       8
        
       python3.pkgs.buildPythonApplication rec {

     

       9
       9
        
         pname = "vunnel";

     

       10
       10
       -
         version = "0.38.0";

     

       10
       10
       +
         version = "0.38.2";

     

       11
       11
        
         pyproject = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "anchore";

     

       15
       15
        
           repo = "vunnel";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-sb22uR34yZxLMwac15Q6d17K/TP2rAXUGFMzKyA05Lg=";

     

       17
       17
       +
           hash = "sha256-Ec6gPwg5I5QplILFXlwl6AmwlaBytkRiQ9+FoRKdhTY=";

     

       18
       18
        
           leaveDotGit = true;

     

       19
       19
        
         };

     

       20
       20

pkgs/by-name/zl/zls/deps.nix pkgs/development/tools/zls/deps_0_14.nix

-40

pkgs/by-name/zl/zls/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         zig_0_14,

     

       5
       5
       -
         fetchFromGitHub,

     

       6
       6
       -
         callPackage,

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
       -
         pname = "zls";

     

       11
       11
       -
         version = "0.14.0";

     

       12
       12
       -
       

     

       13
       13
       -
         src = fetchFromGitHub {

     

       14
       14
       -
           owner = "zigtools";

     

       15
       15
       -
           repo = "zls";

     

       16
       16
       -
           tag = finalAttrs.version;

     

       17
       17
       -
           fetchSubmodules = true;

     

       18
       18
       -
           hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";

     

       19
       19
       -
         };

     

       20
       20
       -
       

     

       21
       21
       -
         nativeBuildInputs = [ zig_0_14.hook ];

     

       22
       22
       -
       

     

       23
       23
       -
         postPatch = ''

     

       24
       24
       -
           ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

     

       25
       25
       -
         '';

     

       26
       26
       -
       

     

       27
       27
       -
         meta = {

     

       28
       28
       -
           description = "Zig LSP implementation + Zig Language Server";

     

       29
       29
       -
           mainProgram = "zls";

     

       30
       30
       -
           changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}";

     

       31
       31
       -
           homepage = "https://github.com/zigtools/zls";

     

       32
       32
       -
           license = lib.licenses.mit;

     

       33
       33
       -
           maintainers = with lib.maintainers; [

     

       34
       34
       -
             figsoda

     

       35
       35
       -
             moni

     

       36
       36
       -
             _0x5a4

     

       37
       37
       -
           ];

     

       38
       38
       -
           platforms = lib.platforms.unix;

     

       39
       39
       -
         };

     

       40
       40
       -
       })

+2 -2

pkgs/development/compilers/binaryen/default.nix

···

       20
       20
        
       in

     

       21
       21
        
       stdenv.mkDerivation rec {

     

       22
       22
        
         pname = "binaryen";

     

       23
       23
       -
         version = "123";

     

       23
       23
       +
         version = "124";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "WebAssembly";

     

       27
       27
        
           repo = "binaryen";

     

       28
       28
        
           rev = "version_${version}";

     

       29
       29
       -
           hash = "sha256-SFruWOJVxO3Ll1HwjK3DYSPY2IprnDly7QjxrECTrzE=";

     

       29
       29
       +
           hash = "sha256-tkvO0gNESliRV6FOpXDQd7ZKujGe6q1mGX5V+twcE1o=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

-4

pkgs/development/compilers/ghc/9.0.2.nix

···

       1
       1
       -
       import ./common-make-native-bignum.nix {

     

       2
       2
       -
         version = "9.0.2";

     

       3
       3
       -
         sha256 = "140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197";

     

       4
       4
       -
       }

+4 -25

pkgs/development/compilers/ghc/common-make-native-bignum.nix

···

       355
       355
        
               ]

     

       356
       356
        
           )

     

       357
       357
        
       

     

       358
       358
       -
           ++ lib.optionals (lib.versionAtLeast version "9.2") [

     

       358
       358
       +
           ++ [

     

       359
       359
        
             # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs

     

       360
       360
        
             # Can be removed if the Cabal library included with ghc backports the linked fix

     

       361
       361
        
             (fetchpatch {

     
···

       363
       363
        
               stripLen = 1;

     

       364
       364
        
               extraPrefix = "libraries/Cabal/";

     

       365
       365
        
               sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";

     

       366
       366
       -
             })

     

       367
       367
       -
           ]

     

       368
       368
       -
       

     

       369
       369
       -
           ++ lib.optionals (lib.versionOlder version "9.2.2") [

     

       370
       370
       -
             # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.

     

       371
       371
       -
             # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423

     

       372
       372
       -
             (fetchpatch {

     

       373
       373
       -
               name = "ghc-9.0.2-fcompact-unwind.patch";

     

       374
       374
       -
               # Note that the test suite is not packaged.

     

       375
       375
       -
               url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";

     

       376
       376
       -
               sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";

     

       377
       366
        
             })

     

       378
       367
        
           ]

     

       379
       368
        
       

     
···

       417
       406
        
             # These cause problems as they're not eliminated by GHC's dead code

     

       418
       407
        
             # elimination on aarch64-darwin. (see

     

       419
       408
        
             # https://github.com/NixOS/nixpkgs/issues/140774 for details).

     

       420
       420
       -
             (

     

       421
       421
       -
               if lib.versionAtLeast version "9.2" then

     

       422
       422
       -
                 ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch

     

       423
       423
       -
               else

     

       424
       424
       -
                 ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch

     

       425
       425
       -
             )

     

       409
       409
       +
             ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch

     

       426
       410
        
           ];

     

       427
       411
        
       

     

       428
       412
        
           postPatch = "patchShebangs .";

     
···

       483
       467
        
       

     

       484
       468
        
             echo -n "${buildMK}" > mk/build.mk

     

       485
       469
        
           ''

     

       486
       486
       -
           + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") ''

     

       470
       470
       +
           + lib.optionalString (lib.versionAtLeast version "9.4") ''

     

       487
       471
        
             sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

     

       488
       472
        
           ''

     

       489
       473
        
           + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''

     
···

       495
       479
        
           + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       496
       480
        
             export NIX_LDFLAGS+=" -no_dtrace_dof"

     

       497
       481
        
           ''

     

       498
       498
       -
           + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") ''

     

       482
       482
       +
           + lib.optionalString (stdenv.hostPlatform.isDarwin) ''

     

       499
       483
        
       

     

       500
       484
        
             # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7

     

       501
       485
        
             export XATTR=${lib.getBin xattr}/bin/xattr

     
···

       603
       587
        
           ]

     

       604
       588
        
           ++ lib.optionals enableDocs [

     

       605
       589
        
             sphinx

     

       606
       606
       -
           ]

     

       607
       607
       -
           ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [

     

       608
       608
       -
             # TODO(@sternenseemann): backport addition of XATTR env var like

     

       609
       609
       -
             # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447

     

       610
       610
       -
             xattr

     

       611
       590
        
           ];

     

       612
       591
        
       

     

       613
       592
        
           # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs.

-57

pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch

···

       1
       1
       -
       From aed1c4b0be7576d20eed81070da2c6f92573df18 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Keshav Kini <keshav.kini@gmail.com>

     

       3
       3
       -
       Date: Sat, 30 May 2020 21:27:47 -0700

     

       4
       4
       -
       Subject: [PATCH] Fix some paths for Nix build

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        books/build/features.sh                                     | 1 +

     

       8
       8
       -
        books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp          | 6 +-----

     

       9
       9
       -
        .../bundle/software/cl+ssl-20220707-git/src/reload.lisp     | 3 +++

     

       10
       10
       -
        3 files changed, 5 insertions(+), 5 deletions(-)

     

       11
       11
       -
       

     

       12
       12
       -
       diff --git a/books/build/features.sh b/books/build/features.sh

     

       13
       13
       -
       index feb5b2b59c..4b654e08bc 100755

     

       14
       14
       -
       --- a/books/build/features.sh

     

       15
       15
       -
       +++ b/books/build/features.sh

     

       16
       16
       -
       @@ -125,6 +125,7 @@ EOF

     

       17
       17
       -
        fi

     

       18
       18
       -
        

     

       19
       19
       -
        echo "Determining whether an ipasir shared library is installed" 1>&2

     

       20
       20
       -
       +IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@}

     

       21
       21
       -
        if check_ipasir; then

     

       22
       22
       -
            cat >> Makefile-features <<EOF

     

       23
       23
       -
        export OS_HAS_IPASIR ?= 1

     

       24
       24
       -
       diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp

     

       25
       25
       -
       index 762e4ad4c0..c9802cb582 100644

     

       26
       26
       -
       --- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp

     

       27
       27
       -
       +++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp

     

       28
       28
       -
       @@ -30,11 +30,7 @@

     

       29
       29
       -
        

     

       30
       30
       -
        (er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*)))

     

       31
       31
       -
          (handler-case

     

       32
       32
       -
       -      (cffi::load-foreign-library

     

       33
       33
       -
       -       (or libname

     

       34
       34
       -
       -           (cw "WARNING: $IPASIR_SHARED_LIBRARY not specified, ~

     

       35
       35
       -
       -                defaulting to \"libipasirglucose4.so\"")

     

       36
       36
       -
       -           "libipasirglucose4.so"))

     

       37
       37
       -
       +      (cffi::load-foreign-library (or libname "@libipasir@"))

     

       38
       38
       -
            (error () (er hard? 'load-ipasir-shardlib-raw

     

       39
       39
       -
                          "Couldn't load ipasir shared library from ~s0."

     

       40
       40
       -
                          libname))))

     

       41
       41
       -
       diff --git a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp

     

       42
       42
       -
       index d409b4440f..5c65c5b4da 100644

     

       43
       43
       -
       --- a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp

     

       44
       44
       -
       +++ b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp

     

       45
       45
       -
       @@ -87,6 +87,9 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib

     

       46
       46
       -
        ;;

     

       47
       47
       -
        ;; These are 32-bit only.

     

       48
       48
       -
        

     

       49
       49
       -
       +(cl+ssl/config:define-libssl-path "@libssl@")

     

       50
       50
       -
       +(cl+ssl/config:define-libcrypto-path "@libcrypto@")

     

       51
       51
       -
       +

     

       52
       52
       -
        (unless cl+ssl/config::*libcrypto-override*

     

       53
       53
       -
          (cffi:define-foreign-library libcrypto

     

       54
       54
       -
            (:windows (:or #+(and windows x86-64) "libcrypto-1_1-x64.dll"

     

       55
       55
       -
       -- 

     

       56
       56
       -
       2.31.1

     

       57
       57
       -

+56

pkgs/development/interpreters/acl2/0001-path-changes-for-nix.patch

···

       1
       1
       +
       From 2c7829aec41f6915bda2a23af57f0b39b075a70b Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: C4 Patino <c4patino@gmail.com>

     

       3
       3
       +
       Date: Wed, 3 Sep 2025 22:43:05 -0500

     

       4
       4
       +
       Subject: [PATCH] path changes for nix

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        books/build/features.sh                                     | 1 +

     

       8
       8
       +
        books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp          | 6 +-----

     

       9
       9
       +
        .../bundle/software/cl+ssl-20231021-git/src/reload.lisp     | 2 ++

     

       10
       10
       +
        3 files changed, 4 insertions(+), 5 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/books/build/features.sh b/books/build/features.sh

     

       13
       13
       +
       index 20ef1f1cc7..e8a16396e3 100755

     

       14
       14
       +
       --- a/books/build/features.sh

     

       15
       15
       +
       +++ b/books/build/features.sh

     

       16
       16
       +
       @@ -125,6 +125,7 @@ EOF

     

       17
       17
       +
        fi

     

       18
       18
       +
        

     

       19
       19
       +
        echo "Determining whether an ipasir shared library is installed" 1>&2

     

       20
       20
       +
       +IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@}

     

       21
       21
       +
        if check_ipasir; then

     

       22
       22
       +
            cat >> Makefile-features <<EOF

     

       23
       23
       +
        export OS_HAS_IPASIR ?= 1

     

       24
       24
       +
       diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp

     

       25
       25
       +
       index 762e4ad4c0..abc95d0ad8 100644

     

       26
       26
       +
       --- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp

     

       27
       27
       +
       +++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp

     

       28
       28
       +
       @@ -30,11 +30,7 @@

     

       29
       29
       +
        

     

       30
       30
       +
        (er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*)))

     

       31
       31
       +
          (handler-case

     

       32
       32
       +
       -      (cffi::load-foreign-library

     

       33
       33
       +
       -       (or libname

     

       34
       34
       +
       -           (cw "WARNING: $IPASIR_SHARED_LIBRARY not specified, ~

     

       35
       35
       +
       -                defaulting to \"libipasirglucose4.so\"")

     

       36
       36
       +
       -           "libipasirglucose4.so"))

     

       37
       37
       +
       +(cffi::load-foreign-library (or libname "@libipasir@"))

     

       38
       38
       +
            (error () (er hard? 'load-ipasir-shardlib-raw

     

       39
       39
       +
                          "Couldn't load ipasir shared library from ~s0."

     

       40
       40
       +
                          libname))))

     

       41
       41
       +
       diff --git a/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp

     

       42
       42
       +
       index 05ab8837d0..fb60937580 100644

     

       43
       43
       +
       --- a/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp

     

       44
       44
       +
       +++ b/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp

     

       45
       45
       +
       @@ -14,6 +14,8 @@

     

       46
       46
       +
        ;;;     put this directly into ffi.lisp

     

       47
       47
       +
        

     

       48
       48
       +
        (in-package :cl+ssl)

     

       49
       49
       +
       +(cl+ssl/config:define-libssl-path "@libssl@")

     

       50
       50
       +
       +(cl+ssl/config:define-libcrypto-path "@libcrypto@")

     

       51
       51
       +
        

     

       52
       52
       +
        ;; The default OS-X libssl seems have had insufficient crypto algos

     

       53
       53
       +
        ;; (missing TLSv1_[1,2]_XXX methods,

     

       54
       54
       +
       -- 

     

       55
       55
       +
       2.50.1

     

       56
       56
       +

+3 -11

pkgs/development/interpreters/acl2/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         callPackage,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       -
         fetchpatch,

     

       7
       6
        
         runCommandLocal,

     

       8
       7
        
         makeWrapper,

     

       9
       8
        
         replaceVars,

     

       10
       9
        
         sbcl,

     

       11
       11
       -
         bash,

     

       12
       10
        
         which,

     

       13
       11
        
         perl,

     

       14
       12
        
         hostname,

     
···

       35
       33
        
       in

     

       36
       34
        
       stdenv.mkDerivation rec {

     

       37
       35
        
         pname = "acl2";

     

       38
       38
       -
         version = "8.5";

     

       36
       36
       +
         version = "8.6";

     

       39
       37
        
       

     

       40
       38
        
         src = fetchFromGitHub {

     

       41
       39
        
           owner = "acl2-devel";

     

       42
       40
        
           repo = "acl2-devel";

     

       43
       41
        
           rev = version;

     

       44
       44
       -
           sha256 = "12cv5ms1j3vfrq066km020nwxb6x2dzh12g8nz6xxyxysn44wzzi";

     

       42
       42
       +
           sha256 = "sha256-fF9bbEacwCHP1m/eVgFrTD4Ne7L2mzq0K9vJ1tiy9go=";

     

       45
       43
        
         };

     

       46
       44
        
       

     

       47
       45
        
         # You can swap this out with any other IPASIR implementation at

     
···

       52
       50
        
         libipasir = callPackage ./libipasirglucose4 { };

     

       53
       51
        
       

     

       54
       52
        
         patches = [

     

       55
       55
       -
           (replaceVars ./0001-Fix-some-paths-for-Nix-build.patch {

     

       53
       53
       +
           (replaceVars ./0001-path-changes-for-nix.patch {

     

       56
       54
        
             libipasir = "${libipasir}/lib/${libipasir.libname}";

     

       57
       55
        
             libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       58
       56
        
             libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       59
       59
       -
           })

     

       60
       60
       -
           (fetchpatch {

     

       61
       61
       -
             name = "fix-fastnumio-on-newer-sbcl.patch";

     

       62
       62
       -
             url = "https://github.com/acl2-devel/acl2-devel/commit/84f5a6cd4a1aaf204e8bae3eab4c21e8c061f469.patch";

     

       63
       63
       -
             hash = "sha256-VA9giXZMb/Ob8ablxfbBAaZ2+2PGcv7WtooXwKDgT08=";

     

       64
       57
        
           })

     

       65
       58
        
         ];

     

       66
       59
        
       

     
···

       204
       197
        
             raskin

     

       205
       198
        
           ];

     

       206
       199
        
           platforms = platforms.all;

     

       207
       207
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       208
       200
        
         };

     

       209
       201
        
       }

pkgs/development/python-modules/aws-adfs/default.nix

···

       37
       37
        
       

     

       38
       38
        
         pythonRelaxDeps = [

     

       39
       39
        
           "configparser"

     

       40
       40
       +
           "fido2"

     

       41
       41
       +
           "lxml"

     

       40
       42
        
           "requests-kerberos"

     

       41
       43
        
         ];

     

       42
       44

+2 -2

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

···

       359
       359
        
       

     

       360
       360
        
       buildPythonPackage rec {

     

       361
       361
        
         pname = "boto3-stubs";

     

       362
       362
       -
         version = "1.40.22";

     

       362
       362
       +
         version = "1.40.24";

     

       363
       363
        
         pyproject = true;

     

       364
       364
        
       

     

       365
       365
        
         disabled = pythonOlder "3.7";

     
···

       367
       367
        
         src = fetchPypi {

     

       368
       368
        
           pname = "boto3_stubs";

     

       369
       369
        
           inherit version;

     

       370
       370
       -
           hash = "sha256-cVpE7wRrVEUfHCIH03nTs6pOrkOk5TrTHiCprJuZdTc=";

     

       370
       370
       +
           hash = "sha256-U9ezPaAAE0lVd8l58wknH7UWbXPW1C7F9qPJinaMUIo=";

     

       371
       371
        
         };

     

       372
       372
        
       

     

       373
       373
        
         build-system = [ setuptools ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "botocore-stubs";

     

       13
       13
       -
         version = "1.40.22";

     

       13
       13
       +
         version = "1.40.24";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           pname = "botocore_stubs";

     

       20
       20
        
           inherit version;

     

       21
       21
       -
           hash = "sha256-y24G5tSY4WkVl3H91bjYkh9PAZFj4Jke5OSgKM6I+EU=";

     

       21
       21
       +
           hash = "sha256-JfM6Yla2Boeagi8ZfP5C6BV6dJxsg6hqHDwejpeEYqo=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ setuptools ];

+2 -2

pkgs/development/python-modules/dbt-adapters/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "dbt-adapters";

     

       18
       18
       -
         version = "1.16.5";

     

       18
       18
       +
         version = "1.16.6";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         # missing tags on GitHub

     

       22
       22
        
         src = fetchPypi {

     

       23
       23
        
           pname = "dbt_adapters";

     

       24
       24
        
           inherit version;

     

       25
       25
       -
           hash = "sha256-OAPGC88WvBy/3sGyDO4pAHLYYe2+k7l7PpKpNcV+IdM=";

     

       25
       25
       +
           hash = "sha256-XSyJBzDXw0hozTie7BKN4Zmshm5sidkz3KQ9Jet8Mwc=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ hatchling ];

-5

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

···

       25
       25
        
           sha256 = "sha256-UJU8b9BzuuUSHRjnA6hOd1bMPNOlk4LNtrQV5aZmGhI=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         patches = [

     

       29
       29
       -
           # Change name of pylibfdt to libfdt

     

       30
       30
       -
           ./fix_libfdt_name.patch

     

       31
       31
       -
         ];

     

       32
       32
       -
       

     

       33
       28
        
         nativeBuildInputs = [ setuptools-scm ];

     

       34
       29
        
       

     

       35
       30
        
         propagatedBuildInputs = [

-13

pkgs/development/python-modules/dtschema/fix_libfdt_name.patch

···

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

     

       2
       2
       -
       index 2192a68..6a7ba95 100644

     

       3
       3
       -
       --- a/pyproject.toml

     

       4
       4
       -
       +++ b/pyproject.toml

     

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

     

       6
       6
       -
            "ruamel.yaml>0.15.69",

     

       7
       7
       -
            "jsonschema>=4.1.2,<4.18",

     

       8
       8
       -
            "rfc3987",

     

       9
       9
       -
       -    "pylibfdt",

     

       10
       10
       -
       +    "libfdt",

     

       11
       11
       -
        ]

     

       12
       12
       -
        

     

       13
       13
       -
        [project.scripts]

+2 -2

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

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "groq";

     

       25
       25
       -
         version = "0.31.0";

     

       25
       25
       +
         version = "0.31.1";

     

       26
       26
        
         pyproject = true;

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "groq";

     

       30
       30
        
           repo = "groq-python";

     

       31
       31
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-6oTRqAt421WE0s5e2kqDtCgOLg1bSqTTQldQ5D05Flo=";

     

       32
       32
       +
           hash = "sha256-vckFFnk66gkxaoqKpjykkpQIbiWqUyuTDgSvhKqsC4A=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         postPatch = ''

pkgs/development/python-modules/gstools-cython/default.nix

···

       23
       23
        
           hash = "sha256-Kzn/ThLjTGy3ZYIkTwCV1wi22c7rWo4u/L3llppC6wQ=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       +
         postPatch = ''

     

       27
       27
       +
           substituteInPlace pyproject.toml \

     

       28
       28
       +
             --replace-fail "Cython>=3.0.10,<3.1.0" "Cython>=3.1.0,<4.0.0"

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       26
       31
        
         build-system = [

     

       27
       32
        
           cython

     

       28
       33
        
           extension-helpers

+2 -2

pkgs/development/python-modules/ha-philipsjs/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "ha-philipsjs";

     

       17
       17
       -
         version = "3.3.3";

     

       17
       17
       +
         version = "3.3.4";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.8";

     
···

       23
       23
        
           owner = "danielperna84";

     

       24
       24
        
           repo = "ha-philipsjs";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-CQfT+jCICHjnldM7sjJN47dTD4WVkxfXmW5g80mnoTU=";

     

       26
       26
       +
           hash = "sha256-Ui15KtTpyfVTHmiHNVx/99qiUtKLZeyOOtAuQvfnU8k=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/llama-cloud-services/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "llama-cloud-services";

     

       20
       20
       -
         version = "0.6.60";

     

       20
       20
       +
         version = "0.6.64";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "run-llama";

     

       25
       25
        
           repo = "llama_cloud_services";

     

       26
       26
        
           tag = "v${version}";

     

       27
       27
       -
           hash = "sha256-ZXuIPxZzB50c25kfLNO67jv4dKwjI8Pbd6Ql6JoXCxc=";

     

       27
       27
       +
           hash = "sha256-LIRrMIOwSPo150seWbufRyzaCIJ2lNvbn5N/kFu9hDA=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         sourceRoot = "${src.name}/py";

+2 -2

pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "llama-index-vector-stores-postgres";

     

       14
       14
       -
         version = "0.6.3";

     

       14
       14
       +
         version = "0.6.5";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           pname = "llama_index_vector_stores_postgres";

     

       19
       19
        
           inherit version;

     

       20
       20
       -
           hash = "sha256-sV0ufDvyoLGHVJNKhM9TJEA7lAHisxvNsAQY7S0Ddww=";

     

       20
       20
       +
           hash = "sha256-mRViARNZeVVMS8VzVBFz9d+FjsX+1M/bwnQeA1QR8mI=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         pythonRemoveDeps = [ "psycopg2-binary" ];

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "meshcore";

     

       17
       17
       -
         version = "2.1.5";

     

       17
       17
       +
         version = "2.1.6";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "sha256-gXofzLmydfN0Shrrlbwk+6Rr2kARPqypP6+43rHZOJE=";

     

       22
       22
       +
           sha256 = "sha256-aEuY4N4QIJTPjonhtAYG97yIXnxKp1I5kt25pCiJjOM=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ hatchling ];

+20 -20

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

···

       210
       210
        
             "sha256-HQWGDqUurjpbCTJJ+GDZn/UvVz421D3Ls7EHemTa8uY=";

     

       211
       211
        
       

     

       212
       212
        
         mypy-boto3-cleanrooms =

     

       213
       213
       -
           buildMypyBoto3Package "cleanrooms" "1.40.13"

     

       214
       214
       -
             "sha256-KY5ybw74lvBMSJvMqNzJvgw4vuGHN13zo/gLV0ggCAw=";

     

       213
       213
       +
           buildMypyBoto3Package "cleanrooms" "1.40.24"

     

       214
       214
       +
             "sha256-iB5nKmHx1fGzMH8oLpeZ+D9GdZchstOUqZW94Xl/SJ4=";

     

       215
       215
        
       

     

       216
       216
        
         mypy-boto3-cloud9 =

     

       217
       217
        
           buildMypyBoto3Package "cloud9" "1.40.20"

     
···

       226
       226
        
             "sha256-fFnHwgB8r239cpVnWSfeiGO1MNOxkXn9MNMUA5ohm04=";

     

       227
       227
        
       

     

       228
       228
        
         mypy-boto3-cloudformation =

     

       229
       229
       -
           buildMypyBoto3Package "cloudformation" "1.40.0"

     

       230
       230
       -
             "sha256-oL6q5WNV+z5etEOdZakZqeYfbqL2n/vwoD/WtFrYlfA=";

     

       229
       229
       +
           buildMypyBoto3Package "cloudformation" "1.40.24"

     

       230
       230
       +
             "sha256-4rAK/GqrExGyWMkxSO7qWz7q2UxyA+KP+f046fzihIg=";

     

       231
       231
        
       

     

       232
       232
        
         mypy-boto3-cloudfront =

     

       233
       233
       -
           buildMypyBoto3Package "cloudfront" "1.40.5"

     

       234
       234
       -
             "sha256-vuRBMVk6gQ+mfNLG/QV/EjvwfX3mM3ttgK/zUsi0ghA=";

     

       233
       233
       +
           buildMypyBoto3Package "cloudfront" "1.40.23"

     

       234
       234
       +
             "sha256-uh7A5QPl5fZsP7AEvN8rZ/pX5l9944/Y0FH3lb6CJWo=";

     

       235
       235
        
       

     

       236
       236
        
         mypy-boto3-cloudhsm =

     

       237
       237
        
           buildMypyBoto3Package "cloudhsm" "1.40.15"

     
···

       446
       446
        
             "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA=";

     

       447
       447
        
       

     

       448
       448
        
         mypy-boto3-ec2 =

     

       449
       449
       -
           buildMypyBoto3Package "ec2" "1.40.22"

     

       450
       450
       -
             "sha256-/3K4h289byzH6csvWD2SiBSrgjTmfqAsxj3Uxu7Rl3E=";

     

       449
       449
       +
           buildMypyBoto3Package "ec2" "1.40.24"

     

       450
       450
       +
             "sha256-aCUBD3OHew/OStwEJTJyXZSSJfwPCA6db86wWdv1obc=";

     

       451
       451
        
       

     

       452
       452
        
         mypy-boto3-ec2-instance-connect =

     

       453
       453
        
           buildMypyBoto3Package "ec2-instance-connect" "1.40.20"

     
···

       929
       929
        
             "sha256-G+Kn0K9lI24r/A+KBOE2euh+raKIystZ7uB2k9AD/Zg=";

     

       930
       930
        
       

     

       931
       931
        
         mypy-boto3-mq =

     

       932
       932
       -
           buildMypyBoto3Package "mq" "1.40.18"

     

       933
       933
       -
             "sha256-uLNYxXfiAMVzHOk0NXCer6cR3aBI+CdHCoUEANqFBUw=";

     

       932
       932
       +
           buildMypyBoto3Package "mq" "1.40.23"

     

       933
       933
       +
             "sha256-1+/fGIJPzPvAThyGy6ZiZAyIfFGtBGiBZ1ORwfTZ2Ww=";

     

       934
       934
        
       

     

       935
       935
        
         mypy-boto3-mturk =

     

       936
       936
        
           buildMypyBoto3Package "mturk" "1.40.20"

     
···

       973
       973
        
             "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU=";

     

       974
       974
        
       

     

       975
       975
        
         mypy-boto3-opensearchserverless =

     

       976
       976
       -
           buildMypyBoto3Package "opensearchserverless" "1.40.4"

     

       977
       977
       -
             "sha256-nkt68bkNRfKMeO9TJV/P5PGzy8ps4CZpYcF2LmDUs2c=";

     

       976
       976
       +
           buildMypyBoto3Package "opensearchserverless" "1.40.24"

     

       977
       977
       +
             "sha256-dWkO3WKxcMFLF4UvFLAgAv1vfJZYqwua6s+CYGhTF0g=";

     

       978
       978
        
       

     

       979
       979
        
         mypy-boto3-opsworks =

     

       980
       980
        
           buildMypyBoto3Package "opsworks" "1.40.0"

     
···

       1085
       1085
        
             "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM=";

     

       1086
       1086
        
       

     

       1087
       1087
        
         mypy-boto3-rds =

     

       1088
       1088
       -
           buildMypyBoto3Package "rds" "1.40.20"

     

       1089
       1089
       -
             "sha256-mwtrtTgm6t1XVx3bsFcNf48VhGyPVyjwV+PasLW2IAM=";

     

       1088
       1088
       +
           buildMypyBoto3Package "rds" "1.40.24"

     

       1089
       1089
       +
             "sha256-uDdirP5RmSGnp1a5qI5KDYp+/aDMg7ZvRN69ryoliS8=";

     

       1090
       1090
        
       

     

       1091
       1091
        
         mypy-boto3-rds-data =

     

       1092
       1092
        
           buildMypyBoto3Package "rds-data" "1.40.0"

     
···

       1133
       1133
        
             "sha256-9AfMYmfGgFYxbGF1UYLBEtCkmYtlPNtD0q2MHmbJUWw=";

     

       1134
       1134
        
       

     

       1135
       1135
        
         mypy-boto3-route53 =

     

       1136
       1136
       -
           buildMypyBoto3Package "route53" "1.40.0"

     

       1137
       1137
       -
             "sha256-7cIfnpdrNUByompkx6sncBpYl/s4pFbwUFmHfvg07Qw=";

     

       1136
       1136
       +
           buildMypyBoto3Package "route53" "1.40.23"

     

       1137
       1137
       +
             "sha256-0cvqZsSwlq6o5XE+U9Vh3/+7I4ZhVAtlZ7Qlm5KuI1I=";

     

       1138
       1138
        
       

     

       1139
       1139
        
         mypy-boto3-route53-recovery-cluster =

     

       1140
       1140
        
           buildMypyBoto3Package "route53-recovery-cluster" "1.40.18"

     
···

       1149
       1149
        
             "sha256-oo6Vpu6SfuJKw1aqX8x6oIlLUJbHa2lNfPx5kfQMo8M=";

     

       1150
       1150
        
       

     

       1151
       1151
        
         mypy-boto3-route53domains =

     

       1152
       1152
       -
           buildMypyBoto3Package "route53domains" "1.40.20"

     

       1153
       1153
       -
             "sha256-fH0Mra2Fkfjy0NZHx+vxcKYxLqSb1BBhI8HYBnsA928=";

     

       1152
       1152
       +
           buildMypyBoto3Package "route53domains" "1.40.23"

     

       1153
       1153
       +
             "sha256-Gj2GSKiSAicbxMjN8Gks9joOi4WB37v1xlAnjLRobOY=";

     

       1154
       1154
        
       

     

       1155
       1155
        
         mypy-boto3-route53resolver =

     

       1156
       1156
        
           buildMypyBoto3Package "route53resolver" "1.40.0"

     
···

       1377
       1377
        
             "sha256-sc7qt+4ztG8uxTo05AfI47zEbQsA2DjI6vUg4vPHsb8=";

     

       1378
       1378
        
       

     

       1379
       1379
        
         mypy-boto3-verifiedpermissions =

     

       1380
       1380
       -
           buildMypyBoto3Package "verifiedpermissions" "1.40.0"

     

       1381
       1381
       -
             "sha256-u7f3iDh6jCFYWUdQThLrFJQO1d/3GqiP8IFAOGO627s=";

     

       1380
       1380
       +
           buildMypyBoto3Package "verifiedpermissions" "1.40.24"

     

       1381
       1381
       +
             "sha256-AhS/FxuTPVNoi6cys6LS9wKqUKlkUZ9G3boVxJPTcNU=";

     

       1382
       1382
        
       

     

       1383
       1383
        
         mypy-boto3-voice-id =

     

       1384
       1384
        
           buildMypyBoto3Package "voice-id" "1.40.19"

+3 -3

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

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage {

     

       23
       23
        
         pname = "notobuilder";

     

       24
       24
       -
         version = "0-unstable-2025-05-20";

     

       24
       24
       +
         version = "0-unstable-2025-08-20";

     

       25
       25
        
         pyproject = true;

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "notofonts";

     

       29
       29
        
           repo = "notobuilder";

     

       30
       30
       -
           rev = "ff46ffb2e19ff8e8c36a4e3e0db334bb249896cb";

     

       31
       31
       -
           hash = "sha256-K4F+Et50QVXOOk00u/8ZXKj/TWoC6ndCeAF9jaMD7jI=";

     

       30
       30
       +
           rev = "fb0d6067beee888e6132b50c227da1f051b1ef9f";

     

       31
       31
       +
           hash = "sha256-U9NVpXzdzBpgs8LFQJk70vs2dfHg+kD+YzuYZt6zQ5g=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         postPatch = ''

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "pydash";

     

       17
       17
       -
         version = "8.0.1";

     

       17
       17
       +
         version = "8.0.5";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.8";

     
···

       23
       23
        
           owner = "dgilland";

     

       24
       24
        
           repo = "pydash";

     

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

     

       26
       26
       -
           hash = "sha256-4zNljz0U/iQd2DMC43qkdOY/mwtPlizgLmoaB7BVmxw=";

     

       26
       26
       +
           hash = "sha256-u8vLE0kjsnV2HNt3N3kmnaabgQzW3FcH4qxycNdv1Ls=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -1

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

···

       33
       33
        
       

     

       34
       34
        
         postPatch = ''

     

       35
       35
        
           substituteInPlace pyproject.toml \

     

       36
       36
       -
             --replace-fail "numpy>=2.0.0rc1,<2.3; python_version >= '3.9'" "numpy>=2.0.0";

     

       36
       36
       +
             --replace-fail "numpy>=2.0.0rc1,<2.3; python_version >= '3.9'" "numpy>=2.0.0" \

     

       37
       37
       +
             --replace-fail "Cython>=3.0.10,<3.1.0" "Cython>=3.1.0,<4.0.0"

     

       37
       38
        
         '';

     

       38
       39
        
       

     

       39
       40
        
         build-system = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pyspnego";

     

       18
       18
       -
         version = "0.11.2";

     

       18
       18
       +
         version = "0.12.0";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       24
       24
        
           owner = "jborean93";

     

       25
       25
        
           repo = "pyspnego";

     

       26
       26
        
           tag = "v${version}";

     

       27
       27
       -
           hash = "sha256-5aGHCw0d1aFcHLPRMkya0hlHV30aTKshbcOjfPMOFko=";

     

       27
       27
       +
           hash = "sha256-dkss+8Z0dS4MTunBZWEH+WK1+kGikCHf7VPCR1reMS0=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [ setuptools ];

+2 -2

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

···

       28
       28
        
       

     

       29
       29
        
       buildPythonPackage rec {

     

       30
       30
        
         pname = "streamlit";

     

       31
       31
       -
         version = "1.48.1";

     

       31
       31
       +
         version = "1.49.1";

     

       32
       32
        
         pyproject = true;

     

       33
       33
        
       

     

       34
       34
        
         disabled = pythonOlder "3.9";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchPypi {

     

       37
       37
        
           inherit pname version;

     

       38
       38
       -
           hash = "sha256-xuKp8kRxdGu+qlSiiPX9/G4rzzupqXU/3l1J7UJDkfE=";

     

       38
       38
       +
           hash = "sha256-byE/HkPwNRQ6VvWK1QBo2KCUgvCi2tEFDX5+malomBg=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         build-system = [

+30 -15

pkgs/development/python-modules/trino-python-client/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       +
         boto3,

     

       4
       5
        
         fetchFromGitHub,

     

       5
       5
       -
         # build

     

       6
       6
       -
         setuptools,

     

       7
       7
       -
         # required

     

       6
       6
       +
         httpretty,

     

       7
       7
       +
         keyring,

     

       8
       8
       +
         lz4,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         python-dateutil,

     

       8
       11
        
         pytz,

     

       12
       12
       +
         requests-gssapi,

     

       13
       13
       +
         requests-kerberos,

     

       9
       14
        
         requests,

     

       10
       10
       -
         tzlocal,

     

       11
       11
       -
         # optional

     

       12
       12
       -
         requests-kerberos,

     

       15
       15
       +
         setuptools,

     

       13
       16
        
         sqlalchemy,

     

       14
       14
       -
         keyring,

     

       15
       15
       -
         # tests

     

       16
       16
       -
         pytestCheckHook,

     

       17
       17
       -
         httpretty,

     

       17
       17
       +
         testcontainers,

     

       18
       18
       +
         tzlocal,

     

       19
       19
       +
         zstandard,

     

       18
       20
        
       }:

     

       19
       21
        
       

     

       20
       22
        
       buildPythonPackage rec {

     

       21
       23
        
         pname = "trino-python-client";

     

       22
       24
        
         version = "0.334.0";

     

       23
       23
       -
         format = "setuptools";

     

       25
       25
       +
         pyproject = true;

     

       24
       26
        
       

     

       25
       27
        
         src = fetchFromGitHub {

     

       26
       28
        
           repo = "trino-python-client";

     
···

       29
       31
        
           hash = "sha256-cSwMmzIUFYX8VgSwobth8EsARUff3hhfBf+IrhuFSYM=";

     

       30
       32
        
         };

     

       31
       33
        
       

     

       32
       32
       -
         nativeBuildInputs = [ setuptools ];

     

       34
       34
       +
         build-system = [ setuptools ];

     

       33
       35
        
       

     

       34
       34
       -
         propagatedBuildInputs = [

     

       36
       36
       +
         dependencies = [

     

       37
       37
       +
           lz4

     

       38
       38
       +
           python-dateutil

     

       35
       39
        
           pytz

     

       36
       40
        
           requests

     

       37
       41
        
           tzlocal

     

       42
       42
       +
           zstandard

     

       38
       43
        
         ];

     

       39
       44
        
       

     

       40
       45
        
         optional-dependencies = lib.fix (self: {

     

       41
       46
        
           kerberos = [ requests-kerberos ];

     

       47
       47
       +
           gsaapi = [ requests-gssapi ];

     

       42
       48
        
           sqlalchemy = [ sqlalchemy ];

     

       43
       49
        
           external-authentication-token-cache = [ keyring ];

     

       44
       50
        
           all = self.kerberos ++ self.sqlalchemy;

     

       45
       51
        
         });

     

       46
       52
        
       

     

       47
       53
        
         nativeCheckInputs = [

     

       54
       54
       +
           boto3

     

       48
       55
        
           httpretty

     

       49
       56
        
           pytestCheckHook

     

       57
       57
       +
           testcontainers

     

       50
       58
        
         ]

     

       51
       51
       -
         ++ optional-dependencies.all;

     

       59
       59
       +
         ++ lib.flatten (builtins.attrValues optional-dependencies);

     

       52
       60
        
       

     

       53
       61
        
         pythonImportsCheck = [ "trino" ];

     

       54
       62
        
       

     

       55
       63
        
         disabledTestPaths = [

     

       56
       56
       -
           # these all require a running trino instance

     

       64
       64
       +
           # Tests require a running trino instance

     

       57
       65
        
           "tests/integration/test_types_integration.py"

     

       58
       66
        
           "tests/integration/test_dbapi_integration.py"

     

       59
       67
        
           "tests/integration/test_sqlalchemy_integration.py"

     

       60
       68
        
         ];

     

       61
       69
        
       

     

       62
       70
        
         disabledTestMarks = [ "auth" ];

     

       71
       71
       +
       

     

       72
       72
       +
         disabledTests = [

     

       73
       73
       +
           # Tests require a running trino instance

     

       74
       74
       +
           "test_oauth2"

     

       75
       75
       +
           "test_token_retrieved_once_when_authentication_instance_is_shared"

     

       76
       76
       +
           "test_multithreaded_oauth2_authentication_flow"

     

       77
       77
       +
         ];

     

       63
       78
        
       

     

       64
       79
        
         meta = with lib; {

     

       65
       80
        
           changelog = "https://github.com/trinodb/trino-python-client/blob/${src.tag}/CHANGES.md";

+2 -2

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

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "twilio";

     

       24
       24
       -
         version = "9.7.0";

     

       24
       24
       +
         version = "9.8.0";

     

       25
       25
        
         pyproject = true;

     

       26
       26
        
       

     

       27
       27
        
         disabled = pythonOlder "3.7";

     
···

       30
       30
        
           owner = "twilio";

     

       31
       31
        
           repo = "twilio-python";

     

       32
       32
        
           tag = version;

     

       33
       33
       -
           hash = "sha256-QVrV6drHVZhjMnwlNYe6NaK8TzRImZfDWLMwDDBZolk=";

     

       33
       33
       +
           hash = "sha256-FXwrkUfdscFNBJrRhBxDotK3EbCAFON6tAkCS8/l+4w=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         build-system = [ setuptools ];

+10 -4

pkgs/development/python-modules/warp-lang/default.nix

···

       52
       52
        
       

     

       53
       53
        
           src =

     

       54
       54
        
             let

     

       55
       55
       -
               baseURL = "https://developer.download.nvidia.com/compute/cublasdx/redist/cublasdx";

     

       55
       55
       +
               baseURL = "https://developer.nvidia.com/downloads/compute/cublasdx/redist/cublasdx";

     

       56
       56
        
               cudaMajorVersion = cudaPackages.cudaMajorVersion; # only 12, 13 supported

     

       57
       57
        
               cudaVersion = "${cudaMajorVersion}.0"; # URL example: ${baseURL}/cuda12/${name}-${version}-cuda12.0.zip

     

       58
       58
        
               name = lib.concatStringsSep "-" [

     
···

       65
       65
        
       

     

       66
       66
        
               # nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")

     

       67
       67
        
               hashes = {

     

       68
       68
       -
                 aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";

     

       69
       69
       -
                 x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";

     

       68
       68
       +
                 "12" = {

     

       69
       69
       +
                   aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";

     

       70
       70
       +
                   x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";

     

       71
       71
       +
                 };

     

       72
       72
       +
                 "13" = {

     

       73
       73
       +
                   aarch64-linux = "sha256-TetJbMts8tpmj5PV4+jpnUHMcooDrXUEKL3aGWqilKI=";

     

       74
       74
       +
                   x86_64-linux = "sha256-wLJLbRpQWa6QEm8ibm1gxt3mXvkWvu0vEzpnqTIvE1M=";

     

       75
       75
       +
                 };

     

       70
       76
        
               };

     

       71
       77
        
             in

     

       72
       78
        
             lib.mapNullable (

     
···

       75
       81
        
                 inherit hash name;

     

       76
       82
        
                 url = "${baseURL}/cuda${cudaMajorVersion}/${name}.tar.gz";

     

       77
       83
        
               }

     

       78
       78
       -
             ) (hashes.${effectiveStdenv.hostPlatform.system} or null);

     

       84
       84
       +
             ) (hashes.${cudaMajorVersion}.${effectiveStdenv.hostPlatform.system} or null);

     

       79
       85
        
       

     

       80
       86
        
           dontUnpack = true;

     

       81
       87
        
           dontConfigure = true;

+2 -2

pkgs/development/python-modules/yalexs-ble/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "yalexs-ble";

     

       20
       20
       -
         version = "3.1.2";

     

       20
       20
       +
         version = "3.2.0";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.10";

     
···

       26
       26
        
           owner = "bdraco";

     

       27
       27
        
           repo = "yalexs-ble";

     

       28
       28
        
           tag = "v${version}";

     

       29
       29
       -
           hash = "sha256-0eFW2KZPpoxEF2FnuYzcR7GuD3jGBjOZlArzYbKcnUI=";

     

       29
       29
       +
           hash = "sha256-bmzRvfOwAb2dr2bBfBE/4SuPB15qBpLelmxI15jhgrQ=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [ poetry-core ];

+66

pkgs/development/tools/zls/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         zig_0_14,

     

       5
       5
       +
         zig_0_15,

     

       6
       6
       +
         fetchFromGitHub,

     

       7
       7
       +
         callPackage,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       let

     

       11
       11
       +
         common = finalAttrs: _: {

     

       12
       12
       +
           pname = "zls";

     

       13
       13
       +
       

     

       14
       14
       +
           meta = {

     

       15
       15
       +
             description = "Zig LSP implementation + Zig Language Server";

     

       16
       16
       +
             mainProgram = "zls";

     

       17
       17
       +
             changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}";

     

       18
       18
       +
             homepage = "https://github.com/zigtools/zls";

     

       19
       19
       +
             license = lib.licenses.mit;

     

       20
       20
       +
             maintainers = with lib.maintainers; [

     

       21
       21
       +
               figsoda

     

       22
       22
       +
               moni

     

       23
       23
       +
               _0x5a4

     

       24
       24
       +
               jmbaur

     

       25
       25
       +
             ];

     

       26
       26
       +
             platforms = lib.platforms.unix;

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
       in

     

       30
       30
       +
       lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) {

     

       31
       31
       +
         zls_0_14 = finalAttrs: {

     

       32
       32
       +
           version = "0.14.0";

     

       33
       33
       +
       

     

       34
       34
       +
           src = fetchFromGitHub {

     

       35
       35
       +
             owner = "zigtools";

     

       36
       36
       +
             repo = "zls";

     

       37
       37
       +
             tag = finalAttrs.version;

     

       38
       38
       +
             fetchSubmodules = true;

     

       39
       39
       +
             hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";

     

       40
       40
       +
           };

     

       41
       41
       +
       

     

       42
       42
       +
           nativeBuildInputs = [ zig_0_14.hook ];

     

       43
       43
       +
       

     

       44
       44
       +
           postPatch = ''

     

       45
       45
       +
             ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

     

       46
       46
       +
           '';

     

       47
       47
       +
         };

     

       48
       48
       +
       

     

       49
       49
       +
         zls_0_15 = finalAttrs: {

     

       50
       50
       +
           version = "0.15.0";

     

       51
       51
       +
       

     

       52
       52
       +
           src = fetchFromGitHub {

     

       53
       53
       +
             owner = "zigtools";

     

       54
       54
       +
             repo = "zls";

     

       55
       55
       +
             tag = finalAttrs.version;

     

       56
       56
       +
             fetchSubmodules = true;

     

       57
       57
       +
             hash = "sha256-GFzSHUljcxy7sM1PaabbkQUdUnLwpherekPWJFxXtnk=";

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           nativeBuildInputs = [ zig_0_15.hook ];

     

       61
       61
       +
       

     

       62
       62
       +
           postPatch = ''

     

       63
       63
       +
             ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

     

       64
       64
       +
           '';

     

       65
       65
       +
         };

     

       66
       66
       +
       }

+34

pkgs/development/tools/zls/deps_0_15.nix

···

       1
       1
       +
       # generated by zon2nix (https://github.com/nix-community/zon2nix)

     

       2
       2
       +
       

     

       3
       3
       +
       { linkFarm, fetchzip }:

     

       4
       4
       +
       

     

       5
       5
       +
       linkFarm "zig-packages" [

     

       6
       6
       +
         {

     

       7
       7
       +
           name = "diffz-0.0.1-G2tlIQrOAQCfH15jdyaLyrMgV8eGPouFhkCeYFTmJaLk";

     

       8
       8
       +
           path = fetchzip {

     

       9
       9
       +
             url = "https://github.com/ziglibs/diffz/archive/a20dd1f11b10819a6f570f98b42e1c91e3704357.tar.gz";

     

       10
       10
       +
             hash = "sha256-y7Ck5XZNnHxmPPWlDAqZZ2g3n67txj5/Zq04AhuW5+M=";

     

       11
       11
       +
           };

     

       12
       12
       +
         }

     

       13
       13
       +
         {

     

       14
       14
       +
           name = "N-V-__8AAMeOlQEipHjcyu0TCftdAi9AQe7EXUDJOoVe0k-t";

     

       15
       15
       +
           path = fetchzip {

     

       16
       16
       +
             url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.11.1.tar.gz";

     

       17
       17
       +
             hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";

     

       18
       18
       +
           };

     

       19
       19
       +
         }

     

       20
       20
       +
         {

     

       21
       21
       +
           name = "known_folders-0.0.0-Fy-PJkfRAAAVdptXWXBspIIC7EkVgLgWozU5zIk5Zgcy";

     

       22
       22
       +
           path = fetchzip {

     

       23
       23
       +
             url = "https://github.com/ziglibs/known-folders/archive/92defaee76b07487769ca352fd0ba95bc8b42a2f.tar.gz";

     

       24
       24
       +
             hash = "sha256-+FviMdQGeHn2ymfXjIQPxLPx3haPy5zhPJuS3Ow8m68=";

     

       25
       25
       +
           };

     

       26
       26
       +
         }

     

       27
       27
       +
         {

     

       28
       28
       +
           name = "lsp_kit-0.1.0-bi_PL04yCgAxLsF0hH2a5sZKT84MGQaKXouw2jvCE8Nl";

     

       29
       29
       +
           path = fetchzip {

     

       30
       30
       +
             url = "https://github.com/zigtools/lsp-kit/archive/576e9405b1ab22c17c0f9318feed3278aa66b0ea.tar.gz";

     

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

     

       32
       32
       +
           };

     

       33
       33
       +
         }

     

       34
       34
       +
       ]

+72

pkgs/misc/uboot/binman-resources.patch

···

       1
       1
       +
       (Patch from https://lists.denx.de/pipermail/u-boot/2024-July/559077.html)

     

       2
       2
       +
       

     

       3
       3
       +
       

     

       4
       4
       +
       pkg_resources is deprecated long ago and being removed in python 3.12.

     

       5
       5
       +
       

     

       6
       6
       +
       Reimplement functions with importlib.resources.

     

       7
       7
       +
       

     

       8
       8
       +
       Link: https://docs.python.org/3/library/importlib.resources.html

     

       9
       9
       +
       Signed-off-by: Jiaxun Yang <jiaxun.yang at flygoat.com>

     

       10
       10
       +
       ---

     

       11
       11
       +
        tools/binman/control.py | 18 +++++++++---------

     

       12
       12
       +
        1 file changed, 9 insertions(+), 9 deletions(-)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/tools/binman/control.py b/tools/binman/control.py

     

       15
       15
       +
       index 2f00279232b8..5549b0ad2185 100644

     

       16
       16
       +
       --- a/tools/binman/control.py

     

       17
       17
       +
       +++ b/tools/binman/control.py

     

       18
       18
       +
       @@ -8,12 +8,11 @@

     

       19
       19
       +
        from collections import OrderedDict

     

       20
       20
       +
        import glob

     

       21
       21
       +
        try:

     

       22
       22
       +
       -    import importlib.resources

     

       23
       23
       +
       -except ImportError:  # pragma: no cover

     

       24
       24
       +
       +    from importlib import resources

     

       25
       25
       +
       +except ImportError:

     

       26
       26
       +
            # for Python 3.6

     

       27
       27
       +
       -    import importlib_resources

     

       28
       28
       +
       +    import importlib_resources as resources

     

       29
       29
       +
        import os

     

       30
       30
       +
       -import pkg_resources

     

       31
       31
       +
        import re

     

       32
       32
       +
        

     

       33
       33
       +
        import sys

     

       34
       34
       +
       @@ -96,12 +95,12 @@ def _ReadMissingBlobHelp():

     

       35
       35
       +
                    msg = ''

     

       36
       36
       +
                return tag, msg

     

       37
       37
       +
        

     

       38
       38
       +
       -    my_data = pkg_resources.resource_string(__name__, 'missing-blob-help')

     

       39
       39
       +
       +    my_data = resources.files(__package__).joinpath('missing-blob-help').read_text()

     

       40
       40
       +
            re_tag = re.compile('^([-a-z0-9]+):$')

     

       41
       41
       +
            result = {}

     

       42
       42
       +
            tag = None

     

       43
       43
       +
            msg = ''

     

       44
       44
       +
       -    for line in my_data.decode('utf-8').splitlines():

     

       45
       45
       +
       +    for line in my_data.splitlines():

     

       46
       46
       +
                if not line.startswith('#'):

     

       47
       47
       +
                    m_tag = re_tag.match(line)

     

       48
       48
       +
                    if m_tag:

     

       49
       49
       +
       @@ -151,8 +150,9 @@ def GetEntryModules(include_testing=True):

     

       50
       50
       +
            Returns:

     

       51
       51
       +
                Set of paths to entry class filenames

     

       52
       52
       +
            """

     

       53
       53
       +
       -    glob_list = pkg_resources.resource_listdir(__name__, 'etype')

     

       54
       54
       +
       -    glob_list = [fname for fname in glob_list if fname.endswith('.py')]

     

       55
       55
       +
       +    directory = resources.files("binman.etype")

     

       56
       56
       +
       +    glob_list = [entry.name for entry in directory.iterdir()

     

       57
       57
       +
       +                 if entry.name.endswith('.py')]

     

       58
       58
       +
            return set([os.path.splitext(os.path.basename(item))[0]

     

       59
       59
       +
                        for item in glob_list

     

       60
       60
       +
                        if include_testing or '_testing' not in item])

     

       61
       61
       +
       @@ -735,7 +735,7 @@ def Binman(args):

     

       62
       62
       +
            global state

     

       63
       63
       +
        

     

       64
       64
       +
            if args.full_help:

     

       65
       65
       +
       -        with importlib.resources.path('binman', 'README.rst') as readme:

     

       66
       66
       +
       +        with resources.path('binman', 'README.rst') as readme:

     

       67
       67
       +
                    tools.print_full_help(str(readme))

     

       68
       68
       +
                return 0

     

       69
       69
       +
        

     

       70
       70
       +
       

     

       71
       71
       +
       -- 

     

       72
       72
       +
       2.45.2

pkgs/misc/uboot/default.nix

···

       29
       29
        
         armTrustedFirmwareS905,

     

       30
       30
        
         opensbi,

     

       31
       31
        
         buildPackages,

     

       32
       32
       +
         callPackages,

     

       32
       33
        
         darwin,

     

       33
       34
        
       }@pkgs:

     

       34
       35
        
       

     
···

       198
       199
        
       

     

       199
       200
        
           filesToInstall = [

     

       200
       201
        
             "tools/dumpimage"

     

       202
       202
       +
             "tools/fdt_add_pubkey"

     

       201
       203
        
             "tools/fdtgrep"

     

       202
       204
        
             "tools/kwboot"

     

       205
       205
       +
             "tools/mkeficapsule"

     

       203
       206
        
             "tools/mkenvimage"

     

       204
       207
        
             "tools/mkimage"

     

       205
       208
        
             "tools/env/fw_printenv"

     
···

       210
       213
        
             "tools/efivar.py" = (python3.withPackages (ps: [ ps.pyopenssl ]));

     

       211
       214
        
           };

     

       212
       215
        
         };

     

       216
       216
       +
       

     

       217
       217
       +
         ubootPythonTools = lib.recurseIntoAttrs (callPackages ./python.nix { });

     

       213
       218
        
       

     

       214
       219
        
         ubootA20OlinuxinoLime = buildUBoot {

     

       215
       220
        
           defconfig = "A20-OLinuXino-Lime_defconfig";

+160

pkgs/misc/uboot/python.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         python3Packages,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         makeWrapper,

     

       6
       6
       +
       

     

       7
       7
       +
         armTrustedFirmwareTools,

     

       8
       8
       +
         bzip2,

     

       9
       9
       +
         cbfstool,

     

       10
       10
       +
         gzip,

     

       11
       11
       +
         lz4,

     

       12
       12
       +
         lzop,

     

       13
       13
       +
         openssl,

     

       14
       14
       +
         ubootTools,

     

       15
       15
       +
         vboot_reference,

     

       16
       16
       +
         xilinx-bootgen,

     

       17
       17
       +
         xz,

     

       18
       18
       +
         zstd,

     

       19
       19
       +
       }:

     

       20
       20
       +
       

     

       21
       21
       +
       let

     

       22
       22
       +
         # We are fetching from PyPI because the code in the repository seems to be

     

       23
       23
       +
         # lagging behind the PyPI releases somehow...

     

       24
       24
       +
         version = "0.0.7";

     

       25
       25
       +
       in

     

       26
       26
       +
       rec {

     

       27
       27
       +
       

     

       28
       28
       +
         u_boot_pylib = python3Packages.buildPythonPackage rec {

     

       29
       29
       +
           pname = "u_boot_pylib";

     

       30
       30
       +
           inherit version;

     

       31
       31
       +
           pyproject = true;

     

       32
       32
       +
       

     

       33
       33
       +
           src = fetchPypi {

     

       34
       34
       +
             inherit pname version;

     

       35
       35
       +
             hash = "sha256-A5r20Y8mgxhOhaKMpd5MJN5ubzPbkodAO0Tr0RN1SRA=";

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
           build-system = with python3Packages; [

     

       39
       39
       +
             setuptools

     

       40
       40
       +
           ];

     

       41
       41
       +
       

     

       42
       42
       +
           checkPhase = ''

     

       43
       43
       +
             ${python3Packages.python.interpreter} "src/$pname/__main__.py"

     

       44
       44
       +
             # There are some tests in other files, but they are broken

     

       45
       45
       +
           '';

     

       46
       46
       +
       

     

       47
       47
       +
           pythonImportsCheck = [ "u_boot_pylib" ];

     

       48
       48
       +
         };

     

       49
       49
       +
       

     

       50
       50
       +
         dtoc = python3Packages.buildPythonPackage rec {

     

       51
       51
       +
           pname = "dtoc";

     

       52
       52
       +
           inherit version;

     

       53
       53
       +
           pyproject = true;

     

       54
       54
       +
       

     

       55
       55
       +
           src = fetchPypi {

     

       56
       56
       +
             inherit pname version;

     

       57
       57
       +
             hash = "sha256-NA96CznIxjqpw2Ik8AJpJkJ/ei+kQTCUExwFgssV+CM=";

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           build-system = with python3Packages; [

     

       61
       61
       +
             setuptools

     

       62
       62
       +
           ];

     

       63
       63
       +
       

     

       64
       64
       +
           dependencies =

     

       65
       65
       +
             (with python3Packages; [

     

       66
       66
       +
               libfdt

     

       67
       67
       +
             ])

     

       68
       68
       +
             ++ [

     

       69
       69
       +
               u_boot_pylib

     

       70
       70
       +
             ];

     

       71
       71
       +
       

     

       72
       72
       +
           pythonImportsCheck = [ "dtoc" ];

     

       73
       73
       +
         };

     

       74
       74
       +
       

     

       75
       75
       +
         binman =

     

       76
       76
       +
           let

     

       77
       77
       +
             btools = [

     

       78
       78
       +
               armTrustedFirmwareTools

     

       79
       79
       +
               bzip2

     

       80
       80
       +
               cbfstool

     

       81
       81
       +
               # TODO: cst

     

       82
       82
       +
               gzip

     

       83
       83
       +
               lz4

     

       84
       84
       +
               # TODO: lzma_alone

     

       85
       85
       +
               lzop

     

       86
       86
       +
               openssl

     

       87
       87
       +
               ubootTools

     

       88
       88
       +
               vboot_reference

     

       89
       89
       +
               xilinx-bootgen

     

       90
       90
       +
               xz

     

       91
       91
       +
               zstd

     

       92
       92
       +
             ];

     

       93
       93
       +
           in

     

       94
       94
       +
           python3Packages.buildPythonApplication rec {

     

       95
       95
       +
             pname = "binary_manager";

     

       96
       96
       +
             inherit version;

     

       97
       97
       +
             pyproject = true;

     

       98
       98
       +
       

     

       99
       99
       +
             src = fetchPypi {

     

       100
       100
       +
               inherit pname version;

     

       101
       101
       +
               hash = "sha256-llEBBhUoW5jTEQeoaTCjZN8y6Kj+PGNUSB3cKpgD06w=";

     

       102
       102
       +
             };

     

       103
       103
       +
       

     

       104
       104
       +
             patches = [

     

       105
       105
       +
               ./binman-resources.patch

     

       106
       106
       +
             ];

     

       107
       107
       +
             patchFlags = [

     

       108
       108
       +
               "-p2"

     

       109
       109
       +
               "-d"

     

       110
       110
       +
               "src"

     

       111
       111
       +
             ];

     

       112
       112
       +
       

     

       113
       113
       +
             build-system = with python3Packages; [

     

       114
       114
       +
               setuptools

     

       115
       115
       +
             ];

     

       116
       116
       +
       

     

       117
       117
       +
             nativeBuildInputs = [ makeWrapper ];

     

       118
       118
       +
       

     

       119
       119
       +
             dependencies =

     

       120
       120
       +
               (with python3Packages; [

     

       121
       121
       +
                 jsonschema

     

       122
       122
       +
                 pycryptodomex

     

       123
       123
       +
                 pyelftools

     

       124
       124
       +
                 yamllint

     

       125
       125
       +
               ])

     

       126
       126
       +
               ++ [

     

       127
       127
       +
                 dtoc

     

       128
       128
       +
                 u_boot_pylib

     

       129
       129
       +
               ];

     

       130
       130
       +
       

     

       131
       131
       +
             preFixup = ''

     

       132
       132
       +
               wrapProgram "$out/bin/binman" --prefix PATH : "${lib.makeBinPath btools}"

     

       133
       133
       +
             '';

     

       134
       134
       +
           };

     

       135
       135
       +
       

     

       136
       136
       +
         patman = python3Packages.buildPythonApplication rec {

     

       137
       137
       +
           pname = "patch_manager";

     

       138
       138
       +
           inherit version;

     

       139
       139
       +
           pyproject = true;

     

       140
       140
       +
       

     

       141
       141
       +
           src = fetchPypi {

     

       142
       142
       +
             inherit pname version;

     

       143
       143
       +
             hash = "sha256-zD9e87fpWKynpUcfxobbdk6wbM6Ja3f8hEVHS7DGIKQ=";

     

       144
       144
       +
           };

     

       145
       145
       +
       

     

       146
       146
       +
           build-system = with python3Packages; [

     

       147
       147
       +
             setuptools

     

       148
       148
       +
           ];

     

       149
       149
       +
       

     

       150
       150
       +
           dependencies =

     

       151
       151
       +
             (with python3Packages; [

     

       152
       152
       +
               aiohttp

     

       153
       153
       +
               pygit2

     

       154
       154
       +
             ])

     

       155
       155
       +
             ++ [

     

       156
       156
       +
               u_boot_pylib

     

       157
       157
       +
             ];

     

       158
       158
       +
         };

     

       159
       159
       +
       

     

       160
       160
       +
       }

+2 -10

pkgs/servers/asterisk/default.nix

···

       163
       163
        
             };

     

       164
       164
        
           };

     

       165
       165
        
       

     

       166
       166
       -
         pjproject_2_14_1 = fetchurl {

     

       167
       167
       -
           url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2";

     

       168
       168
       -
           hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ=";

     

       169
       169
       -
         };

     

       170
       170
       -
       

     

       171
       171
       -
         pjproject_2_15_1 = fetchurl {

     

       166
       166
       +
         pjproject = fetchurl {

     

       172
       167
        
           url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/pjproject-2.15.1.tar.bz2";

     

       173
       168
        
           hash = "sha256-WLuDzsTUMfSNAG5FXYIWaEUPjPa2yV8JDe9HBi+jpgw=";

     

       174
       169
        
         };

     
···

       191
       186
        
         versions = lib.mapAttrs (

     

       192
       187
        
           _:

     

       193
       188
        
           { version, sha256 }:

     

       194
       194
       -
           let

     

       195
       195
       -
             pjsip = if lib.versionAtLeast version "20" then pjproject_2_15_1 else pjproject_2_14_1;

     

       196
       196
       -
           in

     

       197
       189
        
           common {

     

       198
       190
        
             inherit version sha256;

     

       199
       191
        
             externals = {

     

       200
       200
       -
               "externals_cache/${pjsip.name}" = pjsip;

     

       192
       192
       +
               "externals_cache/${pjproject.name}" = pjproject;

     

       201
       193
        
               "addons/mp3" = mp3-204;

     

       202
       194
        
             };

     

       203
       195
        
           }

+8 -8

pkgs/servers/asterisk/versions.json

···

       1
       1
        
       {

     

       2
       2
        
         "asterisk_18": {

     

       3
       3
       -
           "sha256": "0df8be2f57779019895628363a11f74ea356068cca983462ec0feb72528fc8e9",

     

       4
       4
       -
           "version": "18.26.3"

     

       3
       3
       +
           "sha256": "a17f511bfa092c8fa9eccd3a5ecf5f728ccdcf2b1a04d2c06e7177d96c3c9ee1",

     

       4
       4
       +
           "version": "18.26.4"

     

       5
       5
        
         },

     

       6
       6
        
         "asterisk_20": {

     

       7
       7
       -
           "sha256": "fa286ac7a024e685233af6fde54a68a21c8e9934b438da878fb3cff080a6346c",

     

       8
       8
       -
           "version": "20.15.1"

     

       7
       7
       +
           "sha256": "4bbe0aaecc0e7294780269a5dc7ff78a85c58cf26ffc63dd63be5406eef0b687",

     

       8
       8
       +
           "version": "20.15.2"

     

       9
       9
        
         },

     

       10
       10
        
         "asterisk_21": {

     

       11
       11
       -
           "sha256": "811c5b8c501004ee378e77efd009892b366a03a508cfc51eead52396cbf65b2c",

     

       12
       12
       -
           "version": "21.10.1"

     

       11
       11
       +
           "sha256": "9624e807a1138cabed14431a326c9870e53fc132738dbbd61314abc027785d94",

     

       12
       12
       +
           "version": "21.10.2"

     

       13
       13
        
         },

     

       14
       14
        
         "asterisk_22": {

     

       15
       15
       -
           "sha256": "cbe67229f813ccf5e545fbda1fc05eb221897bf03393917390f8f6235cc62179",

     

       16
       16
       -
           "version": "22.5.1"

     

       15
       15
       +
           "sha256": "5061c852fd850b17e6be9d866c8e73298471883fc5e3ccd5a24b3e1364e24218",

     

       16
       16
       +
           "version": "22.5.2"

     

       17
       17
        
         }

     

       18
       18
        
       }

+11

pkgs/top-level/all-packages.nix

···

       855
       855
        
       

     

       856
       856
        
         referencesByPopularity = callPackage ../build-support/references-by-popularity { };

     

       857
       857
        
       

     

       858
       858
       +
         dockerAutoLayer = callPackage ../build-support/docker/auto-layer.nix { };

     

       859
       859
       +
       

     

       858
       860
        
         dockerMakeLayers = callPackage ../build-support/docker/make-layers.nix { };

     

       859
       861
        
       

     

       860
       862
        
         removeReferencesTo = callPackage ../build-support/remove-references-to {

     
···

       9191
       9193
        
       

     

       9192
       9194
        
         zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;

     

       9193
       9195
        
       

     

       9196
       9196
       +
         inherit (callPackages ../development/tools/zls { })

     

       9197
       9197
       +
           zls_0_14

     

       9198
       9198
       +
           zls_0_15

     

       9199
       9199
       +
           ;

     

       9200
       9200
       +
       

     

       9201
       9201
       +
         # This should be kept updated to ensure the default zls version matches the default zig version.

     

       9202
       9202
       +
         zls = zls_0_14;

     

       9203
       9203
       +
       

     

       9194
       9204
        
         libzint = zint-qt.override { withGUI = false; };

     

       9195
       9205
        
       

     

       9196
       9206
        
         aroccPackages = recurseIntoAttrs (callPackage ../development/compilers/arocc { });

     
···

       10718
       10728
        
         inherit (callPackage ../misc/uboot { })

     

       10719
       10729
        
           buildUBoot

     

       10720
       10730
        
           ubootTools

     

       10731
       10731
       +
           ubootPythonTools

     

       10721
       10732
        
           ubootA20OlinuxinoLime

     

       10722
       10733
        
           ubootA20OlinuxinoLime2EMMC

     

       10723
       10734
        
           ubootBananaPi

+1 -15

pkgs/top-level/haskell-packages.nix

···

       110
       110
        
               llvmPackages = pkgs.llvmPackages_12;

     

       111
       111
        
             };

     

       112
       112
        
             ghc810 = compiler.ghc8107;

     

       113
       113
       -
             ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix {

     

       114
       114
       -
               bootPkgs = bb.packages.ghc8107Binary;

     

       115
       115
       -
               inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12

     

       116
       116
       -
               python3 = buildPackages.python311; # so that we don't have two of them

     

       117
       117
       -
               inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr;

     

       118
       118
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;

     

       119
       119
       -
               llvmPackages = pkgs.llvmPackages_12;

     

       120
       120
       -
             };

     

       121
       121
       -
             ghc90 = compiler.ghc902;

     

       122
       113
        
             ghc928 = callPackage ../development/compilers/ghc/9.2.8.nix {

     

       123
       114
        
               bootPkgs =

     

       124
       115
        
                 # GHC >= 9.0 removed the armv7l bindist

     
···

       361
       352
        
               compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };

     

       362
       353
        
             };

     

       363
       354
        
             ghc810 = packages.ghc8107;

     

       364
       364
       -
             ghc902 = callPackage ../development/haskell-modules {

     

       365
       365
       -
               buildHaskellPackages = bh.packages.ghc902;

     

       366
       366
       -
               ghc = bh.compiler.ghc902;

     

       367
       367
       -
               compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };

     

       368
       368
       -
             };

     

       369
       369
       -
             ghc90 = packages.ghc902;

     

       370
       355
        
             ghc928 = callPackage ../development/haskell-modules {

     

       371
       356
        
               buildHaskellPackages = bh.packages.ghc928;

     

       372
       357
        
               ghc = bh.compiler.ghc928;

     
···

       458
       443
        
               );

     

       459
       444
        
           }

     

       460
       445
        
           // pkgs.lib.optionalAttrs config.allowAliases {

     

       446
       446
       +
             ghc90 = throw "'haskell.packages.ghc90' has been removed."; # Added 2025-09-07

     

       461
       447
        
             ghcjs = throw "'haskell.packages.ghcjs' has been removed. Please use 'pkgsCross.ghcjs' instead."; # Added 2025-09-06

     

       462
       448
        
             ghcjs810 = throw "'haskell.packages.ghcjs810' has been removed. Please use 'pkgsCross.ghcjs' instead."; # Added 2025-09-06

     

       463
       449
        
           };

-8

pkgs/top-level/release-haskell.nix

···

       64
       64
        
         # list of all compilers to test specific packages on

     

       65
       65
        
         released = with compilerNames; [

     

       66
       66
        
           ghc8107

     

       67
       67
       -
           ghc902

     

       68
       67
        
           ghc928

     

       69
       68
        
           ghc948

     

       70
       69
        
           ghc963

     
···

       556
       555
        
               # of core packages, it is not always reasonable to get cabal-install to

     

       557
       556
        
               # work with older compilers.

     

       558
       557
        
               compilerNames.ghc8107

     

       559
       559
       -
               compilerNames.ghc902

     

       560
       558
        
               compilerNames.ghc928

     

       561
       559
        
               compilerNames.ghc948

     

       562
       560
        
             ] released;

     
···

       578
       576
        
             haskell-language-server = lib.subtractLists [

     

       579
       577
        
               # Support ceased as of 2.3.0.0

     

       580
       578
        
               compilerNames.ghc8107

     

       581
       581
       -
               # Support ceased as of 2.5.0.0

     

       582
       582
       -
               compilerNames.ghc902

     

       583
       579
        
               # Support ceased as of 2.10.0.0

     

       584
       580
        
               compilerNames.ghc928

     

       585
       581
        
             ] released;

     

       586
       582
        
             hoogle = released;

     

       587
       583
        
             hlint = lib.subtractLists [

     

       588
       588
       -
               compilerNames.ghc902

     

       589
       584
        
               compilerNames.ghc9101

     

       590
       585
        
               compilerNames.ghc9102

     

       591
       586
        
               compilerNames.ghc9122

     
···

       598
       593
        
             titlecase = released;

     

       599
       594
        
             ghc-api-compat = [

     

       600
       595
        
               compilerNames.ghc8107

     

       601
       601
       -
               compilerNames.ghc902

     

       602
       596
        
             ];

     

       603
       597
        
             ghc-bignum = [

     

       604
       598
        
               compilerNames.ghc8107

     
···

       687
       681
        
               constituents = accumulateDerivations [

     

       688
       682
        
                 jobs.pkgsMusl.haskell.compiler.ghc8107Binary

     

       689
       683
        
                 jobs.pkgsMusl.haskell.compiler.ghc8107

     

       690
       690
       -
                 jobs.pkgsMusl.haskell.compiler.ghc902

     

       691
       684
        
                 jobs.pkgsMusl.haskell.compiler.ghc928

     

       692
       685
        
                 jobs.pkgsMusl.haskell.compiler.ghcHEAD

     

       693
       686
        
                 jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107

     

       694
       694
       -
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902

     

       695
       687
        
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc928

     

       696
       688
        
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD

     

       697
       689
        
               ];

-2

pkgs/top-level/release.nix

···

       363
       363
        
                 packages =

     

       364
       364
        
                   genAttrs

     

       365
       365
        
                     [

     

       366
       366
       -
                       # TODO: share this list between release.nix and release-haskell.nix

     

       367
       367
       -
                       "ghc90"

     

       368
       366
        
                       "ghc92"

     

       369
       367
        
                       "ghc94"

     

       370
       368
        
                       "ghc96"