commit 254e2173bf5faad558e06ae10865c2acd0b2c463 · pyrox.dev/nixpkgs

+30 -11

ci/eval/README.md

···

       2
        
       

     

       3
        
       The code in this directory is used by the [eval.yml](../../.github/workflows/eval.yml) GitHub Actions workflow to evaluate the majority of Nixpkgs for all PRs, effectively making sure that when the development branches are processed by Hydra, no evaluation failures are encountered.

     

       4
        
       

     

       5
       -
       Furthermore it also allows local evaluation using

     

       0
        
       
     

       6
        
       ```

     

       7
       -
       nix-build ci -A eval.full \

     

       8
       -
         --max-jobs 4 \

     

       9
       -
         --cores 2 \

     

       10
       -
         --arg chunkSize 10000 \

     

       11
       -
         --arg evalSystems '["x86_64-linux" "aarch64-darwin"]'

     

       12
        
       ```

     

       13
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       - `--max-jobs`: The maximum number of derivations to run at the same time.

     

       15
        
         Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.

     

       16
        
       - `--cores`: The number of cores to use for each job.

     

       17
        
         Recommended to set this to the amount of cores on your system divided by `--max-jobs`.

     

       18
       -
       - `chunkSize`: The number of attributes that are evaluated simultaneously on a single core.

     

       19
        
         Lowering this decreases memory usage at the cost of increased evaluation time.

     

       20
        
         If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.

     

       21
       -
       - `evalSystems`: The set of systems for which `nixpkgs` should be evaluated.

     

       22
       -
         Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).

     

       23
        
       

     

       24
       -
       A good default is to set `chunkSize` to 10000, which leads to about 3.6GB max memory usage per core, so suitable for fully utilising machines with 4 cores and 16GB memory, 8 cores and 32GB memory or 16 cores and 64GB memory.

     

       25
        
       

     

       26
       -
       Note that 16GB memory is the recommended minimum, while with less than 8GB memory evaluation time suffers greatly.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       2
        
       

     

       3
        
       The code in this directory is used by the [eval.yml](../../.github/workflows/eval.yml) GitHub Actions workflow to evaluate the majority of Nixpkgs for all PRs, effectively making sure that when the development branches are processed by Hydra, no evaluation failures are encountered.

     

       4
        
       

     

       5
       +
       Furthermore it also allows local evaluation using:

     

       6
       +
       

     

       7
        
       ```

     

       8
       +
       nix-build ci -A eval.baseline

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
       ```

     

       10
        
       

     

       11
       +
       The most important two arguments are:

     

       12
       +
       - `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated.

     

       13
       +
         Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).

     

       14
       +
         Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'`

     

       15
       +
       - `--arg quickTest`: Enables testing a single chunk of the current system only for quick iteration.

     

       16
       +
         Example: `--arg quickTest true`

     

       17
       +
       

     

       18
       +
       The following arguments can be used to fine-tune performance:

     

       19
        
       - `--max-jobs`: The maximum number of derivations to run at the same time.

     

       20
        
         Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.

     

       21
        
       - `--cores`: The number of cores to use for each job.

     

       22
        
         Recommended to set this to the amount of cores on your system divided by `--max-jobs`.

     

       23
       +
       - `--arg chunkSize`: The number of attributes that are evaluated simultaneously on a single core.

     

       24
        
         Lowering this decreases memory usage at the cost of increased evaluation time.

     

       25
        
         If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.

     

       26
       +
         The default is 5000.

     

       27
       +
         Example: `--arg chunkSize 10000`

     

       28
        
       

     

       29
       +
       Note that 16GB memory is the recommended minimum, while with less than 8GB memory evaluation time suffers greatly.

     

       30
        
       

     

       31
       +
       ## Local eval with rebuilds / comparison

     

       32
       +
       

     

       33
       +
       To compare two commits locally, first run the following on the baseline commit:

     

       34
       +
       

     

       35
       +
       ```

     

       36
       +
       BASELINE=$(nix-build ci -A eval.baseline --no-out-link)

     

       37
       +
       ```

     

       38
       +
       

     

       39
       +
       Then, on the commit with your changes:

     

       40
       +
       

     

       41
       +
       ```

     

       42
       +
       nix-build ci -A eval.full --arg baseline $BASELINE

     

       43
       +
       ```

     

       44
       +
       

     

       45
       +
       Keep in mind to otherwise pass the same set of arguments for both commands (`evalSystems`, `quickTest`, `chunkSize`).

+27 -11

ci/eval/default.nix

···

       240
        
       

     

       241
        
         compare = callPackage ./compare { };

     

       242
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       243
        
         full =

     

       244
        
           {

     

       245
        
             # Whether to evaluate on a specific set of systems, by default all are evaluated

     

       246
        
             evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,

     

       247
        
             # The number of attributes per chunk, see ./README.md for more info.

     

       248
       -
             chunkSize,

     

       249
        
             quickTest ? false,

     

       0
        
       
     

       250
        
           }:

     

       251
        
           let

     

       252
        
             diffs = symlinkJoin {

     

       253
       -
               name = "diffs";

     

       254
        
               paths = map (

     

       255
        
                 evalSystem:

     

       256
       -
                 let

     

       257
       -
                   eval = singleSystem {

     

       0
        
       
     

       0
        
       
     

       258
        
                     inherit quickTest evalSystem chunkSize;

     

       259
        
                   };

     

       260
       -
                 in

     

       261
       -
                 diff {

     

       262
       -
                   inherit evalSystem;

     

       263
       -
                   # Local "full" evaluation doesn't do a real diff.

     

       264
       -
                   beforeDir = eval;

     

       265
       -
                   afterDir = eval;

     

       266
        
                 }

     

       267
        
               ) evalSystems;

     

       268
        
             };

     
···

       280
        
           combine

     

       281
        
           compare

     

       282
        
           # The above three are used by separate VMs in a GitHub workflow,

     

       283
       -
           # while the below is intended for testing on a single local machine

     

       0
        
       
     

       284
        
           full

     

       285
        
           ;

     

       286
        
       }

···

       240
        
       

     

       241
        
         compare = callPackage ./compare { };

     

       242
        
       

     

       243
       +
         baseline =

     

       244
       +
           {

     

       245
       +
             # Whether to evaluate on a specific set of systems, by default all are evaluated

     

       246
       +
             evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,

     

       247
       +
             # The number of attributes per chunk, see ./README.md for more info.

     

       248
       +
             chunkSize ? 5000,

     

       249
       +
             quickTest ? false,

     

       250
       +
           }:

     

       251
       +
           symlinkJoin {

     

       252
       +
             name = "nixpkgs-eval-baseline";

     

       253
       +
             paths = map (

     

       254
       +
               evalSystem:

     

       255
       +
               singleSystem {

     

       256
       +
                 inherit quickTest evalSystem chunkSize;

     

       257
       +
               }

     

       258
       +
             ) evalSystems;

     

       259
       +
           };

     

       260
       +
       

     

       261
        
         full =

     

       262
        
           {

     

       263
        
             # Whether to evaluate on a specific set of systems, by default all are evaluated

     

       264
        
             evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,

     

       265
        
             # The number of attributes per chunk, see ./README.md for more info.

     

       266
       +
             chunkSize ? 5000,

     

       267
        
             quickTest ? false,

     

       268
       +
             baseline,

     

       269
        
           }:

     

       270
        
           let

     

       271
        
             diffs = symlinkJoin {

     

       272
       +
               name = "nixpkgs-eval-diffs";

     

       273
        
               paths = map (

     

       274
        
                 evalSystem:

     

       275
       +
                 diff {

     

       276
       +
                   inherit evalSystem;

     

       277
       +
                   beforeDir = baseline;

     

       278
       +
                   afterDir = singleSystem {

     

       279
        
                     inherit quickTest evalSystem chunkSize;

     

       280
        
                   };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       281
        
                 }

     

       282
        
               ) evalSystems;

     

       283
        
             };

     
···

       295
        
           combine

     

       296
        
           compare

     

       297
        
           # The above three are used by separate VMs in a GitHub workflow,

     

       298
       +
           # while the below are intended for testing on a single local machine

     

       299
       +
           baseline

     

       300
        
           full

     

       301
        
           ;

     

       302
        
       }

+46 -3

lib/modules.nix

···

       1121
        
             files = map (def: def.file) res.defsFinal;

     

       1122
        
             definitionsWithLocations = res.defsFinal;

     

       1123
        
             inherit (res) isDefined;

     

       0
        
       
     

       1124
        
             # This allows options to be correctly displayed using `${options.path.to.it}`

     

       1125
        
             __toString = _: showOption loc;

     

       1126
        
           };

     
···

       1164
        
           # Type-check the remaining definitions, and merge them. Or throw if no definitions.

     

       1165
        
           mergedValue =

     

       1166
        
             if isDefined then

     

       1167
       -
               if all (def: type.check def.value) defsFinal then

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1168
        
                 type.merge loc defsFinal

     

       1169
        
               else

     

       1170
        
                 let

     
···

       1176
        
               # handling.  If changed here, please change it there too.)

     

       1177
        
               throw

     

       1178
        
                 "The option `${showOption loc}' was accessed but has no value defined. Try setting the option.";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1179
        
       

     

       1180
        
           isDefined = defsFinal != [ ];

     

       1181
        
       

     
···

       1586
        
               New option path as list of strings.

     

       1587
        
             */

     

       1588
        
             to,

     

       1589
       -
       

     

       1590
        
             /**

     

       1591
        
               Release number of the first release that contains the rename, ignoring backports.

     

       1592
        
               Set it to the upcoming release, matching the nixpkgs/.version file.

     

       1593
        
             */

     

       1594
        
             sinceRelease,

     

       1595
       -
       

     

       1596
        
           }:

     

       1597
        
           doRename {

     

       1598
        
             inherit from to;

···

       1121
        
             files = map (def: def.file) res.defsFinal;

     

       1122
        
             definitionsWithLocations = res.defsFinal;

     

       1123
        
             inherit (res) isDefined;

     

       1124
       +
             inherit (res.checkedAndMerged) valueMeta;

     

       1125
        
             # This allows options to be correctly displayed using `${options.path.to.it}`

     

       1126
        
             __toString = _: showOption loc;

     

       1127
        
           };

     
···

       1165
        
           # Type-check the remaining definitions, and merge them. Or throw if no definitions.

     

       1166
        
           mergedValue =

     

       1167
        
             if isDefined then

     

       1168
       +
               if type.merge ? v2 then

     

       1169
       +
                 # check and merge share the same closure

     

       1170
       +
                 # .headError is either not-present, null, or a string describing the error

     

       1171
       +
                 if checkedAndMerged.headError or null != null then

     

       1172
       +
                   throw "A definition for option `${showOption loc}' is not of type `${type.description}'. TypeError: ${checkedAndMerged.headError.message}"

     

       1173
       +
                 else

     

       1174
       +
                   checkedAndMerged.value

     

       1175
       +
               else if all (def: type.check def.value) defsFinal then

     

       1176
        
                 type.merge loc defsFinal

     

       1177
        
               else

     

       1178
        
                 let

     
···

       1184
        
               # handling.  If changed here, please change it there too.)

     

       1185
        
               throw

     

       1186
        
                 "The option `${showOption loc}' was accessed but has no value defined. Try setting the option.";

     

       1187
       +
       

     

       1188
       +
           checkedAndMerged =

     

       1189
       +
             (

     

       1190
       +
               # This function (which is immediately applied) checks that type.merge

     

       1191
       +
               # returns the proper attrset.

     

       1192
       +
               # Once use of the merge.v2 feature has propagated, consider removing this

     

       1193
       +
               # for an estimated one thousandth performance improvement (NixOS by nr.thunks).

     

       1194
       +
               {

     

       1195
       +
                 headError,

     

       1196
       +
                 value,

     

       1197
       +
                 valueMeta,

     

       1198
       +
               }@args:

     

       1199
       +
               args

     

       1200
       +
             )

     

       1201
       +
               (

     

       1202
       +
                 if type.merge ? v2 then

     

       1203
       +
                   let

     

       1204
       +
                     r = type.merge.v2 {

     

       1205
       +
                       inherit loc;

     

       1206
       +
                       defs = defsFinal;

     

       1207
       +
                     };

     

       1208
       +
                   in

     

       1209
       +
                   r

     

       1210
       +
                   // {

     

       1211
       +
                     valueMeta = r.valueMeta // {

     

       1212
       +
                       _internal = {

     

       1213
       +
                         inherit type;

     

       1214
       +
                       };

     

       1215
       +
                     };

     

       1216
       +
                   }

     

       1217
       +
                 else

     

       1218
       +
                   {

     

       1219
       +
                     headError = null;

     

       1220
       +
                     value = mergedValue;

     

       1221
       +
                     valueMeta = { };

     

       1222
       +
                   }

     

       1223
       +
               );

     

       1224
        
       

     

       1225
        
           isDefined = defsFinal != [ ];

     

       1226
        
       

     
···

       1631
        
               New option path as list of strings.

     

       1632
        
             */

     

       1633
        
             to,

     

       0
        
       
     

       1634
        
             /**

     

       1635
        
               Release number of the first release that contains the rename, ignoring backports.

     

       1636
        
               Set it to the upcoming release, matching the nixpkgs/.version file.

     

       1637
        
             */

     

       1638
        
             sinceRelease,

     

       0
        
       
     

       1639
        
           }:

     

       1640
        
           doRename {

     

       1641
        
             inherit from to;

+379

lib/tests/checkAndMergeCompat.nix

···

       1
       +
       {

     

       2
       +
         pkgs ? import ../.. { },

     

       3
       +
         currLibPath ? ../.,

     

       4
       +
         prevLibPath ? "${

     

       5
       +
           pkgs.fetchFromGitHub {

     

       6
       +
             owner = "nixos";

     

       7
       +
             repo = "nixpkgs";

     

       8
       +
             # Parent commit of [#391544](https://github.com/NixOS/nixpkgs/pull/391544)

     

       9
       +
             # Which was before the type.merge.v2 introduction

     

       10
       +
             rev = "bcf94dd3f07189b7475d823c8d67d08b58289905";

     

       11
       +
             hash = "sha256-MuMiIY3MX5pFSOCvutmmRhV6RD0R3CG0Hmazkg8cMFI=";

     

       12
       +
           }

     

       13
       +
         }/lib",

     

       14
       +
       }:

     

       15
       +
       let

     

       16
       +
         lib = import currLibPath;

     

       17
       +
       

     

       18
       +
         lib_with_merge_v2 = lib;

     

       19
       +
         lib_with_merge_v1 = import prevLibPath;

     

       20
       +
       

     

       21
       +
         getMatrix =

     

       22
       +
           {

     

       23
       +
             getType ? null,

     

       24
       +
             # If getType is set this is only used as test prefix

     

       25
       +
             # And the type from getType is used

     

       26
       +
             outerTypeName,

     

       27
       +
             innerTypeName,

     

       28
       +
             value,

     

       29
       +
             testAttrs,

     

       30
       +
           }:

     

       31
       +
           let

     

       32
       +
             evalModules.call_v1 = lib_with_merge_v1.evalModules;

     

       33
       +
             evalModules.call_v2 = lib_with_merge_v2.evalModules;

     

       34
       +
             outerTypes.outer_v1 = lib_with_merge_v1.types;

     

       35
       +
             outerTypes.outer_v2 = lib_with_merge_v2.types;

     

       36
       +
             innerTypes.inner_v1 = lib_with_merge_v1.types;

     

       37
       +
             innerTypes.inner_v2 = lib_with_merge_v2.types;

     

       38
       +
           in

     

       39
       +
           lib.mapAttrs (

     

       40
       +
             _: evalModules:

     

       41
       +
             lib.mapAttrs (

     

       42
       +
               _: outerTypes:

     

       43
       +
               lib.mapAttrs (_: innerTypes: {

     

       44
       +
                 "test_${outerTypeName}_${innerTypeName}" = testAttrs // {

     

       45
       +
                   expr =

     

       46
       +
                     (evalModules {

     

       47
       +
                       modules = [

     

       48
       +
                         (m: {

     

       49
       +
                           options.foo = m.lib.mkOption {

     

       50
       +
                             type =

     

       51
       +
                               if getType != null then

     

       52
       +
                                 getType outerTypes innerTypes

     

       53
       +
                               else

     

       54
       +
                                 outerTypes.${outerTypeName} innerTypes.${innerTypeName};

     

       55
       +
                             default = value;

     

       56
       +
                           };

     

       57
       +
                         })

     

       58
       +
                       ];

     

       59
       +
                     }).config.foo;

     

       60
       +
                 };

     

       61
       +
               }) innerTypes

     

       62
       +
             ) outerTypes

     

       63
       +
           ) evalModules;

     

       64
       +
       in

     

       65
       +
       {

     

       66
       +
         # AttrsOf string

     

       67
       +
         attrsOf_str_ok = getMatrix {

     

       68
       +
           outerTypeName = "attrsOf";

     

       69
       +
           innerTypeName = "str";

     

       70
       +
           value = {

     

       71
       +
             bar = "test";

     

       72
       +
           };

     

       73
       +
           testAttrs = {

     

       74
       +
             expected = {

     

       75
       +
               bar = "test";

     

       76
       +
             };

     

       77
       +
           };

     

       78
       +
         };

     

       79
       +
         attrsOf_str_err_inner = getMatrix {

     

       80
       +
           outerTypeName = "attrsOf";

     

       81
       +
           innerTypeName = "str";

     

       82
       +
           value = {

     

       83
       +
             bar = 1; # not a string

     

       84
       +
           };

     

       85
       +
           testAttrs = {

     

       86
       +
             expectedError = {

     

       87
       +
               type = "ThrownError";

     

       88
       +
               msg = "A definition for option `foo.bar' is not of type `string'.*";

     

       89
       +
             };

     

       90
       +
           };

     

       91
       +
         };

     

       92
       +
         attrsOf_str_err_outer = getMatrix {

     

       93
       +
           outerTypeName = "attrsOf";

     

       94
       +
           innerTypeName = "str";

     

       95
       +
           value = [ "foo" ]; # not an attrset

     

       96
       +
           testAttrs = {

     

       97
       +
             expectedError = {

     

       98
       +
               type = "ThrownError";

     

       99
       +
               msg = "A definition for option `foo' is not of type `attribute set of string'.*";

     

       100
       +
             };

     

       101
       +
           };

     

       102
       +
         };

     

       103
       +
       

     

       104
       +
         # listOf string

     

       105
       +
         listOf_str_ok = getMatrix {

     

       106
       +
           outerTypeName = "listOf";

     

       107
       +
           innerTypeName = "str";

     

       108
       +
           value = [

     

       109
       +
             "foo"

     

       110
       +
             "bar"

     

       111
       +
           ];

     

       112
       +
           testAttrs = {

     

       113
       +
             expected = [

     

       114
       +
               "foo"

     

       115
       +
               "bar"

     

       116
       +
             ];

     

       117
       +
           };

     

       118
       +
         };

     

       119
       +
         listOf_str_err_inner = getMatrix {

     

       120
       +
           outerTypeName = "listOf";

     

       121
       +
           innerTypeName = "str";

     

       122
       +
           value = [

     

       123
       +
             "foo"

     

       124
       +
             1

     

       125
       +
           ]; # not a string

     

       126
       +
           testAttrs = {

     

       127
       +
             expectedError = {

     

       128
       +
               type = "ThrownError";

     

       129
       +
               msg = ''A definition for option `foo."\[definition 1-entry 2\]"' is not of type `string'.'';

     

       130
       +
             };

     

       131
       +
           };

     

       132
       +
         };

     

       133
       +
         listOf_str_err_outer = getMatrix {

     

       134
       +
           outerTypeName = "listOf";

     

       135
       +
           innerTypeName = "str";

     

       136
       +
           value = {

     

       137
       +
             foo = 42;

     

       138
       +
           }; # not a list

     

       139
       +
           testAttrs = {

     

       140
       +
             expectedError = {

     

       141
       +
               type = "ThrownError";

     

       142
       +
               msg = "A definition for option `foo' is not of type `list of string'.*";

     

       143
       +
             };

     

       144
       +
           };

     

       145
       +
         };

     

       146
       +
       

     

       147
       +
         attrsOf_submodule_ok = getMatrix {

     

       148
       +
           getType =

     

       149
       +
             a: b:

     

       150
       +
             a.attrsOf (

     

       151
       +
               b.submodule (m: {

     

       152
       +
                 options.nested = m.lib.mkOption {

     

       153
       +
                   type = m.lib.types.str;

     

       154
       +
                 };

     

       155
       +
               })

     

       156
       +
             );

     

       157
       +
           outerTypeName = "attrsOf";

     

       158
       +
           innerTypeName = "submodule";

     

       159
       +
           value = {

     

       160
       +
             foo = {

     

       161
       +
               nested = "test1";

     

       162
       +
             };

     

       163
       +
             bar = {

     

       164
       +
               nested = "test2";

     

       165
       +
             };

     

       166
       +
           };

     

       167
       +
           testAttrs = {

     

       168
       +
             expected = {

     

       169
       +
               foo = {

     

       170
       +
                 nested = "test1";

     

       171
       +
               };

     

       172
       +
               bar = {

     

       173
       +
                 nested = "test2";

     

       174
       +
               };

     

       175
       +
             };

     

       176
       +
           };

     

       177
       +
         };

     

       178
       +
         attrsOf_submodule_err_inner = getMatrix {

     

       179
       +
           outerTypeName = "attrsOf";

     

       180
       +
           innerTypeName = "submodule";

     

       181
       +
           getType =

     

       182
       +
             a: b:

     

       183
       +
             a.attrsOf (

     

       184
       +
               b.submodule (m: {

     

       185
       +
                 options.nested = m.lib.mkOption {

     

       186
       +
                   type = m.lib.types.str;

     

       187
       +
                 };

     

       188
       +
               })

     

       189
       +
             );

     

       190
       +
           value = {

     

       191
       +
             foo = [ 1 ]; # not a submodule

     

       192
       +
             bar = {

     

       193
       +
               nested = "test2";

     

       194
       +
             };

     

       195
       +
           };

     

       196
       +
           testAttrs = {

     

       197
       +
             expectedError = {

     

       198
       +
               type = "ThrownError";

     

       199
       +
               msg = "A definition for option `foo.foo' is not of type `submodule'.*";

     

       200
       +
             };

     

       201
       +
           };

     

       202
       +
         };

     

       203
       +
         attrsOf_submodule_err_outer = getMatrix {

     

       204
       +
           outerTypeName = "attrsOf";

     

       205
       +
           innerTypeName = "submodule";

     

       206
       +
           getType =

     

       207
       +
             a: b:

     

       208
       +
             a.attrsOf (

     

       209
       +
               b.submodule (m: {

     

       210
       +
                 options.nested = m.lib.mkOption {

     

       211
       +
                   type = m.lib.types.str;

     

       212
       +
                 };

     

       213
       +
               })

     

       214
       +
             );

     

       215
       +
           value = [ 123 ]; # not an attrsOf

     

       216
       +
           testAttrs = {

     

       217
       +
             expectedError = {

     

       218
       +
               type = "ThrownError";

     

       219
       +
               msg = ''A definition for option `foo' is not of type `attribute set of \(submodule\).*'';

     

       220
       +
             };

     

       221
       +
           };

     

       222
       +
         };

     

       223
       +
       

     

       224
       +
         # either

     

       225
       +
         either_str_attrsOf_ok = getMatrix {

     

       226
       +
           outerTypeName = "either";

     

       227
       +
           innerTypeName = "str_or_attrsOf_str";

     

       228
       +
       

     

       229
       +
           getType = a: b: a.either b.str (b.attrsOf a.str);

     

       230
       +
           value = "string value";

     

       231
       +
           testAttrs = {

     

       232
       +
             expected = "string value";

     

       233
       +
           };

     

       234
       +
         };

     

       235
       +
         either_str_attrsOf_err_1 = getMatrix {

     

       236
       +
           outerTypeName = "either";

     

       237
       +
           innerTypeName = "str_or_attrsOf_str";

     

       238
       +
       

     

       239
       +
           getType = a: b: a.either b.str (b.attrsOf a.str);

     

       240
       +
           value = 1;

     

       241
       +
           testAttrs = {

     

       242
       +
             expectedError = {

     

       243
       +
               type = "ThrownError";

     

       244
       +
               msg = "A definition for option `foo' is not of type `string or attribute set of string'.*";

     

       245
       +
             };

     

       246
       +
           };

     

       247
       +
         };

     

       248
       +
         either_str_attrsOf_err_2 = getMatrix {

     

       249
       +
           outerTypeName = "either";

     

       250
       +
           innerTypeName = "str_or_attrsOf_str";

     

       251
       +
       

     

       252
       +
           getType = a: b: a.either b.str (b.attrsOf a.str);

     

       253
       +
           value = {

     

       254
       +
             bar = 1; # not a string

     

       255
       +
           };

     

       256
       +
           testAttrs = {

     

       257
       +
             expectedError = {

     

       258
       +
               type = "ThrownError";

     

       259
       +
               msg = "A definition for option `foo.bar' is not of type `string'.*";

     

       260
       +
             };

     

       261
       +
           };

     

       262
       +
         };

     

       263
       +
       

     

       264
       +
         # Coereced to

     

       265
       +
         coerce_attrsOf_str_to_listOf_str_run = getMatrix {

     

       266
       +
           outerTypeName = "coercedTo";

     

       267
       +
           innerTypeName = "attrsOf_str->listOf_str";

     

       268
       +
           getType = a: b: a.coercedTo (b.attrsOf b.str) builtins.attrValues (b.listOf b.str);

     

       269
       +
           value = {

     

       270
       +
             bar = "test1"; # coerced to listOf string

     

       271
       +
             foo = "test2"; # coerced to listOf string

     

       272
       +
           };

     

       273
       +
           testAttrs = {

     

       274
       +
             expected = [

     

       275
       +
               "test1"

     

       276
       +
               "test2"

     

       277
       +
             ];

     

       278
       +
           };

     

       279
       +
         };

     

       280
       +
         coerce_attrsOf_str_to_listOf_str_final = getMatrix {

     

       281
       +
           outerTypeName = "coercedTo";

     

       282
       +
           innerTypeName = "attrsOf_str->listOf_str";

     

       283
       +
           getType = a: b: a.coercedTo (b.attrsOf b.str) (abort "This shouldnt run") (b.listOf b.str);

     

       284
       +
           value = [

     

       285
       +
             "test1"

     

       286
       +
             "test2"

     

       287
       +
           ]; # already a listOf string

     

       288
       +
           testAttrs = {

     

       289
       +
             expected = [

     

       290
       +
               "test1"

     

       291
       +
               "test2"

     

       292
       +
             ]; # Order should be kept

     

       293
       +
           };

     

       294
       +
         };

     

       295
       +
         coerce_attrsOf_str_to_listOf_err_coercer_input = getMatrix {

     

       296
       +
           outerTypeName = "coercedTo";

     

       297
       +
           innerTypeName = "attrsOf_str->listOf_str";

     

       298
       +
           getType = a: b: a.coercedTo (b.attrsOf b.str) builtins.attrValues (b.listOf b.str);

     

       299
       +
           value = [

     

       300
       +
             { }

     

       301
       +
             { }

     

       302
       +
           ]; # not coercible to listOf string, with the given coercer

     

       303
       +
           testAttrs = {

     

       304
       +
             expectedError = {

     

       305
       +
               type = "ThrownError";

     

       306
       +
               msg = ''A definition for option `foo."\[definition 1-entry 1\]"' is not of type `string'.*'';

     

       307
       +
             };

     

       308
       +
           };

     

       309
       +
         };

     

       310
       +
         coerce_attrsOf_str_to_listOf_err_coercer_ouput = getMatrix {

     

       311
       +
           outerTypeName = "coercedTo";

     

       312
       +
           innerTypeName = "attrsOf_str->listOf_str";

     

       313
       +
           getType = a: b: a.coercedTo (b.attrsOf b.str) builtins.attrValues (b.listOf b.str);

     

       314
       +
           value = {

     

       315
       +
             foo = {

     

       316
       +
               bar = 1;

     

       317
       +
             }; # coercer produces wrong type -> [ { bar = 1; } ]

     

       318
       +
           };

     

       319
       +
           testAttrs = {

     

       320
       +
             expectedError = {

     

       321
       +
               type = "ThrownError";

     

       322
       +
               msg = ''A definition for option `foo."\[definition 1-entry 1\]"' is not of type `string'.*'';

     

       323
       +
             };

     

       324
       +
           };

     

       325
       +
         };

     

       326
       +
         coerce_str_to_int_coercer_ouput = getMatrix {

     

       327
       +
           outerTypeName = "coercedTo";

     

       328
       +
           innerTypeName = "int->str";

     

       329
       +
           getType = a: b: a.coercedTo b.int builtins.toString a.str;

     

       330
       +
           value = [ ];

     

       331
       +
           testAttrs = {

     

       332
       +
             expectedError = {

     

       333
       +
               type = "ThrownError";

     

       334
       +
               msg = ''A definition for option `foo' is not of type `string or signed integer convertible to it.*'';

     

       335
       +
             };

     

       336
       +
           };

     

       337
       +
         };

     

       338
       +
       

     

       339
       +
         # Submodule

     

       340
       +
         submodule_with_ok = getMatrix {

     

       341
       +
           outerTypeName = "submoduleWith";

     

       342
       +
           innerTypeName = "mixed_types";

     

       343
       +
           getType =

     

       344
       +
             a: b:

     

       345
       +
             a.submodule (m: {

     

       346
       +
               options.attrs = m.lib.mkOption {

     

       347
       +
                 type = b.attrsOf b.str;

     

       348
       +
               };

     

       349
       +
               options.list = m.lib.mkOption {

     

       350
       +
                 type = b.listOf b.str;

     

       351
       +
               };

     

       352
       +
               options.either = m.lib.mkOption {

     

       353
       +
                 type = b.either a.str a.int;

     

       354
       +
               };

     

       355
       +
             });

     

       356
       +
           value = {

     

       357
       +
             attrs = {

     

       358
       +
               foo = "bar";

     

       359
       +
             };

     

       360
       +
             list = [

     

       361
       +
               "foo"

     

       362
       +
               "bar"

     

       363
       +
             ];

     

       364
       +
             either = 123; # int

     

       365
       +
           };

     

       366
       +
           testAttrs = {

     

       367
       +
             expected = {

     

       368
       +
               attrs = {

     

       369
       +
                 foo = "bar";

     

       370
       +
               };

     

       371
       +
               list = [

     

       372
       +
                 "foo"

     

       373
       +
                 "bar"

     

       374
       +
               ];

     

       375
       +
               either = 123;

     

       376
       +
             };

     

       377
       +
           };

     

       378
       +
         };

     

       379
       +
       }

+22 -2

lib/tests/modules.sh

···

       345
        
       set --

     

       346
        
       checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix

     

       347
        
       checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix

     

       348
       -
       checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix

     

       349
        
       

     

       350
        
       # Check coerced option merging.

     

       351
        
       checkConfigError 'The option .value. in .*/declare-coerced-value.nix. is already declared in .*/declare-coerced-value-no-default.nix.' config.value ./declare-coerced-value.nix ./declare-coerced-value-no-default.nix

     

       352
        
       

     

       353
        
       # Check coerced value with unsound coercion

     

       354
        
       checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix

     

       355
       -
       checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix

     

       356
        
       checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix

     

       357
        
       

     

       358
        
       # Check `graph` attribute

     
···

       761
        
       checkConfigError 'attribute .*bar.* not found' config.sub.conditionalImportAsNixos.bar ./specialArgs-class.nix

     

       762
        
       checkConfigError 'attribute .*foo.* not found' config.sub.conditionalImportAsDarwin.foo ./specialArgs-class.nix

     

       763
        
       checkConfigOutput '"foo"' config.sub.conditionalImportAsDarwin.bar ./specialArgs-class.nix

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       764
        
       

     

       765
        
       cat <<EOF

     

       766
        
       ====== module tests ======

···

       345
        
       set --

     

       346
        
       checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix

     

       347
        
       checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix

     

       348
       +
       checkConfigError 'A definition for option .*. is not of type .*.\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix

     

       349
        
       

     

       350
        
       # Check coerced option merging.

     

       351
        
       checkConfigError 'The option .value. in .*/declare-coerced-value.nix. is already declared in .*/declare-coerced-value-no-default.nix.' config.value ./declare-coerced-value.nix ./declare-coerced-value-no-default.nix

     

       352
        
       

     

       353
        
       # Check coerced value with unsound coercion

     

       354
        
       checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix

     

       355
       +
       checkConfigError 'A definition for option .* is not of type .*.\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix

     

       356
        
       checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix

     

       357
        
       

     

       358
        
       # Check `graph` attribute

     
···

       761
        
       checkConfigError 'attribute .*bar.* not found' config.sub.conditionalImportAsNixos.bar ./specialArgs-class.nix

     

       762
        
       checkConfigError 'attribute .*foo.* not found' config.sub.conditionalImportAsDarwin.foo ./specialArgs-class.nix

     

       763
        
       checkConfigOutput '"foo"' config.sub.conditionalImportAsDarwin.bar ./specialArgs-class.nix

     

       764
       +
       # Check that some types expose the 'valueMeta'

     

       765
       +
       checkConfigOutput '\{\}' options.str.valueMeta ./types-valueMeta.nix

     

       766
       +
       checkConfigOutput '["foo", "bar"]' config.attrsOfResult ./types-valueMeta.nix

     

       767
       +
       checkConfigOutput '2' config.listOfResult ./types-valueMeta.nix

     

       768
       +
       

     

       769
       +
       # Check that composed types expose the 'valueMeta'

     

       770
       +
       # attrsOf submodule (also on merged options,types)

     

       771
       +
       checkConfigOutput '42' options.attrsOfModule.valueMeta.attrs.foo.configuration.options.bar.value ./composed-types-valueMeta.nix

     

       772
       +
       checkConfigOutput '42' options.mergedAttrsOfModule.valueMeta.attrs.foo.configuration.options.bar.value ./composed-types-valueMeta.nix

     

       773
       +
       

     

       774
       +
       # listOf submodule (also on merged options,types)

     

       775
       +
       checkConfigOutput '42' config.listResult ./composed-types-valueMeta.nix

     

       776
       +
       checkConfigOutput '42' config.mergedListResult ./composed-types-valueMeta.nix

     

       777
       +
       

     

       778
       +
       # Add check

     

       779
       +
       checkConfigOutput '^0$' config.v1CheckedPass ./add-check.nix

     

       780
       +
       checkConfigError 'A definition for option .* is not of type .signed integer.*' config.v1CheckedFail ./add-check.nix

     

       781
       +
       checkConfigOutput '^true$' config.v2checkedPass ./add-check.nix

     

       782
       +
       checkConfigError 'A definition for option .* is not of type .attribute set of signed integer.*' config.v2checkedFail ./add-check.nix

     

       783
       +
       

     

       784
        
       

     

       785
        
       cat <<EOF

     

       786
        
       ====== module tests ======

+36

lib/tests/modules/add-check.nix

···

       1
       +
       (

     

       2
       +
         { lib, ... }:

     

       3
       +
         let

     

       4
       +
           inherit (lib) types mkOption;

     

       5
       +
           inherit (types) addCheck int attrsOf;

     

       6
       +
       

     

       7
       +
           # type with a v1 merge

     

       8
       +
           v1Type = addCheck int (v: v == 0);

     

       9
       +
       

     

       10
       +
           # type with a v2 merge

     

       11
       +
           v2Type = addCheck (attrsOf int) (v: v ? foo);

     

       12
       +
         in

     

       13
       +
         {

     

       14
       +
           options.v1CheckedPass = mkOption {

     

       15
       +
             type = v1Type;

     

       16
       +
             default = 0;

     

       17
       +
           };

     

       18
       +
           options.v1CheckedFail = mkOption {

     

       19
       +
             type = v1Type;

     

       20
       +
             default = 1;

     

       21
       +
           };

     

       22
       +
           options.v2checkedPass = mkOption {

     

       23
       +
             type = v2Type;

     

       24
       +
             default = {

     

       25
       +
               foo = 1;

     

       26
       +
             };

     

       27
       +
             # plug the value to make test script regex simple

     

       28
       +
             apply = v: v.foo == 1;

     

       29
       +
           };

     

       30
       +
           options.v2checkedFail = mkOption {

     

       31
       +
             type = v2Type;

     

       32
       +
             default = { };

     

       33
       +
             apply = v: lib.deepSeq v v;

     

       34
       +
           };

     

       35
       +
         }

     

       36
       +
       )

+75

lib/tests/modules/composed-types-valueMeta.nix

···

       1
       +
       { lib, ... }:

     

       2
       +
       let

     

       3
       +
         inherit (lib) types mkOption;

     

       4
       +
       

     

       5
       +
         attrsOfModule = mkOption {

     

       6
       +
           type = types.attrsOf (

     

       7
       +
             types.submodule {

     

       8
       +
               options.bar = mkOption {

     

       9
       +
                 type = types.int;

     

       10
       +
               };

     

       11
       +
             }

     

       12
       +
           );

     

       13
       +
         };

     

       14
       +
       

     

       15
       +
         listOfModule = mkOption {

     

       16
       +
           type = types.listOf (

     

       17
       +
             types.submodule {

     

       18
       +
               options.bar = mkOption {

     

       19
       +
                 type = types.int;

     

       20
       +
               };

     

       21
       +
             }

     

       22
       +
           );

     

       23
       +
         };

     

       24
       +
       

     

       25
       +
       in

     

       26
       +
       {

     

       27
       +
         imports = [

     

       28
       +
           #  Module A

     

       29
       +
           ({

     

       30
       +
             options.attrsOfModule = attrsOfModule;

     

       31
       +
             options.mergedAttrsOfModule = attrsOfModule;

     

       32
       +
             options.listOfModule = listOfModule;

     

       33
       +
             options.mergedListOfModule = listOfModule;

     

       34
       +
           })

     

       35
       +
           # Module B

     

       36
       +
           ({

     

       37
       +
             options.mergedAttrsOfModule = attrsOfModule;

     

       38
       +
             options.mergedListOfModule = listOfModule;

     

       39
       +
           })

     

       40
       +
           # Values

     

       41
       +
           # It is important that the value is defined in a separate module

     

       42
       +
           # Without valueMeta the actual value and sub-options wouldn't be accessible via:

     

       43
       +
           # options.attrsOfModule.type.getSubOptions

     

       44
       +
           ({

     

       45
       +
             attrsOfModule = {

     

       46
       +
               foo.bar = 42;

     

       47
       +
             };

     

       48
       +
             mergedAttrsOfModule = {

     

       49
       +
               foo.bar = 42;

     

       50
       +
             };

     

       51
       +
           })

     

       52
       +
           (

     

       53
       +
             { options, ... }:

     

       54
       +
             {

     

       55
       +
               config.listOfModule = [

     

       56
       +
                 {

     

       57
       +
                   bar = 42;

     

       58
       +
                 }

     

       59
       +
               ];

     

       60
       +
               config.mergedListOfModule = [

     

       61
       +
                 {

     

       62
       +
                   bar = 42;

     

       63
       +
                 }

     

       64
       +
               ];

     

       65
       +
               # Result options to expose the list module to bash as plain attribute path

     

       66
       +
               options.listResult = mkOption {

     

       67
       +
                 default = (builtins.head options.listOfModule.valueMeta.list).configuration.options.bar.value;

     

       68
       +
               };

     

       69
       +
               options.mergedListResult = mkOption {

     

       70
       +
                 default = (builtins.head options.mergedListOfModule.valueMeta.list).configuration.options.bar.value;

     

       71
       +
               };

     

       72
       +
             }

     

       73
       +
           )

     

       74
       +
         ];

     

       75
       +
       }

+60

lib/tests/modules/types-valueMeta.nix

···

       1
       +
       { lib, ... }:

     

       2
       +
       let

     

       3
       +
         inherit (lib) types mkOption;

     

       4
       +
       

     

       5
       +
         inherit (types)

     

       6
       +
           # attrsOf uses attrsWith internally

     

       7
       +
           attrsOf

     

       8
       +
           listOf

     

       9
       +
           submoduleOf

     

       10
       +
           str

     

       11
       +
           ;

     

       12
       +
       in

     

       13
       +
       {

     

       14
       +
         imports = [

     

       15
       +
           (

     

       16
       +
             { options, ... }:

     

       17
       +
             {

     

       18
       +
               # Should have an empty valueMeta

     

       19
       +
               options.str = mkOption {

     

       20
       +
                 type = str;

     

       21
       +
               };

     

       22
       +
       

     

       23
       +
               # Should have some valueMeta which is an attribute set of the nested valueMeta

     

       24
       +
               options.attrsOf = mkOption {

     

       25
       +
                 type = attrsOf str;

     

       26
       +
                 default = {

     

       27
       +
                   foo = "foo";

     

       28
       +
                   bar = "bar";

     

       29
       +
                 };

     

       30
       +
               };

     

       31
       +
               options.attrsOfResult = mkOption {

     

       32
       +
                 default = builtins.attrNames options.attrsOf.valueMeta.attrs;

     

       33
       +
               };

     

       34
       +
       

     

       35
       +
               # Should have some valueMeta which is the list of the nested valueMeta of types.str

     

       36
       +
               # [ {} {} ]

     

       37
       +
               options.listOf = mkOption {

     

       38
       +
                 type = listOf str;

     

       39
       +
                 default = [

     

       40
       +
                   "foo"

     

       41
       +
                   "bar"

     

       42
       +
                 ];

     

       43
       +
               };

     

       44
       +
               options.listOfResult = mkOption {

     

       45
       +
                 default = builtins.length options.listOf.valueMeta.list;

     

       46
       +
               };

     

       47
       +
       

     

       48
       +
               # Should have some valueMeta which is the submodule evaluation

     

       49
       +
               # { _module, options, config, ...}

     

       50
       +
               options.submoduleOf = mkOption {

     

       51
       +
                 type = submoduleOf {

     

       52
       +
                   options.str = mkOption {

     

       53
       +
                     type = str;

     

       54
       +
                   };

     

       55
       +
                 };

     

       56
       +
               };

     

       57
       +
             }

     

       58
       +
           )

     

       59
       +
         ];

     

       60
       +
       }

+25

lib/tests/nix-unit.nix

···

       1
       +
       {

     

       2
       +
         pkgs ? import ../.. { },

     

       3
       +
       }:

     

       4
       +
       let

     

       5
       +
         prevNixpkgs = pkgs.fetchFromGitHub {

     

       6
       +
           owner = "nixos";

     

       7
       +
           repo = "nixpkgs";

     

       8
       +
           # Parent commit of [#391544](https://github.com/NixOS/nixpkgs/pull/391544)

     

       9
       +
           # Which was before the type.merge.v2 introduction

     

       10
       +
           rev = "bcf94dd3f07189b7475d823c8d67d08b58289905";

     

       11
       +
           hash = "sha256-MuMiIY3MX5pFSOCvutmmRhV6RD0R3CG0Hmazkg8cMFI=";

     

       12
       +
         };

     

       13
       +
       in

     

       14
       +
       (pkgs.runCommand "lib-cross-eval-merge-v2"

     

       15
       +
         {

     

       16
       +
           nativeBuildInputs = [ pkgs.nix-unit ];

     

       17
       +
         }

     

       18
       +
         ''

     

       19
       +
           export HOME=$TMPDIR

     

       20
       +
           nix-unit --eval-store "$HOME" ${./checkAndMergeCompat.nix} \

     

       21
       +
             --arg currLibPath "${../.}" \

     

       22
       +
             --arg prevLibPath "${prevNixpkgs}/lib"

     

       23
       +
           mkdir $out

     

       24
       +
         ''

     

       25
       +
       )

lib/tests/release.nix

···

       29
        
       pkgsBB.symlinkJoin {

     

       30
        
         name = "nixpkgs-lib-tests";

     

       31
        
         paths = map testWithNix nixVersions ++ [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
           (import ./maintainers.nix {

     

       33
        
             inherit pkgs;

     

       34
        
             lib = import ../.;

···

       29
        
       pkgsBB.symlinkJoin {

     

       30
        
         name = "nixpkgs-lib-tests";

     

       31
        
         paths = map testWithNix nixVersions ++ [

     

       32
       +
           (import ./nix-unit.nix {

     

       33
       +
             inherit pkgs;

     

       34
       +
           })

     

       35
        
           (import ./maintainers.nix {

     

       36
        
             inherit pkgs;

     

       37
        
             lib = import ../.;

+201 -76

lib/types.nix

···

       20
        
           toList

     

       21
        
           ;

     

       22
        
         inherit (lib.lists)

     

       23
       -
           all

     

       24
        
           concatLists

     

       25
        
           count

     

       26
        
           elemAt

     
···

       48
        
           mergeOneOption

     

       49
        
           mergeUniqueOption

     

       50
        
           showFiles

     

       0
        
       
     

       51
        
           showOption

     

       52
        
           ;

     

       53
        
         inherit (lib.strings)

     
···

       98
        
               lib.optionalString (loc != null) "of the option `${showOption loc}` "

     

       99
        
             }is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.

     

       100
        
           '' payload.elemType;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       101
        
       

     

       102
        
         outer_types = rec {

     

       103
        
           isType = type: x: (x._type or "") == type;

     
···

       705
        
                 }";

     

       706
        
                 descriptionClass = "composite";

     

       707
        
                 check = isList;

     

       708
       -
                 merge =

     

       709
       -
                   loc: defs:

     

       710
       -
                   map (x: x.value) (

     

       711
       -
                     filter (x: x ? value) (

     

       712
       -
                       concatLists (

     

       713
       -
                         imap1 (

     

       714
       -
                           n: def:

     

       0
        
       
     

       0
        
       
     

       715
        
                           imap1 (

     

       716
       -
                             m: def':

     

       717
       -
                             (mergeDefinitions (loc ++ [ "[definition ${toString n}-entry ${toString m}]" ]) elemType [

     

       718
       -
                               {

     

       719
       -
                                 inherit (def) file;

     

       720
       -
                                 value = def';

     

       721
       -
                               }

     

       722
       -
                             ]).optionalValue

     

       723
       -
                           ) def.value

     

       724
       -
                         ) defs

     

       725
       -
                       )

     

       726
       -
                     )

     

       727
       -
                   );

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       728
        
                 emptyValue = {

     

       729
        
                   value = [ ];

     

       730
        
                 };

     
···

       801
        
                 lazy ? false,

     

       802
        
                 placeholder ? "name",

     

       803
        
               }:

     

       804
       -
               mkOptionType {

     

       805
        
                 name = if lazy then "lazyAttrsOf" else "attrsOf";

     

       806
        
                 description =

     

       807
        
                   (if lazy then "lazy attribute set" else "attribute set")

     

       808
        
                   + " of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";

     

       809
        
                 descriptionClass = "composite";

     

       810
        
                 check = isAttrs;

     

       811
       -
                 merge =

     

       812
       -
                   if lazy then

     

       813
       -
                     (

     

       814
       -
                       # Lazy merge Function

     

       815
       -
                       loc: defs:

     

       816
       -
                       zipAttrsWith

     

       817
       -
                         (

     

       818
       -
                           name: defs:

     

       819
       -
                           let

     

       820
       -
                             merged = mergeDefinitions (loc ++ [ name ]) elemType defs;

     

       821
       -
                             # mergedValue will trigger an appropriate error when accessed

     

       822
       -
                           in

     

       823
       -
                           merged.optionalValue.value or elemType.emptyValue.value or merged.mergedValue

     

       824
       -
                         )

     

       825
       -
                         # Push down position info.

     

       826
       -
                         (pushPositions defs)

     

       827
       -
                     )

     

       828
       -
                   else

     

       829
       -
                     (

     

       830
       -
                       # Non-lazy merge Function

     

       831
       -
                       loc: defs:

     

       832
       -
                       mapAttrs (n: v: v.value) (

     

       833
       -
                         filterAttrs (n: v: v ? value) (

     

       834
       -
                           zipAttrsWith (name: defs: (mergeDefinitions (loc ++ [ name ]) elemType (defs)).optionalValue)

     

       835
       -
                             # Push down position info.

     

       836
       -
                             (pushPositions defs)

     

       837
       -
                         )

     

       838
       -
                       )

     

       839
       -
                     );

     

       0
        
       
     

       840
        
                 emptyValue = {

     

       841
        
                   value = { };

     

       842
        
                 };

     
···

       1218
        
       

     

       1219
        
                 name = "submodule";

     

       1220
        
       

     

       0
        
       
     

       1221
        
               in

     

       1222
        
               mkOptionType {

     

       1223
        
                 inherit name;

     
···

       1229
        
                       docsEval = base.extendModules { modules = [ noCheckForDocsModule ]; };

     

       1230
        
                     in

     

       1231
        
                     docsEval._module.freeformType.description or name;

     

       1232
       -
                 check = x: isAttrs x || isFunction x || path.check x;

     

       1233
       -
                 merge =

     

       1234
       -
                   loc: defs:

     

       1235
       -
                   (base.extendModules {

     

       1236
       -
                     modules = [ { _module.args.name = last loc; } ] ++ allModules defs;

     

       1237
       -
                     prefix = loc;

     

       1238
       -
                   }).config;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1239
        
                 emptyValue = {

     

       1240
        
                   value = { };

     

       1241
        
                 };

     
···

       1383
        
                     }";

     

       1384
        
                 descriptionClass = "conjunction";

     

       1385
        
                 check = x: t1.check x || t2.check x;

     

       1386
       -
                 merge =

     

       1387
       -
                   loc: defs:

     

       1388
       -
                   let

     

       1389
       -
                     defList = map (d: d.value) defs;

     

       1390
       -
                   in

     

       1391
       -
                   if all (x: t1.check x) defList then

     

       1392
       -
                     t1.merge loc defs

     

       1393
       -
                   else if all (x: t2.check x) defList then

     

       1394
       -
                     t2.merge loc defs

     

       1395
       -
                   else

     

       1396
       -
                     mergeOneOption loc defs;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1397
        
                 typeMerge =

     

       1398
        
                   f':

     

       1399
        
                   let

     
···

       1434
        
                   optionDescriptionPhrase (class: class == "noun") coercedType

     

       1435
        
                 } convertible to it";

     

       1436
        
                 check = x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;

     

       1437
       -
                 merge =

     

       1438
       -
                   loc: defs:

     

       1439
       -
                   let

     

       1440
       -
                     coerceVal = val: if coercedType.check val then coerceFunc val else val;

     

       1441
       -
                   in

     

       1442
       -
                   finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1443
        
                 emptyValue = finalType.emptyValue;

     

       1444
        
                 getSubOptions = finalType.getSubOptions;

     

       1445
        
                 getSubModules = finalType.getSubModules;

     
···

       1451
        
                 nestedTypes.coercedType = coercedType;

     

       1452
        
                 nestedTypes.finalType = finalType;

     

       1453
        
               };

     

       0
        
       
     

       1454
        
             /**

     

       1455
        
               Augment the given type with an additional type check function.

     

       1456
        
       

     
···

       1459
        
               Fixing is not trivial, we appreciate any help!

     

       1460
        
               :::

     

       1461
        
             */

     

       1462
       -
             addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };

     

       1463
       -
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1464
        
           };

     

       1465
        
       

     

       1466
        
           /**

···

       20
        
           toList

     

       21
        
           ;

     

       22
        
         inherit (lib.lists)

     

       0
        
       
     

       23
        
           concatLists

     

       24
        
           count

     

       25
        
           elemAt

     
···

       47
        
           mergeOneOption

     

       48
        
           mergeUniqueOption

     

       49
        
           showFiles

     

       50
       +
           showDefs

     

       51
        
           showOption

     

       52
        
           ;

     

       53
        
         inherit (lib.strings)

     
···

       98
        
               lib.optionalString (loc != null) "of the option `${showOption loc}` "

     

       99
        
             }is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.

     

       100
        
           '' payload.elemType;

     

       101
       +
       

     

       102
       +
         checkDefsForError =

     

       103
       +
           check: loc: defs:

     

       104
       +
           let

     

       105
       +
             invalidDefs = filter (def: !check def.value) defs;

     

       106
       +
           in

     

       107
       +
           if invalidDefs != [ ] then { message = "Definition values: ${showDefs invalidDefs}"; } else null;

     

       108
        
       

     

       109
        
         outer_types = rec {

     

       110
        
           isType = type: x: (x._type or "") == type;

     
···

       712
        
                 }";

     

       713
        
                 descriptionClass = "composite";

     

       714
        
                 check = isList;

     

       715
       +
                 merge = {

     

       716
       +
                   __functor =

     

       717
       +
                     self: loc: defs:

     

       718
       +
                     (self.v2 { inherit loc defs; }).value;

     

       719
       +
                   v2 =

     

       720
       +
                     { loc, defs }:

     

       721
       +
                     let

     

       722
       +
                       evals = filter (x: x.optionalValue ? value) (

     

       723
       +
                         concatLists (

     

       724
        
                           imap1 (

     

       725
       +
                             n: def:

     

       726
       +
                             imap1 (

     

       727
       +
                               m: def':

     

       728
       +
                               (mergeDefinitions (loc ++ [ "[definition ${toString n}-entry ${toString m}]" ]) elemType [

     

       729
       +
                                 {

     

       730
       +
                                   inherit (def) file;

     

       731
       +
                                   value = def';

     

       732
       +
                                 }

     

       733
       +
                               ])

     

       734
       +
                             ) def.value

     

       735
       +
                           ) defs

     

       736
       +
                         )

     

       737
       +
                       );

     

       738
       +
                     in

     

       739
       +
                     {

     

       740
       +
                       headError = checkDefsForError check loc defs;

     

       741
       +
                       value = map (x: x.optionalValue.value or x.mergedValue) evals;

     

       742
       +
                       valueMeta.list = map (v: v.checkedAndMerged.valueMeta) evals;

     

       743
       +
                     };

     

       744
       +
                 };

     

       745
        
                 emptyValue = {

     

       746
        
                   value = [ ];

     

       747
        
                 };

     
···

       818
        
                 lazy ? false,

     

       819
        
                 placeholder ? "name",

     

       820
        
               }:

     

       821
       +
               mkOptionType rec {

     

       822
        
                 name = if lazy then "lazyAttrsOf" else "attrsOf";

     

       823
        
                 description =

     

       824
        
                   (if lazy then "lazy attribute set" else "attribute set")

     

       825
        
                   + " of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";

     

       826
        
                 descriptionClass = "composite";

     

       827
        
                 check = isAttrs;

     

       828
       +
                 merge = {

     

       829
       +
                   __functor =

     

       830
       +
                     self: loc: defs:

     

       831
       +
                     (self.v2 { inherit loc defs; }).value;

     

       832
       +
                   v2 =

     

       833
       +
                     { loc, defs }:

     

       834
       +
                     let

     

       835
       +
                       evals =

     

       836
       +
                         if lazy then

     

       837
       +
                           zipAttrsWith (name: defs: mergeDefinitions (loc ++ [ name ]) elemType defs) (pushPositions defs)

     

       838
       +
                         else

     

       839
       +
                           # Filtering makes the merge function more strict

     

       840
       +
                           # Meaning it is less lazy

     

       841
       +
                           filterAttrs (n: v: v.optionalValue ? value) (

     

       842
       +
                             zipAttrsWith (name: defs: mergeDefinitions (loc ++ [ name ]) elemType defs) (pushPositions defs)

     

       843
       +
                           );

     

       844
       +
                     in

     

       845
       +
                     {

     

       846
       +
                       headError = checkDefsForError check loc defs;

     

       847
       +
                       value = mapAttrs (

     

       848
       +
                         n: v:

     

       849
       +
                         if lazy then

     

       850
       +
                           v.optionalValue.value or elemType.emptyValue.value or v.mergedValue

     

       851
       +
                         else

     

       852
       +
                           v.optionalValue.value

     

       853
       +
                       ) evals;

     

       854
       +
                       valueMeta.attrs = mapAttrs (n: v: v.checkedAndMerged.valueMeta) evals;

     

       855
       +
                     };

     

       856
       +
                 };

     

       857
       +
       

     

       858
        
                 emptyValue = {

     

       859
        
                   value = { };

     

       860
        
                 };

     
···

       1236
        
       

     

       1237
        
                 name = "submodule";

     

       1238
        
       

     

       1239
       +
                 check = x: isAttrs x || isFunction x || path.check x;

     

       1240
        
               in

     

       1241
        
               mkOptionType {

     

       1242
        
                 inherit name;

     
···

       1248
        
                       docsEval = base.extendModules { modules = [ noCheckForDocsModule ]; };

     

       1249
        
                     in

     

       1250
        
                     docsEval._module.freeformType.description or name;

     

       1251
       +
                 inherit check;

     

       1252
       +
                 merge = {

     

       1253
       +
                   __functor =

     

       1254
       +
                     self: loc: defs:

     

       1255
       +
                     (self.v2 { inherit loc defs; }).value;

     

       1256
       +
                   v2 =

     

       1257
       +
                     { loc, defs }:

     

       1258
       +
                     let

     

       1259
       +
                       configuration = base.extendModules {

     

       1260
       +
                         modules = [ { _module.args.name = last loc; } ] ++ allModules defs;

     

       1261
       +
                         prefix = loc;

     

       1262
       +
                       };

     

       1263
       +
                     in

     

       1264
       +
                     {

     

       1265
       +
                       headError = checkDefsForError check loc defs;

     

       1266
       +
                       value = configuration.config;

     

       1267
       +
                       valueMeta = { inherit configuration; };

     

       1268
       +
                     };

     

       1269
       +
                 };

     

       1270
        
                 emptyValue = {

     

       1271
        
                   value = { };

     

       1272
        
                 };

     
···

       1414
        
                     }";

     

       1415
        
                 descriptionClass = "conjunction";

     

       1416
        
                 check = x: t1.check x || t2.check x;

     

       1417
       +
                 merge = {

     

       1418
       +
                   __functor =

     

       1419
       +
                     self: loc: defs:

     

       1420
       +
                     (self.v2 { inherit loc defs; }).value;

     

       1421
       +
                   v2 =

     

       1422
       +
                     { loc, defs }:

     

       1423
       +
                     let

     

       1424
       +
                       t1CheckedAndMerged =

     

       1425
       +
                         if t1.merge ? v2 then

     

       1426
       +
                           t1.merge.v2 { inherit loc defs; }

     

       1427
       +
                         else

     

       1428
       +
                           {

     

       1429
       +
                             value = t1.merge loc defs;

     

       1430
       +
                             headError = checkDefsForError t1.check loc defs;

     

       1431
       +
                             valueMeta = { };

     

       1432
       +
                           };

     

       1433
       +
                       t2CheckedAndMerged =

     

       1434
       +
                         if t2.merge ? v2 then

     

       1435
       +
                           t2.merge.v2 { inherit loc defs; }

     

       1436
       +
                         else

     

       1437
       +
                           {

     

       1438
       +
                             value = t2.merge loc defs;

     

       1439
       +
                             headError = checkDefsForError t2.check loc defs;

     

       1440
       +
                             valueMeta = { };

     

       1441
       +
                           };

     

       1442
       +
       

     

       1443
       +
                       checkedAndMerged =

     

       1444
       +
                         if t1CheckedAndMerged.headError == null then

     

       1445
       +
                           t1CheckedAndMerged

     

       1446
       +
                         else if t2CheckedAndMerged.headError == null then

     

       1447
       +
                           t2CheckedAndMerged

     

       1448
       +
                         else

     

       1449
       +
                           rec {

     

       1450
       +
                             valueMeta = {

     

       1451
       +
                               inherit headError;

     

       1452
       +
                             };

     

       1453
       +
                             headError = {

     

       1454
       +
                               message = "The option `${showOption loc}` is neither a value of type `${t1.description}` nor `${t2.description}`, Definition values: ${showDefs defs}";

     

       1455
       +
                             };

     

       1456
       +
                             value = abort "(t.merge.v2 defs).value must only be accessed when `.headError == null`. This is a bug in code that consumes a module system type.";

     

       1457
       +
                           };

     

       1458
       +
                     in

     

       1459
       +
                     checkedAndMerged;

     

       1460
       +
                 };

     

       1461
        
                 typeMerge =

     

       1462
        
                   f':

     

       1463
        
                   let

     
···

       1498
        
                   optionDescriptionPhrase (class: class == "noun") coercedType

     

       1499
        
                 } convertible to it";

     

       1500
        
                 check = x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;

     

       1501
       +
                 merge = {

     

       1502
       +
                   __functor =

     

       1503
       +
                     self: loc: defs:

     

       1504
       +
                     (self.v2 { inherit loc defs; }).value;

     

       1505
       +
                   v2 =

     

       1506
       +
                     { loc, defs }:

     

       1507
       +
                     let

     

       1508
       +
                       finalDefs = (

     

       1509
       +
                         map (

     

       1510
       +
                           def:

     

       1511
       +
                           def

     

       1512
       +
                           // {

     

       1513
       +
                             value =

     

       1514
       +
                               let

     

       1515
       +
                                 merged = coercedType.merge.v2 {

     

       1516
       +
                                   inherit loc;

     

       1517
       +
                                   defs = [ def ];

     

       1518
       +
                                 };

     

       1519
       +
                               in

     

       1520
       +
                               if coercedType.merge ? v2 then

     

       1521
       +
                                 if merged.headError == null then coerceFunc def.value else def.value

     

       1522
       +
                               else if coercedType.check def.value then

     

       1523
       +
                                 coerceFunc def.value

     

       1524
       +
                               else

     

       1525
       +
                                 def.value;

     

       1526
       +
                           }

     

       1527
       +
                         ) defs

     

       1528
       +
                       );

     

       1529
       +
                     in

     

       1530
       +
                     if finalType.merge ? v2 then

     

       1531
       +
                       finalType.merge.v2 {

     

       1532
       +
                         inherit loc;

     

       1533
       +
                         defs = finalDefs;

     

       1534
       +
                       }

     

       1535
       +
                     else

     

       1536
       +
                       {

     

       1537
       +
                         value = finalType.merge loc finalDefs;

     

       1538
       +
                         valueMeta = { };

     

       1539
       +
                         headError = checkDefsForError check loc defs;

     

       1540
       +
                       };

     

       1541
       +
                 };

     

       1542
        
                 emptyValue = finalType.emptyValue;

     

       1543
        
                 getSubOptions = finalType.getSubOptions;

     

       1544
        
                 getSubModules = finalType.getSubModules;

     
···

       1550
        
                 nestedTypes.coercedType = coercedType;

     

       1551
        
                 nestedTypes.finalType = finalType;

     

       1552
        
               };

     

       1553
       +
       

     

       1554
        
             /**

     

       1555
        
               Augment the given type with an additional type check function.

     

       1556
        
       

     
···

       1559
        
               Fixing is not trivial, we appreciate any help!

     

       1560
        
               :::

     

       1561
        
             */

     

       1562
       +
             addCheck =

     

       1563
       +
               elemType: check:

     

       1564
       +
               if elemType.merge ? v2 then

     

       1565
       +
                 elemType

     

       1566
       +
                 // {

     

       1567
       +
                   check = x: elemType.check x && check x;

     

       1568
       +
                   merge = {

     

       1569
       +
                     __functor =

     

       1570
       +
                       self: loc: defs:

     

       1571
       +
                       (self.v2 { inherit loc defs; }).value;

     

       1572
       +
                     v2 =

     

       1573
       +
                       { loc, defs }:

     

       1574
       +
                       let

     

       1575
       +
                         orig = elemType.merge.v2 { inherit loc defs; };

     

       1576
       +
                         headError' = if orig.headError != null then orig.headError else checkDefsForError check loc defs;

     

       1577
       +
                       in

     

       1578
       +
                       orig

     

       1579
       +
                       // {

     

       1580
       +
                         headError = headError';

     

       1581
       +
                       };

     

       1582
       +
                   };

     

       1583
       +
                 }

     

       1584
       +
               else

     

       1585
       +
                 elemType

     

       1586
       +
                 // {

     

       1587
       +
                   check = x: elemType.check x && check x;

     

       1588
       +
                 };

     

       1589
        
           };

     

       1590
        
       

     

       1591
        
           /**

maintainers/maintainer-list.nix

···

       22358
        
           githubId = 2660;

     

       22359
        
           name = "Russell Sim";

     

       22360
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22361
        
         rutherther = {

     

       22362
        
           name = "Rutherther";

     

       22363
        
           email = "rutherther@proton.me";

···

       22358
        
           githubId = 2660;

     

       22359
        
           name = "Russell Sim";

     

       22360
        
         };

     

       22361
       +
         RustyNova = {

     

       22362
       +
           email = "rusty.nova.jsb@gmail.com";

     

       22363
       +
           github = "RustyNova016";

     

       22364
       +
           githubId = 50844553;

     

       22365
       +
           name = "RustyNova";

     

       22366
       +
         };

     

       22367
        
         rutherther = {

     

       22368
        
           name = "Rutherther";

     

       22369
        
           email = "rutherther@proton.me";

-1

maintainers/team-list.nix

···

       421
        
             frlan

     

       422
        
             leona

     

       423
        
             osnyx

     

       424
       -
             ma27

     

       425
        
           ];

     

       426
        
           scope = "Team for Flying Circus employees who collectively maintain packages.";

     

       427
        
           shortName = "Flying Circus employees";

···

       421
        
             frlan

     

       422
        
             leona

     

       423
        
             osnyx

     

       0
        
       
     

       424
        
           ];

     

       425
        
           scope = "Team for Flying Circus employees who collectively maintain packages.";

     

       426
        
           shortName = "Flying Circus employees";

+1 -8

nixos/modules/services/mail/exim.nix

···

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

     

       124
        
             restartTriggers = [ config.environment.etc."exim.conf".source ];

     

       125
        
             serviceConfig = {

     

       0
        
       
     

       126
        
               ExecStart = "!${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}";

     

       127
        
               ExecReload = "!${coreutils}/bin/kill -HUP $MAINPID";

     

       128
        
               User = cfg.user;

     

       129
        
             };

     

       130
       -
             preStart = ''

     

       131
       -
               if ! test -d ${cfg.spoolDir}; then

     

       132
       -
                 ${coreutils}/bin/mkdir -p ${cfg.spoolDir}

     

       133
       -
                 ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.spoolDir}

     

       134
       -
               fi

     

       135
       -
             '';

     

       136
        
           };

     

       137
       -
       

     

       138
        
         };

     

       139
       -
       

     

       140
        
       }

···

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

     

       124
        
             restartTriggers = [ config.environment.etc."exim.conf".source ];

     

       125
        
             serviceConfig = {

     

       126
       +
               ExecStartPre = "+${coreutils}/bin/install --group=${cfg.group} --owner=${cfg.user} --mode=0700 --directory ${cfg.spoolDir}";

     

       127
        
               ExecStart = "!${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}";

     

       128
        
               ExecReload = "!${coreutils}/bin/kill -HUP $MAINPID";

     

       129
        
               User = cfg.user;

     

       130
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       131
        
           };

     

       0
        
       
     

       132
        
         };

     

       0
        
       
     

       133
        
       }

+1 -1

nixos/tests/oci-containers.nix

···

       73
        
           type:

     

       74
        
           makeTest {

     

       75
        
             name = "oci-containers-podman-rootless-${type}";

     

       76
       -
             meta.maintainers = lib.teams.flyingcircus.members;

     

       77
        
             nodes = {

     

       78
        
               podman =

     

       79
        
                 { pkgs, ... }:

···

       73
        
           type:

     

       74
        
           makeTest {

     

       75
        
             name = "oci-containers-podman-rootless-${type}";

     

       76
       +
             meta.maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.ma27 ];

     

       77
        
             nodes = {

     

       78
        
               podman =

     

       79
        
                 { pkgs, ... }:

-1

pkgs/applications/video/mpv/default.nix

···

       314
        
           maintainers = with lib.maintainers; [

     

       315
        
             fpletz

     

       316
        
             globin

     

       317
       -
             ma27

     

       318
        
             SchweGELBin

     

       319
        
           ];

     

       320
        
           platforms = lib.platforms.unix;

···

       314
        
           maintainers = with lib.maintainers; [

     

       315
        
             fpletz

     

       316
        
             globin

     

       0
        
       
     

       317
        
             SchweGELBin

     

       318
        
           ];

     

       319
        
           platforms = lib.platforms.unix;

+14 -1

pkgs/build-support/build-mozilla-mach/default.nix

···

       444
        
           # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator

     

       445
        
           # TODO: Default vm.max_map_count has been increased, retest without this

     

       446
        
           export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so

     

       447
       -
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       448
        
       

     

       449
        
         # firefox has a different definition of configurePlatforms from nixpkgs, see configureFlags

     

       450
        
         configurePlatforms = [ ];

···

       444
        
           # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator

     

       445
        
           # TODO: Default vm.max_map_count has been increased, retest without this

     

       446
        
           export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so

     

       447
       +
         ''

     

       448
       +
         +

     

       449
       +
           # fileport.h was exposed in SDK 15.4 but we have only 15.2 in nixpkgs so far.

     

       450
       +
           lib.optionalString

     

       451
       +
             (

     

       452
       +
               stdenv.hostPlatform.isDarwin

     

       453
       +
               && lib.versionAtLeast version "143"

     

       454
       +
               && lib.versionOlder apple-sdk_15.version "15.4"

     

       455
       +
             )

     

       456
       +
             ''

     

       457
       +
               mkdir -p xnu/sys

     

       458
       +
               cp ${apple-sdk_15.sourceRelease "xnu"}/bsd/sys/fileport.h xnu/sys

     

       459
       +
               export CXXFLAGS="-isystem $(pwd)/xnu"

     

       460
       +
             '';

     

       461
        
       

     

       462
        
         # firefox has a different definition of configurePlatforms from nixpkgs, see configureFlags

     

       463
        
         configurePlatforms = [ ];

-34

pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch

···

       1
       -
       From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001

     

       2
       -
       From: Nicole Patricia Mazzuca <nicole@streganil.no>

     

       3
       -
       Date: Fri, 9 May 2025 09:32:21 +0200

     

       4
       -
       Subject: [PATCH] open: fix opening text/html messages

     

       5
       -
       

     

       6
       -
       This fixes a bug introduced in 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329:

     

       7
       -
       aerc started using `path.Base(<part>)`, which returns `"."` on an empty

     

       8
       -
       path, but still checked for `""` two lines later.

     

       9
       -
       

     

       10
       -
       On macOS, the result is that aerc attempts to open the directory:

     

       11
       -
       

     

       12
       -
       ```

     

       13
       -
       open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory

     

       14
       -
       ```

     

       15
       -
       

     

       16
       -
       Signed-off-by: Nicole Patricia Mazzuca <nicole@streganil.no>

     

       17
       -
       Acked-by: Robin Jarry <robin@jarry.cc>

     

       18
       -
       ---

     

       19
       -
        commands/msgview/open.go | 2 +-

     

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

     

       21
       -
       

     

       22
       -
       diff --git a/commands/msgview/open.go b/commands/msgview/open.go

     

       23
       -
       index a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3..7c770d4a90b771e3a18dfcb327f5e9306d5b5fa7 100644

     

       24
       -
       --- a/commands/msgview/open.go

     

       25
       -
       +++ b/commands/msgview/open.go

     

       26
       -
       @@ -59,7 +59,7 @@ func (o Open) Execute(args []string) error {

     

       27
       -
        		}

     

       28
       -
        		filename := path.Base(part.FileName())

     

       29
       -
        		var tmpFile *os.File

     

       30
       -
       -		if filename == "" {

     

       31
       -
       +		if filename == "." {

     

       32
       -
        			extension := ""

     

       33
       -
        			if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 {

     

       34
       -
        				extension = exts[0]

-41

pkgs/by-name/ae/aerc/basename-temp-file.patch

···

       1
       -
       From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001

     

       2
       -
       From: Robin Jarry <robin@jarry.cc>

     

       3
       -
       Date: Wed, 9 Apr 2025 10:49:24 +0200

     

       4
       -
       Subject: [PATCH] open: only use part basename for temp file

     

       5
       -
       

     

       6
       -
       When an attachment part has a name such as "/tmp/55208186_AllDocs.pdf",

     

       7
       -
       aerc creates a temp folder and tries to store the file by blindly

     

       8
       -
       concatenating the path as follows:

     

       9
       -
       

     

       10
       -
       	/tmp/aerc-3444057757/tmp/55208186_AllDocs.pdf

     

       11
       -
       

     

       12
       -
       And when writing to this path, it gets a "No such file or directory"

     

       13
       -
       error because the intermediate "tmp" subfolder isn't created.

     

       14
       -
       

     

       15
       -
       Reported-by: Erik Colson <eco@ecocode.net>

     

       16
       -
       Signed-off-by: Robin Jarry <robin@jarry.cc>

     

       17
       -
       ---

     

       18
       -
        commands/msgview/open.go | 3 ++-

     

       19
       -
        1 file changed, 2 insertions(+), 1 deletion(-)

     

       20
       -
       

     

       21
       -
       diff --git a/commands/msgview/open.go b/commands/msgview/open.go

     

       22
       -
       index 4293b7e4892c137a7f3fbbe79245ffb6733b2671..a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3 100644

     

       23
       -
       --- a/commands/msgview/open.go

     

       24
       -
       +++ b/commands/msgview/open.go

     

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

     

       26
       -
        	"io"

     

       27
       -
        	"mime"

     

       28
       -
        	"os"

     

       29
       -
       +	"path"

     

       30
       -
        	"path/filepath"

     

       31
       -
        

     

       32
       -
        	"git.sr.ht/~rjarry/aerc/app"

     

       33
       -
       @@ -56,7 +57,7 @@ func (o Open) Execute(args []string) error {

     

       34
       -
        			app.PushError(err.Error())

     

       35
       -
        			return

     

       36
       -
        		}

     

       37
       -
       -		filename := part.FileName()

     

       38
       -
       +		filename := path.Base(part.FileName())

     

       39
       -
        		var tmpFile *os.File

     

       40
       -
        		if filename == "" {

     

       41
       -
        			extension := ""

+4 -11

pkgs/by-name/ae/aerc/package.nix

···

       16
        
       

     

       17
        
       buildGoModule (finalAttrs: {

     

       18
        
         pname = "aerc";

     

       19
       -
         version = "0.20.1";

     

       20
        
       

     

       21
        
         src = fetchFromSourcehut {

     

       22
        
           owner = "~rjarry";

     

       23
        
           repo = "aerc";

     

       24
        
           rev = finalAttrs.version;

     

       25
       -
           hash = "sha256-IBTM3Ersm8yUCgiBLX8ozuvMEbfmY6eW5xvJD20UgRA=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         proxyVendor = true;

     

       29
       -
         vendorHash = "sha256-O1j0J6vCE6rap5/fOTxlUpXAG5mgZf8CfNOB4VOBxms=";

     

       30
        
       

     

       31
        
         nativeBuildInputs = [

     

       32
        
           scdoc

     

       33
        
           python3Packages.wrapPython

     

       34
        
         ];

     

       35
        
       

     

       36
       -
         patches = [

     

       37
       -
           ./runtime-libexec.patch

     

       38
       -
       

     

       39
       -
           # TODO remove these with the next release

     

       40
       -
           # they resolve a path injection vulnerability when saving attachments (CVE-2025-49466)

     

       41
       -
           ./basename-temp-file.patch

     

       42
       -
           ./basename-temp-file-fixup.patch

     

       43
       -
         ];

     

       44
        
       

     

       45
        
         postPatch = ''

     

       46
        
           substituteAllInPlace config/aerc.conf

···

       16
        
       

     

       17
        
       buildGoModule (finalAttrs: {

     

       18
        
         pname = "aerc";

     

       19
       +
         version = "0.21.0";

     

       20
        
       

     

       21
        
         src = fetchFromSourcehut {

     

       22
        
           owner = "~rjarry";

     

       23
        
           repo = "aerc";

     

       24
        
           rev = finalAttrs.version;

     

       25
       +
           hash = "sha256-UBXMAIuB0F7gG0dkpEF/3V4QK6FEbQw2ZLGGmRF884I=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         proxyVendor = true;

     

       29
       +
         vendorHash = "sha256-E/DnfiHoDDNNoaNGZC/nvs8DiJ8F2+H2FzxpU7nK+bE=";

     

       30
        
       

     

       31
        
         nativeBuildInputs = [

     

       32
        
           scdoc

     

       33
        
           python3Packages.wrapPython

     

       34
        
         ];

     

       35
        
       

     

       36
       +
         patches = [ ./runtime-libexec.patch ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
       

     

       38
        
         postPatch = ''

     

       39
        
           substituteAllInPlace config/aerc.conf

+8 -1

pkgs/by-name/al/alistral/package.nix

···

       21
        
       

     

       22
        
         cargoHash = "sha256-TyxeuDMmoRvIVaapA/KstFnARPpPv9h19Bg3/XnwQWs=";

     

       23
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
         nativeBuildInputs = [

     

       25
        
           pkg-config

     

       26
        
         ];

     
···

       39
        
           changelog = "https://github.com/RustyNova016/Alistral/blob/${finalAttrs.src.tag}/CHANGELOG.md";

     

       40
        
           description = "Power tools for Listenbrainz";

     

       41
        
           license = lib.licenses.mit;

     

       42
       -
           maintainers = with lib.maintainers; [ jopejoe1 ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       43
        
           mainProgram = "alistral";

     

       44
        
         };

     

       45
        
       })

···

       21
        
       

     

       22
        
         cargoHash = "sha256-TyxeuDMmoRvIVaapA/KstFnARPpPv9h19Bg3/XnwQWs=";

     

       23
        
       

     

       24
       +
         buildNoDefaultFeatures = true;

     

       25
       +
         # Would be cleaner with an "--all-features" option

     

       26
       +
         buildFeatures = [ "full" ];

     

       27
       +
       

     

       28
        
         nativeBuildInputs = [

     

       29
        
           pkg-config

     

       30
        
         ];

     
···

       43
        
           changelog = "https://github.com/RustyNova016/Alistral/blob/${finalAttrs.src.tag}/CHANGELOG.md";

     

       44
        
           description = "Power tools for Listenbrainz";

     

       45
        
           license = lib.licenses.mit;

     

       46
       +
           maintainers = with lib.maintainers; [

     

       47
       +
             jopejoe1

     

       48
       +
             RustyNova

     

       49
       +
           ];

     

       50
        
           mainProgram = "alistral";

     

       51
        
         };

     

       52
        
       })

+224 -4

pkgs/by-name/am/amp-cli/package-lock.json

···

       5
        
         "packages": {

     

       6
        
           "": {

     

       7
        
             "dependencies": {

     

       8
       -
               "@sourcegraph/amp": "^0.0.1755532879-g2b6e3d"

     

       9
        
             }

     

       10
        
           },

     

       11
        
           "node_modules/@colors/colors": {

     
···

       37
        
               "node": ">= 10"

     

       38
        
             }

     

       39
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
           "node_modules/@sourcegraph/amp": {

     

       41
       -
             "version": "0.0.1755532879-g2b6e3d",

     

       42
       -
             "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1755532879-g2b6e3d.tgz",

     

       43
       -
             "integrity": "sha512-Xv3C/E6KHlq0gpEzMqaK9Fo3QhmvftBH8TcJGk5oGLhxEh/u49kRTifojDNjOh3A3HWneB1/SoYqLplOKn5QFg==",

     

       44
        
             "dependencies": {

     

       0
        
       
     

       45
        
               "ansi-regex": "^6.1.0",

     

       46
        
               "commander": "^11.1.0",

     

       47
        
               "jsonc-parser": "^3.3.1",

···

       5
        
         "packages": {

     

       6
        
           "": {

     

       7
        
             "dependencies": {

     

       8
       +
               "@sourcegraph/amp": "^0.0.1756368086-g6e639d"

     

       9
        
             }

     

       10
        
           },

     

       11
        
           "node_modules/@colors/colors": {

     
···

       37
        
               "node": ">= 10"

     

       38
        
             }

     

       39
        
           },

     

       40
       +
           "node_modules/@napi-rs/keyring": {

     

       41
       +
             "version": "1.1.9",

     

       42
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring/-/keyring-1.1.9.tgz",

     

       43
       +
             "integrity": "sha512-qjg04yaJ/gFqgG7wDqLlWBvZpsjvYDtwL+xOr2vSM2JrhojuIKsw7pH013U7xJOradTVGeQqhwqgZtt2IblgOw==",

     

       44
       +
             "license": "MIT",

     

       45
       +
             "engines": {

     

       46
       +
               "node": ">= 10"

     

       47
       +
             },

     

       48
       +
             "funding": {

     

       49
       +
               "type": "github",

     

       50
       +
               "url": "https://github.com/sponsors/Brooooooklyn"

     

       51
       +
             },

     

       52
       +
             "optionalDependencies": {

     

       53
       +
               "@napi-rs/keyring-darwin-arm64": "1.1.9",

     

       54
       +
               "@napi-rs/keyring-darwin-x64": "1.1.9",

     

       55
       +
               "@napi-rs/keyring-freebsd-x64": "1.1.9",

     

       56
       +
               "@napi-rs/keyring-linux-arm-gnueabihf": "1.1.9",

     

       57
       +
               "@napi-rs/keyring-linux-arm64-gnu": "1.1.9",

     

       58
       +
               "@napi-rs/keyring-linux-arm64-musl": "1.1.9",

     

       59
       +
               "@napi-rs/keyring-linux-riscv64-gnu": "1.1.9",

     

       60
       +
               "@napi-rs/keyring-linux-x64-gnu": "1.1.9",

     

       61
       +
               "@napi-rs/keyring-linux-x64-musl": "1.1.9",

     

       62
       +
               "@napi-rs/keyring-win32-arm64-msvc": "1.1.9",

     

       63
       +
               "@napi-rs/keyring-win32-ia32-msvc": "1.1.9",

     

       64
       +
               "@napi-rs/keyring-win32-x64-msvc": "1.1.9"

     

       65
       +
             }

     

       66
       +
           },

     

       67
       +
           "node_modules/@napi-rs/keyring-darwin-arm64": {

     

       68
       +
             "version": "1.1.9",

     

       69
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-arm64/-/keyring-darwin-arm64-1.1.9.tgz",

     

       70
       +
             "integrity": "sha512-/lVnrSFrut+8pQC6IcqlfHKzcEmf2XvQDOZPB5X4vI23GrNXBd56EuBlFPdTBtx46A8Bn+Aqi6pS8cnprHtcCw==",

     

       71
       +
             "cpu": [

     

       72
       +
               "arm64"

     

       73
       +
             ],

     

       74
       +
             "license": "MIT",

     

       75
       +
             "optional": true,

     

       76
       +
             "os": [

     

       77
       +
               "darwin"

     

       78
       +
             ],

     

       79
       +
             "engines": {

     

       80
       +
               "node": ">= 10"

     

       81
       +
             }

     

       82
       +
           },

     

       83
       +
           "node_modules/@napi-rs/keyring-darwin-x64": {

     

       84
       +
             "version": "1.1.9",

     

       85
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-x64/-/keyring-darwin-x64-1.1.9.tgz",

     

       86
       +
             "integrity": "sha512-G3PiFZTAFTzUnpSB31A/UaPjl48/3sDTLmLxaAZBEk7HcOyBnL31gA1YqhDCO7F2y5sD5TWiFiuID9MyqYOcjw==",

     

       87
       +
             "cpu": [

     

       88
       +
               "x64"

     

       89
       +
             ],

     

       90
       +
             "license": "MIT",

     

       91
       +
             "optional": true,

     

       92
       +
             "os": [

     

       93
       +
               "darwin"

     

       94
       +
             ],

     

       95
       +
             "engines": {

     

       96
       +
               "node": ">= 10"

     

       97
       +
             }

     

       98
       +
           },

     

       99
       +
           "node_modules/@napi-rs/keyring-freebsd-x64": {

     

       100
       +
             "version": "1.1.9",

     

       101
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-freebsd-x64/-/keyring-freebsd-x64-1.1.9.tgz",

     

       102
       +
             "integrity": "sha512-R4XbvRhEzQyOy4yM+SMDgk8BgkLPkIzXGwR6QR0wJ2YrPeBx3F2TrgdHfsIGSn/X5Axg/2UlrCiZVciZ5BmusA==",

     

       103
       +
             "cpu": [

     

       104
       +
               "x64"

     

       105
       +
             ],

     

       106
       +
             "license": "MIT",

     

       107
       +
             "optional": true,

     

       108
       +
             "os": [

     

       109
       +
               "freebsd"

     

       110
       +
             ],

     

       111
       +
             "engines": {

     

       112
       +
               "node": ">= 10"

     

       113
       +
             }

     

       114
       +
           },

     

       115
       +
           "node_modules/@napi-rs/keyring-linux-arm-gnueabihf": {

     

       116
       +
             "version": "1.1.9",

     

       117
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm-gnueabihf/-/keyring-linux-arm-gnueabihf-1.1.9.tgz",

     

       118
       +
             "integrity": "sha512-UrKy110I+zQyBtw4HLVUqZ1jDq11K3PmQIYgWAJNwB5VQOj4IQ63zLxk4V01Jx4bNOJmGNlvHDJUAyh/lC5Yww==",

     

       119
       +
             "cpu": [

     

       120
       +
               "arm"

     

       121
       +
             ],

     

       122
       +
             "license": "MIT",

     

       123
       +
             "optional": true,

     

       124
       +
             "os": [

     

       125
       +
               "linux"

     

       126
       +
             ],

     

       127
       +
             "engines": {

     

       128
       +
               "node": ">= 10"

     

       129
       +
             }

     

       130
       +
           },

     

       131
       +
           "node_modules/@napi-rs/keyring-linux-arm64-gnu": {

     

       132
       +
             "version": "1.1.9",

     

       133
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-gnu/-/keyring-linux-arm64-gnu-1.1.9.tgz",

     

       134
       +
             "integrity": "sha512-yOrhVpNGexDYzybe3dhmHQRPBDjlZPtJDE+eGSi1JwEqYlWDB+4IWjRsetxnO63DhnMFRLeMTdwWghsYrA7VwA==",

     

       135
       +
             "cpu": [

     

       136
       +
               "arm64"

     

       137
       +
             ],

     

       138
       +
             "license": "MIT",

     

       139
       +
             "optional": true,

     

       140
       +
             "os": [

     

       141
       +
               "linux"

     

       142
       +
             ],

     

       143
       +
             "engines": {

     

       144
       +
               "node": ">= 10"

     

       145
       +
             }

     

       146
       +
           },

     

       147
       +
           "node_modules/@napi-rs/keyring-linux-arm64-musl": {

     

       148
       +
             "version": "1.1.9",

     

       149
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-musl/-/keyring-linux-arm64-musl-1.1.9.tgz",

     

       150
       +
             "integrity": "sha512-82EcuzoV/+Dxwi1HHhrEEprN5Ou7OsRKyTJSaRqiVuGvLaQDUhZX/4zXTTh4Pz24m22Q4aoJogafS31w8iKGGw==",

     

       151
       +
             "cpu": [

     

       152
       +
               "arm64"

     

       153
       +
             ],

     

       154
       +
             "license": "MIT",

     

       155
       +
             "optional": true,

     

       156
       +
             "os": [

     

       157
       +
               "linux"

     

       158
       +
             ],

     

       159
       +
             "engines": {

     

       160
       +
               "node": ">= 10"

     

       161
       +
             }

     

       162
       +
           },

     

       163
       +
           "node_modules/@napi-rs/keyring-linux-riscv64-gnu": {

     

       164
       +
             "version": "1.1.9",

     

       165
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-riscv64-gnu/-/keyring-linux-riscv64-gnu-1.1.9.tgz",

     

       166
       +
             "integrity": "sha512-Q1ar7DszC1X8FW6w7Ql7b72GFeAUxkTiOuxXChCFBy7eWCQSDrr52ZLroIowp82RmkQLZebnK+IwSssD2Ntoag==",

     

       167
       +
             "cpu": [

     

       168
       +
               "riscv64"

     

       169
       +
             ],

     

       170
       +
             "license": "MIT",

     

       171
       +
             "optional": true,

     

       172
       +
             "os": [

     

       173
       +
               "linux"

     

       174
       +
             ],

     

       175
       +
             "engines": {

     

       176
       +
               "node": ">= 10"

     

       177
       +
             }

     

       178
       +
           },

     

       179
       +
           "node_modules/@napi-rs/keyring-linux-x64-gnu": {

     

       180
       +
             "version": "1.1.9",

     

       181
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-gnu/-/keyring-linux-x64-gnu-1.1.9.tgz",

     

       182
       +
             "integrity": "sha512-LMvrYt1ho3pEDECssA7ATbcMDgayEUwwSD+UfrC7Hj1+C6dlvipwt5njwUDCno2OeXbjjisCo4CR9fDmXa4sZA==",

     

       183
       +
             "cpu": [

     

       184
       +
               "x64"

     

       185
       +
             ],

     

       186
       +
             "license": "MIT",

     

       187
       +
             "optional": true,

     

       188
       +
             "os": [

     

       189
       +
               "linux"

     

       190
       +
             ],

     

       191
       +
             "engines": {

     

       192
       +
               "node": ">= 10"

     

       193
       +
             }

     

       194
       +
           },

     

       195
       +
           "node_modules/@napi-rs/keyring-linux-x64-musl": {

     

       196
       +
             "version": "1.1.9",

     

       197
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-musl/-/keyring-linux-x64-musl-1.1.9.tgz",

     

       198
       +
             "integrity": "sha512-x2i/TgS2/fM+6LRj1MrtVC580sepz5GcxbSCXpttx2H58uZKBF0vVM9HDPHoKP2w5++fyrA17eltJNYN3Ob46A==",

     

       199
       +
             "cpu": [

     

       200
       +
               "x64"

     

       201
       +
             ],

     

       202
       +
             "license": "MIT",

     

       203
       +
             "optional": true,

     

       204
       +
             "os": [

     

       205
       +
               "linux"

     

       206
       +
             ],

     

       207
       +
             "engines": {

     

       208
       +
               "node": ">= 10"

     

       209
       +
             }

     

       210
       +
           },

     

       211
       +
           "node_modules/@napi-rs/keyring-win32-arm64-msvc": {

     

       212
       +
             "version": "1.1.9",

     

       213
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-arm64-msvc/-/keyring-win32-arm64-msvc-1.1.9.tgz",

     

       214
       +
             "integrity": "sha512-14t6p8CTBNfGzLO5LXqurT+pAOf/ocGjOM/qiG/LW+jPkhyJYBNI9e3HKq3QX+ObbnxVpt4fAY02b4XLt7EWig==",

     

       215
       +
             "cpu": [

     

       216
       +
               "arm64"

     

       217
       +
             ],

     

       218
       +
             "license": "MIT",

     

       219
       +
             "optional": true,

     

       220
       +
             "os": [

     

       221
       +
               "win32"

     

       222
       +
             ],

     

       223
       +
             "engines": {

     

       224
       +
               "node": ">= 10"

     

       225
       +
             }

     

       226
       +
           },

     

       227
       +
           "node_modules/@napi-rs/keyring-win32-ia32-msvc": {

     

       228
       +
             "version": "1.1.9",

     

       229
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-ia32-msvc/-/keyring-win32-ia32-msvc-1.1.9.tgz",

     

       230
       +
             "integrity": "sha512-7+7aXz5op6PtOnWYcK1GYXWQlk2zfpdPt9taLqmCCVpk1g4m3Gw1wyKyQxjrg9clHWdNhdWxhFEA0osDxG8/Eg==",

     

       231
       +
             "cpu": [

     

       232
       +
               "ia32"

     

       233
       +
             ],

     

       234
       +
             "license": "MIT",

     

       235
       +
             "optional": true,

     

       236
       +
             "os": [

     

       237
       +
               "win32"

     

       238
       +
             ],

     

       239
       +
             "engines": {

     

       240
       +
               "node": ">= 10"

     

       241
       +
             }

     

       242
       +
           },

     

       243
       +
           "node_modules/@napi-rs/keyring-win32-x64-msvc": {

     

       244
       +
             "version": "1.1.9",

     

       245
       +
             "resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-x64-msvc/-/keyring-win32-x64-msvc-1.1.9.tgz",

     

       246
       +
             "integrity": "sha512-P1wsSrSqDqvcXLL7yiH2RsO3De65wuEQj1ZjV9s1MHfEP5dIdriNYZfFsRBlOsl32GoK3qFzsuH5DTVviGEHSw==",

     

       247
       +
             "cpu": [

     

       248
       +
               "x64"

     

       249
       +
             ],

     

       250
       +
             "license": "MIT",

     

       251
       +
             "optional": true,

     

       252
       +
             "os": [

     

       253
       +
               "win32"

     

       254
       +
             ],

     

       255
       +
             "engines": {

     

       256
       +
               "node": ">= 10"

     

       257
       +
             }

     

       258
       +
           },

     

       259
        
           "node_modules/@sourcegraph/amp": {

     

       260
       +
             "version": "0.0.1756368086-g6e639d",

     

       261
       +
             "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1756368086-g6e639d.tgz",

     

       262
       +
             "integrity": "sha512-sa+T/xmsz63BmdbVn8oaaq3ZgCiLQXdCO/++JPNjC7OD6UaTWWcvAhJ+Kbb5/XQDG190CMLCtWOrp8kSZK8jcQ==",

     

       263
        
             "dependencies": {

     

       264
       +
               "@napi-rs/keyring": "^1.1.9",

     

       265
        
               "ansi-regex": "^6.1.0",

     

       266
        
               "commander": "^11.1.0",

     

       267
        
               "jsonc-parser": "^3.3.1",

+3 -3

pkgs/by-name/am/amp-cli/package.nix

···

       9
        
       

     

       10
        
       buildNpmPackage (finalAttrs: {

     

       11
        
         pname = "amp-cli";

     

       12
       -
         version = "0.0.1755532879-g2b6e3d";

     

       13
        
       

     

       14
        
         src = fetchzip {

     

       15
        
           url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";

     

       16
       -
           hash = "sha256-i3YZcyaeq8CkMsEKhJg/39/0ijJGym2DcRFsZpBRXe0=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         postPatch = ''

     
···

       45
        
           chmod +x bin/amp-wrapper.js

     

       46
        
         '';

     

       47
        
       

     

       48
       -
         npmDepsHash = "sha256-pZNvuSf9ioiv3UPmtdbXC0RXgtelrBl5ZtW/y/KnSqQ=";

     

       49
        
       

     

       50
        
         propagatedBuildInputs = [

     

       51
        
           ripgrep

···

       9
        
       

     

       10
        
       buildNpmPackage (finalAttrs: {

     

       11
        
         pname = "amp-cli";

     

       12
       +
         version = "0.0.1756368086-g6e639d";

     

       13
        
       

     

       14
        
         src = fetchzip {

     

       15
        
           url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";

     

       16
       +
           hash = "sha256-ekSRtSwoPBL+SKkqqdTnMWZkLfF8SxYcrFPU2hpewC8=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         postPatch = ''

     
···

       45
        
           chmod +x bin/amp-wrapper.js

     

       46
        
         '';

     

       47
        
       

     

       48
       +
         npmDepsHash = "sha256-qQSn1sH1rjbKCEYdWZTgixBS6pe+scMnBofmpUYK7A0=";

     

       49
        
       

     

       50
        
         propagatedBuildInputs = [

     

       51
        
           ripgrep

+4 -4

pkgs/by-name/cr/crosvm/package.nix

···

       21
        
       

     

       22
        
       rustPlatform.buildRustPackage {

     

       23
        
         pname = "crosvm";

     

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

     

       25
        
       

     

       26
        
         src = fetchgit {

     

       27
        
           url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";

     

       28
       -
           rev = "d919101220206d300875464a623b220dddc45fb6";

     

       29
       -
           hash = "sha256-2q8TwBwGsUC7if/lm9yhVJCxZiAqR6JHLZCvlpGqkZ0=";

     

       30
        
           fetchSubmodules = true;

     

       31
        
         };

     

       32
        
       

     

       33
        
         separateDebugInfo = true;

     

       34
        
       

     

       35
       -
         cargoHash = "sha256-k4lVgUNvQ8ySYs33nlyTcUgGxtXpiNEG/cFCAJNpJ+c=";

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

     

       38
        
           pkg-config

···

       21
        
       

     

       22
        
       rustPlatform.buildRustPackage {

     

       23
        
         pname = "crosvm";

     

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

     

       25
        
       

     

       26
        
         src = fetchgit {

     

       27
        
           url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";

     

       28
       +
           rev = "44659aa08a8c89c3dad2e468ff57cdb639c80732";

     

       29
       +
           hash = "sha256-bYTZ1R/WPUUZoxmdreFGaRt9epAI+mcIrEvs5RJPUeA=";

     

       30
        
           fetchSubmodules = true;

     

       31
        
         };

     

       32
        
       

     

       33
        
         separateDebugInfo = true;

     

       34
        
       

     

       35
       +
         cargoHash = "sha256-94m7vl3a35pUKxDlQDPY6Ag5HniZyLZ1+vfcJj7cKhk=";

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

     

       38
        
           pkg-config

+3 -3

pkgs/by-name/cu/cubeb/package.nix

···

       24
        
       

     

       25
        
       stdenv.mkDerivation (finalAttrs: {

     

       26
        
         pname = "cubeb";

     

       27
       -
         version = "0-unstable-2025-08-13";

     

       28
        
       

     

       29
        
         src = fetchFromGitHub {

     

       30
        
           owner = "mozilla";

     

       31
        
           repo = "cubeb";

     

       32
       -
           rev = "46b2f23a2929fc367a8cd07a43975dda1e2ebc69";

     

       33
       -
           hash = "sha256-7Y1Sshr1TXBhuNS/tmbT4UL74TycWZvTVyz1yYSXhbY=";

     

       34
        
         };

     

       35
        
       

     

       36
        
         outputs = [

···

       24
        
       

     

       25
        
       stdenv.mkDerivation (finalAttrs: {

     

       26
        
         pname = "cubeb";

     

       27
       +
         version = "0-unstable-2025-08-21";

     

       28
        
       

     

       29
        
         src = fetchFromGitHub {

     

       30
        
           owner = "mozilla";

     

       31
        
           repo = "cubeb";

     

       32
       +
           rev = "e39320b5b8a558de880d27af6e9cafac01cdc6ba";

     

       33
       +
           hash = "sha256-aSdtaV2/xEYVL/5UXDhYBHYblS1ZZXk8fgBRq6DReX8=";

     

       34
        
         };

     

       35
        
       

     

       36
        
         outputs = [

+2 -2

pkgs/by-name/da/dart-sass/package.nix

···

       23
        
       in

     

       24
        
       buildDartApplication rec {

     

       25
        
         pname = "dart-sass";

     

       26
       -
         version = "1.90.0";

     

       27
        
       

     

       28
        
         src = fetchFromGitHub {

     

       29
        
           owner = "sass";

     

       30
        
           repo = "dart-sass";

     

       31
        
           tag = version;

     

       32
       -
           hash = "sha256-ChHaFjuEhDpx2MVbsNNrFIg7LQ6tY/9BsWSF3MFofN0=";

     

       33
        
         };

     

       34
        
       

     

       35
        
         pubspecLock = lib.importJSON ./pubspec.lock.json;

···

       23
        
       in

     

       24
        
       buildDartApplication rec {

     

       25
        
         pname = "dart-sass";

     

       26
       +
         version = "1.91.0";

     

       27
        
       

     

       28
        
         src = fetchFromGitHub {

     

       29
        
           owner = "sass";

     

       30
        
           repo = "dart-sass";

     

       31
        
           tag = version;

     

       32
       +
           hash = "sha256-a1yFDSvuEy/Xaksx9JgzcSOAigD3u3GDtWAJuB8osys=";

     

       33
        
         };

     

       34
        
       

     

       35
        
         pubspecLock = lib.importJSON ./pubspec.lock.json;

+8 -8

pkgs/by-name/da/dart-sass/pubspec.lock.json

···

       464
        
             "dependency": "transitive",

     

       465
        
             "description": {

     

       466
        
               "name": "petitparser",

     

       467
       -
               "sha256": "9436fe11f82d7cc1642a8671e5aa4149ffa9ae9116e6cf6dd665fc0653e3825c",

     

       468
        
               "url": "https://pub.dev"

     

       469
        
             },

     

       470
        
             "source": "hosted",

     

       471
       -
             "version": "7.0.0"

     

       472
        
           },

     

       473
        
           "pool": {

     

       474
        
             "dependency": "direct main",

     
···

       484
        
             "dependency": "direct main",

     

       485
        
             "description": {

     

       486
        
               "name": "protobuf",

     

       487
       -
               "sha256": "6153efcc92a06910918f3db8231fd2cf828ac81e50ebd87adc8f8a8cb3caff0e",

     

       488
        
               "url": "https://pub.dev"

     

       489
        
             },

     

       490
        
             "source": "hosted",

     

       491
       -
             "version": "4.1.1"

     

       492
        
           },

     

       493
        
           "protoc_plugin": {

     

       494
        
             "dependency": "direct dev",

     
···

       744
        
             "dependency": "direct main",

     

       745
        
             "description": {

     

       746
        
               "name": "watcher",

     

       747
       -
               "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",

     

       748
        
               "url": "https://pub.dev"

     

       749
        
             },

     

       750
        
             "source": "hosted",

     

       751
       -
             "version": "1.1.2"

     

       752
        
           },

     

       753
        
           "web": {

     

       754
        
             "dependency": "transitive",

     
···

       794
        
             "dependency": "transitive",

     

       795
        
             "description": {

     

       796
        
               "name": "xml",

     

       797
       -
               "sha256": "3202a47961c1a0af6097c9f8c1b492d705248ba309e6f7a72410422c05046851",

     

       798
        
               "url": "https://pub.dev"

     

       799
        
             },

     

       800
        
             "source": "hosted",

     

       801
       -
             "version": "6.6.0"

     

       802
        
           },

     

       803
        
           "yaml": {

     

       804
        
             "dependency": "direct dev",

···

       464
        
             "dependency": "transitive",

     

       465
        
             "description": {

     

       466
        
               "name": "petitparser",

     

       467
       +
               "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",

     

       468
        
               "url": "https://pub.dev"

     

       469
        
             },

     

       470
        
             "source": "hosted",

     

       471
       +
             "version": "7.0.1"

     

       472
        
           },

     

       473
        
           "pool": {

     

       474
        
             "dependency": "direct main",

     
···

       484
        
             "dependency": "direct main",

     

       485
        
             "description": {

     

       486
        
               "name": "protobuf",

     

       487
       +
               "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e",

     

       488
        
               "url": "https://pub.dev"

     

       489
        
             },

     

       490
        
             "source": "hosted",

     

       491
       +
             "version": "4.2.0"

     

       492
        
           },

     

       493
        
           "protoc_plugin": {

     

       494
        
             "dependency": "direct dev",

     
···

       744
        
             "dependency": "direct main",

     

       745
        
             "description": {

     

       746
        
               "name": "watcher",

     

       747
       +
               "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",

     

       748
        
               "url": "https://pub.dev"

     

       749
        
             },

     

       750
        
             "source": "hosted",

     

       751
       +
             "version": "1.1.3"

     

       752
        
           },

     

       753
        
           "web": {

     

       754
        
             "dependency": "transitive",

     
···

       794
        
             "dependency": "transitive",

     

       795
        
             "description": {

     

       796
        
               "name": "xml",

     

       797
       +
               "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",

     

       798
        
               "url": "https://pub.dev"

     

       799
        
             },

     

       800
        
             "source": "hosted",

     

       801
       +
             "version": "6.6.1"

     

       802
        
           },

     

       803
        
           "yaml": {

     

       804
        
             "dependency": "direct dev",

+3 -3

pkgs/by-name/dn/dns-collector/package.nix

···

       7
        
       }:

     

       8
        
       buildGoModule (finalAttrs: {

     

       9
        
         pname = "dns-collector";

     

       10
       -
         version = "1.9.0";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "dmachard";

     

       14
        
           repo = "dns-collector";

     

       15
        
           tag = "v${finalAttrs.version}";

     

       16
       -
           hash = "sha256-ebl/edMN45oLV1pN6mCaOSgxSSyAugsBP2sQWbIiPTI=";

     

       17
        
         };

     

       18
        
         subPackages = [ "." ];

     

       19
        
       

     
···

       27
        
           "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"

     

       28
        
         ];

     

       29
        
       

     

       30
       -
         vendorHash = "sha256-Y0LOtyRJWOFAQwfg8roisSer0oCxPiaYICE1FY/SEF8=";

     

       31
        
       

     

       32
        
         passthru.updateScript = nix-update-script { };

     

       33

···

       7
        
       }:

     

       8
        
       buildGoModule (finalAttrs: {

     

       9
        
         pname = "dns-collector";

     

       10
       +
         version = "1.10.0";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "dmachard";

     

       14
        
           repo = "dns-collector";

     

       15
        
           tag = "v${finalAttrs.version}";

     

       16
       +
           hash = "sha256-99mVCuoog9ZkJoCCcUWkRJ2vA0IwftEcsSl6I02Qd4A=";

     

       17
        
         };

     

       18
        
         subPackages = [ "." ];

     

       19
        
       

     
···

       27
        
           "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"

     

       28
        
         ];

     

       29
        
       

     

       30
       +
         vendorHash = "sha256-se4vNVydYFYk07Shb3eRLnVmE82HG36cwFRYCdZiZPM=";

     

       31
        
       

     

       32
        
         passthru.updateScript = nix-update-script { };

     

       33

+3 -3

pkgs/by-name/ea/easytier/package.nix

···

       11
        
       

     

       12
        
       rustPlatform.buildRustPackage rec {

     

       13
        
         pname = "easytier";

     

       14
       -
         version = "2.4.2";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "EasyTier";

     

       18
        
           repo = "EasyTier";

     

       19
        
           tag = "v${version}";

     

       20
       -
           hash = "sha256-N/WOkCaAEtPXJWdZ2452KTQmfFu+tZcH267p3azyntQ=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # remove if rust 1.89 merged

     
···

       28
        
             --replace-fail 'rust-version = "1.89.0"' ""

     

       29
        
         '';

     

       30
        
       

     

       31
       -
         cargoHash = "sha256-Z4Q8ZPXPpA5OHkP2j389a6/Cdn9VmULf8sr1vPTelnw=";

     

       32
        
       

     

       33
        
         nativeBuildInputs = [

     

       34
        
           protobuf

···

       11
        
       

     

       12
        
       rustPlatform.buildRustPackage rec {

     

       13
        
         pname = "easytier";

     

       14
       +
         version = "2.4.3";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "EasyTier";

     

       18
        
           repo = "EasyTier";

     

       19
        
           tag = "v${version}";

     

       20
       +
           hash = "sha256-0TuRNxf8xDhwUjBXJsv7dhgeYjr/voIt+/0tinImUhA=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         # remove if rust 1.89 merged

     
···

       28
        
             --replace-fail 'rust-version = "1.89.0"' ""

     

       29
        
         '';

     

       30
        
       

     

       31
       +
         cargoHash = "sha256-FQC3JD051fEZQO9UriNzJPrxE0QcSQ8p3VTk3tQGPBc=";

     

       32
        
       

     

       33
        
         nativeBuildInputs = [

     

       34
        
           protobuf

+4 -4

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

···

       13
        
       

     

       14
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       15
        
         pname = "firefly-iii-data-importer";

     

       16
       -
         version = "1.7.9";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "firefly-iii";

     

       20
        
           repo = "data-importer";

     

       21
        
           tag = "v${finalAttrs.version}";

     

       22
       -
           hash = "sha256-CKw4FnEJVZHt7W7kxJRjTx0lW3akYap7VVil5cFSJZU=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         buildInputs = [ php84 ];

     
···

       38
        
         composerStrictValidation = true;

     

       39
        
         strictDeps = true;

     

       40
        
       

     

       41
       -
         vendorHash = "sha256-0qfpta3l7KXofzAw7V14KU9mRzPPSoh9435Z+Xj3cqU=";

     

       42
        
       

     

       43
        
         npmDeps = fetchNpmDeps {

     

       44
        
           inherit (finalAttrs) src;

     

       45
        
           name = "${finalAttrs.pname}-npm-deps";

     

       46
       -
           hash = "sha256-hY7QcQiDIJhGJk4X4lQ3qDn9WHwMF+jn2NDkKsHXeHY=";

     

       47
        
         };

     

       48
        
       

     

       49
        
         composerRepository = php84.mkComposerRepository {

···

       13
        
       

     

       14
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       15
        
         pname = "firefly-iii-data-importer";

     

       16
       +
         version = "1.7.10";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "firefly-iii";

     

       20
        
           repo = "data-importer";

     

       21
        
           tag = "v${finalAttrs.version}";

     

       22
       +
           hash = "sha256-6C9ztbmYONhnNPZtZC0dQzU5qM8fqyigPVDKBhO7x8Y=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         buildInputs = [ php84 ];

     
···

       38
        
         composerStrictValidation = true;

     

       39
        
         strictDeps = true;

     

       40
        
       

     

       41
       +
         vendorHash = "sha256-WCh0NeTfunWrh2gur7+2Otcoa3U21ldi4JvualiatG8=";

     

       42
        
       

     

       43
        
         npmDeps = fetchNpmDeps {

     

       44
        
           inherit (finalAttrs) src;

     

       45
        
           name = "${finalAttrs.pname}-npm-deps";

     

       46
       +
           hash = "sha256-NELRAxCnvUNC1LTfktufkcNc/R8gkn6S/jt7VlOWRtg=";

     

       47
        
         };

     

       48
        
       

     

       49
        
         composerRepository = php84.mkComposerRepository {

pkgs/by-name/fr/friture/package.nix

···

       19
        
       

     

       20
        
         postPatch = ''

     

       21
        
           sed -i -e 's/==.*"/"/' -e '/packages=\[/a "friture.playback",' pyproject.toml

     

       0
        
       
     

       22
        
         '';

     

       23
        
       

     

       24
        
         nativeBuildInputs =

···

       19
        
       

     

       20
        
         postPatch = ''

     

       21
        
           sed -i -e 's/==.*"/"/' -e '/packages=\[/a "friture.playback",' pyproject.toml

     

       22
       +
           sed -i -e 's/tostring/tobytes/' friture/spectrogram_image.py

     

       23
        
         '';

     

       24
        
       

     

       25
        
         nativeBuildInputs =

+4 -4

pkgs/by-name/ho/homebox/package.nix

···

       11
        
       }:

     

       12
        
       let

     

       13
        
         pname = "homebox";

     

       14
       -
         version = "0.20.2";

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "sysadminsmedia";

     

       17
        
           repo = "homebox";

     

       18
        
           tag = "v${version}";

     

       19
       -
           hash = "sha256-6AJYC5SIITLBgYOq8TdwxAvRcyg8MOoA7WUDar9jSxM=";

     

       20
        
         };

     

       21
        
       in

     

       22
        
       buildGoModule {

     

       23
        
         inherit pname version src;

     

       24
        
       

     

       25
       -
         vendorHash = "sha256-GTSFpfql0ebXtZC3LeIZo8VbCZdsbemNK5EarDTRAf0=";

     

       26
        
         modRoot = "backend";

     

       27
        
         # the goModules derivation inherits our buildInputs and buildPhases

     

       28
        
         # Since we do pnpm thing in those it fails if we don't explicitly remove them

     
···

       39
        
           inherit pname version;

     

       40
        
           src = "${src}/frontend";

     

       41
        
           fetcherVersion = 1;

     

       42
       -
           hash = "sha256-gHQ8Evo31SFmnBHtLDY5j5zZwwVS4fmkT+9VHZJWhfs=";

     

       43
        
         };

     

       44
        
         pnpmRoot = "../frontend";

     

       45

···

       11
        
       }:

     

       12
        
       let

     

       13
        
         pname = "homebox";

     

       14
       +
         version = "0.21.0";

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "sysadminsmedia";

     

       17
        
           repo = "homebox";

     

       18
        
           tag = "v${version}";

     

       19
       +
           hash = "sha256-JA0LawQHWLCJQno1GsajVSsLG3GGgDp2ttIa2xELX48=";

     

       20
        
         };

     

       21
        
       in

     

       22
        
       buildGoModule {

     

       23
        
         inherit pname version src;

     

       24
        
       

     

       25
       +
         vendorHash = "sha256-fklNsQEqAjbiaAwTAh5H3eeANkNRDVRuJZ8ithJsfZs=";

     

       26
        
         modRoot = "backend";

     

       27
        
         # the goModules derivation inherits our buildInputs and buildPhases

     

       28
        
         # Since we do pnpm thing in those it fails if we don't explicitly remove them

     
···

       39
        
           inherit pname version;

     

       40
        
           src = "${src}/frontend";

     

       41
        
           fetcherVersion = 1;

     

       42
       +
           hash = "sha256-gHx4HydL33i1SqzG1PChnlWdlO5NFa5F/R5Yq3mS4ng=";

     

       43
        
         };

     

       44
        
         pnpmRoot = "../frontend";

     

       45

+4 -14

pkgs/by-name/hu/hurl/package.nix

···

       2
        
         lib,

     

       3
        
         rustPlatform,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         fetchpatch2,

     

       6
        
         pkg-config,

     

       7
        
         installShellFiles,

     

       8
        
         libxml2,

     
···

       13
        
       

     

       14
        
       rustPlatform.buildRustPackage rec {

     

       15
        
         pname = "hurl";

     

       16
       -
         version = "6.1.1";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "Orange-OpenSource";

     

       20
        
           repo = "hurl";

     

       21
        
           tag = version;

     

       22
       -
           hash = "sha256-NtvBw8Nb2eZN0rjVL/LPyIdY5hBJGnz/cDun6VvwYZE=";

     

       23
        
         };

     

       24
        
       

     

       25
       -
         cargoHash = "sha256-WyNActmsHpr5fgN1a3X9ApEACWFVJMVoi4fBvKhGgZ0=";

     

       26
       -
       

     

       27
       -
         patches = [

     

       28
       -
           # Fix build with libxml-2.14, remove after next hurl release

     

       29
       -
           # https://github.com/Orange-OpenSource/hurl/pull/3977

     

       30
       -
           (fetchpatch2 {

     

       31
       -
             name = "fix-libxml_2_14";

     

       32
       -
             url = "https://github.com/Orange-OpenSource/hurl/commit/7c7b410c3017aeab0dfc74a6144e4cb8e186a10a.patch?full_index=1";

     

       33
       -
             hash = "sha256-XjnCRIMwzfgUMIhm6pQ90pzA+c2U0EuhyvLUZDsI2GI=";

     

       34
       -
           })

     

       35
       -
         ];

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

     

       38
        
           pkg-config

     

       39
        
           installShellFiles

     

       0
        
       
     

       40
        
         ];

     

       41
        
       

     

       42
        
         buildInputs = [

···

       2
        
         lib,

     

       3
        
         rustPlatform,

     

       4
        
         fetchFromGitHub,

     

       0
        
       
     

       5
        
         pkg-config,

     

       6
        
         installShellFiles,

     

       7
        
         libxml2,

     
···

       12
        
       

     

       13
        
       rustPlatform.buildRustPackage rec {

     

       14
        
         pname = "hurl";

     

       15
       +
         version = "7.0.0";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "Orange-OpenSource";

     

       19
        
           repo = "hurl";

     

       20
        
           tag = version;

     

       21
       +
           hash = "sha256-dmPXI2RHEi/wcdVVwBRtBgNXyBXFnm44236pqYjxgBs=";

     

       22
        
         };

     

       23
        
       

     

       24
       +
         cargoHash = "sha256-1bZaSdMJe39cDEOoqW82zS5NvOlZDGe1ia56BjXddyc=";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
        
         nativeBuildInputs = [

     

       27
        
           pkg-config

     

       28
        
           installShellFiles

     

       29
       +
           rustPlatform.bindgenHook

     

       30
        
         ];

     

       31
        
       

     

       32
        
         buildInputs = [

+2 -2

pkgs/by-name/hw/hwloc/package.nix

···

       18
        
       

     

       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
        
         pname = "hwloc";

     

       21
       -
         version = "2.12.1";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "open-mpi";

     

       25
        
           repo = "hwloc";

     

       26
        
           tag = "hwloc-${finalAttrs.version}";

     

       27
       -
           hash = "sha256-MM0xDysXv4eayi+y2YIP9CMohPe7gfvhltYUxuApRow=";

     

       28
        
         };

     

       29
        
       

     

       30
        
         configureFlags = [

···

       18
        
       

     

       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
        
         pname = "hwloc";

     

       21
       +
         version = "2.12.2";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "open-mpi";

     

       25
        
           repo = "hwloc";

     

       26
        
           tag = "hwloc-${finalAttrs.version}";

     

       27
       +
           hash = "sha256-xLrhffz6pDSjkvAsPWSM3m8OxMV14/6kUgWOlI2u6go=";

     

       28
        
         };

     

       29
        
       

     

       30
        
         configureFlags = [

+3 -3

pkgs/by-name/kd/kdlfmt/package.nix

···

       10
        
       

     

       11
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       12
        
         pname = "kdlfmt";

     

       13
       -
         version = "0.1.2";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "hougesen";

     

       17
        
           repo = "kdlfmt";

     

       18
        
           tag = "v${finalAttrs.version}";

     

       19
       -
           hash = "sha256-xDv93cxCEaBybexleyTtcCCKHy2OL3z/BG2gJ7uqIrU=";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         cargoHash = "sha256-TwZ/0G3lTCoj01e/qGFRxJCfe4spOpG/55GKhoI0img=";

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ installShellFiles ];

     

       25

···

       10
        
       

     

       11
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       12
        
         pname = "kdlfmt";

     

       13
       +
         version = "0.1.3";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "hougesen";

     

       17
        
           repo = "kdlfmt";

     

       18
        
           tag = "v${finalAttrs.version}";

     

       19
       +
           hash = "sha256-D/fv6dS17DUYGSKW4nGUdqxTQ68tOdZkSlvNbfV9lY0=";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         cargoHash = "sha256-78AVptP4+2LHEDhn0VWp4xVIT2QzEo9B4lp6h65OamY=";

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ installShellFiles ];

     

       25

+2 -2

pkgs/by-name/ke/kea/package.nix

···

       29
        
       

     

       30
        
       stdenv.mkDerivation (finalAttrs: {

     

       31
        
         pname = "kea";

     

       32
       -
         version = "3.0.0"; # only even minor versions are stable

     

       33
        
       

     

       34
        
         src = fetchurl {

     

       35
        
           url = "https://ftp.isc.org/isc/kea/${finalAttrs.version}/kea-${finalAttrs.version}.tar.xz";

     

       36
       -
           hash = "sha256-v5Y9HhCVHYxXDGBCr8zyfHCdReA4E70mOde7HPxP7nY=";

     

       37
        
         };

     

       38
        
       

     

       39
        
         patches = [

···

       29
        
       

     

       30
        
       stdenv.mkDerivation (finalAttrs: {

     

       31
        
         pname = "kea";

     

       32
       +
         version = "3.0.1"; # only even minor versions are stable

     

       33
        
       

     

       34
        
         src = fetchurl {

     

       35
        
           url = "https://ftp.isc.org/isc/kea/${finalAttrs.version}/kea-${finalAttrs.version}.tar.xz";

     

       36
       +
           hash = "sha256-7IT+xLt/a50VqC51Wlcek0jrTW+8Yrs/bxKWzXokxWY=";

     

       37
        
         };

     

       38
        
       

     

       39
        
         patches = [

+2 -2

pkgs/by-name/mf/mfaktc/package.nix

···

       9
        
       

     

       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
        
         pname = "mfaktc";

     

       12
       -
         version = "0.23.5";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "primesearch";

     

       16
        
           repo = "mfaktc";

     

       17
        
           tag = "${finalAttrs.version}";

     

       18
        
           fetchSubmodules = true;

     

       19
       -
           hash = "sha256-NUcRd+WvmRjXC7rfOKFw4mue7V9oobsy/OTHHEoaiHo=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         enableParallelBuilding = true;

···

       9
        
       

     

       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
        
         pname = "mfaktc";

     

       12
       +
         version = "0.23.6";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "primesearch";

     

       16
        
           repo = "mfaktc";

     

       17
        
           tag = "${finalAttrs.version}";

     

       18
        
           fetchSubmodules = true;

     

       19
       +
           hash = "sha256-+oO2zMGxcnkEUlD1q5Sy79aXp7BtGTTsvbKjPqBt7sw=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         enableParallelBuilding = true;

+3 -3

pkgs/by-name/mo/models-dev/package.nix

···

       17
        
       in

     

       18
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       19
        
         pname = "models-dev";

     

       20
       -
         version = "0-unstable-2025-08-26";

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "sst";

     

       23
        
           repo = "models.dev";

     

       24
       -
           rev = "cf6249c3930608772771c160b5a177c6bcff5801";

     

       25
       -
           hash = "sha256-yZA8LsMMvTs/wYW2lO7hl7/79WSk+jL87FMKAcC7/AE=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         node_modules = stdenvNoCC.mkDerivation {

···

       17
        
       in

     

       18
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       19
        
         pname = "models-dev";

     

       20
       +
         version = "0-unstable-2025-08-27";

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "sst";

     

       23
        
           repo = "models.dev";

     

       24
       +
           rev = "58cb8fe59ed6c1cbd64ae27a401286bd7cb39f23";

     

       25
       +
           hash = "sha256-jGMZvpcpuW2ALGYkYF67HO7sV/XivWXPBqOedGazCAs=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         node_modules = stdenvNoCC.mkDerivation {

+2 -2

pkgs/by-name/os/osqp-eigen/package.nix

···

       11
        
       

     

       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
        
         pname = "osqp-eigen";

     

       14
       -
         version = "0.10.2";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "robotology";

     

       18
        
           repo = "osqp-eigen";

     

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

     

       20
       -
           hash = "sha256-kK3Le8BSh81LbzjUaV6bQu2S9FfvpnC2NpM0ICfrr9c=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         cmakeFlags = [

···

       11
        
       

     

       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
        
         pname = "osqp-eigen";

     

       14
       +
         version = "0.10.3";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "robotology";

     

       18
        
           repo = "osqp-eigen";

     

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

     

       20
       +
           hash = "sha256-2H7B+e6/AUjAxMmRe2OEBImV/FOBxv9tZQLoEg7mmGg=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         cmakeFlags = [

+2 -4

pkgs/by-name/pl/planify/package.nix

···

       22
        
         libportal-gtk4,

     

       23
        
         libsecret,

     

       24
        
         libsoup_3,

     

       25
       -
         pantheon,

     

       26
        
         sqlite,

     

       27
        
         webkitgtk_6_0,

     

       28
        
       }:

     

       29
        
       

     

       30
        
       stdenv.mkDerivation rec {

     

       31
        
         pname = "planify";

     

       32
       -
         version = "4.13.2";

     

       33
        
       

     

       34
        
         src = fetchFromGitHub {

     

       35
        
           owner = "alainm23";

     

       36
        
           repo = "planify";

     

       37
        
           rev = version;

     

       38
       -
           hash = "sha256-bQ7kKUdInf6ZYO0X6kwW0HbuciiXhGyAdvnPcT0MllM=";

     

       39
        
         };

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

     
···

       64
        
           libportal-gtk4

     

       65
        
           libsecret

     

       66
        
           libsoup_3

     

       67
       -
           pantheon.granite7

     

       68
        
           sqlite

     

       69
        
           webkitgtk_6_0

     

       70
        
         ];

···

       22
        
         libportal-gtk4,

     

       23
        
         libsecret,

     

       24
        
         libsoup_3,

     

       0
        
       
     

       25
        
         sqlite,

     

       26
        
         webkitgtk_6_0,

     

       27
        
       }:

     

       28
        
       

     

       29
        
       stdenv.mkDerivation rec {

     

       30
        
         pname = "planify";

     

       31
       +
         version = "4.13.4";

     

       32
        
       

     

       33
        
         src = fetchFromGitHub {

     

       34
        
           owner = "alainm23";

     

       35
        
           repo = "planify";

     

       36
        
           rev = version;

     

       37
       +
           hash = "sha256-lHjMOpCr6ya0k5NMaiZW7jz0EGVUEADA7od87W8DcT8=";

     

       38
        
         };

     

       39
        
       

     

       40
        
         nativeBuildInputs = [

     
···

       63
        
           libportal-gtk4

     

       64
        
           libsecret

     

       65
        
           libsoup_3

     

       0
        
       
     

       66
        
           sqlite

     

       67
        
           webkitgtk_6_0

     

       68
        
         ];

+3 -3

pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix

···

       7
        
       

     

       8
        
       stdenvNoCC.mkDerivation {

     

       9
        
         pname = "roddhjav-apparmor-rules";

     

       10
       -
         version = "0-unstable-2025-08-15";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "roddhjav";

     

       14
        
           repo = "apparmor.d";

     

       15
       -
           rev = "b0c661931af5b376f79d1dadff684e3d165b4f64";

     

       16
       -
           hash = "sha256-+FabuUU/OUiVks7rIGcpRUC8Ngh5GMevkuDj5kvdaPg=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         dontConfigure = true;

···

       7
        
       

     

       8
        
       stdenvNoCC.mkDerivation {

     

       9
        
         pname = "roddhjav-apparmor-rules";

     

       10
       +
         version = "0-unstable-2025-08-25";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "roddhjav";

     

       14
        
           repo = "apparmor.d";

     

       15
       +
           rev = "7ecc84d3b0e13f5d346a906dceda14321fddae1a";

     

       16
       +
           hash = "sha256-XOatGZxhlcd1JXYJzgye/2Dok+Jmppj4cJuiYy6uhxc=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         dontConfigure = true;

+4 -4

pkgs/by-name/sc/scion-apps/package.nix

···

       7
        
       

     

       8
        
       buildGoModule {

     

       9
        
         pname = "scion-apps";

     

       10
       -
         version = "unstable-2024-04-05";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "netsec-ethz";

     

       14
        
           repo = "scion-apps";

     

       15
       -
           rev = "cb0dc365082788bcc896f0b55c4807b72c2ac338";

     

       16
       -
           hash = "sha256-RzWtnUpZfwryOfumgXHV5QMceLY51Zv3KI0K6WLz8rs=";

     

       17
        
         };

     

       18
        
       

     

       19
       -
         vendorHash = "sha256-bz4vtELxrDfebk+00w9AcEiK/4skO1mE3lBDU1GkOrk=";

     

       20
        
       

     

       21
        
         postPatch = ''

     

       22
        
           substituteInPlace webapp/web/tests/health/scmpcheck.sh \

···

       7
        
       

     

       8
        
       buildGoModule {

     

       9
        
         pname = "scion-apps";

     

       10
       +
         version = "unstable-2025-03-12";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "netsec-ethz";

     

       14
        
           repo = "scion-apps";

     

       15
       +
           rev = "55667b489898af09ae9d8290410da0be176549f9";

     

       16
       +
           hash = "sha256-Tj0vtdYDmKbMpcO+t9KrtFewqdjusr0JRXpX6gY69WM=";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         vendorHash = "sha256-om6ArtnKC9Gm5BdAqW57BnE0BsOmSPAAIPDDrQ5ZmJA=";

     

       20
        
       

     

       21
        
         postPatch = ''

     

       22
        
           substituteInPlace webapp/web/tests/health/scmpcheck.sh \

+5 -5

pkgs/by-name/tr/trilium-desktop/package.nix

···

       15
        
       

     

       16
        
       let

     

       17
        
         pname = "trilium-desktop";

     

       18
       -
         version = "0.98.0";

     

       19
        
       

     

       20
        
         triliumSource = os: arch: hash: {

     

       21
        
           url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";

     
···

       26
        
         darwinSource = triliumSource "macos";

     

       27
        
       

     

       28
        
         # exposed like this for update.sh

     

       29
       -
         x86_64-linux.hash = "sha256-GrREVY6P9L0ymH6QbXdtOm3mNzFD3u8HAOWDI7/x1VU=";

     

       30
       -
         aarch64-linux.hash = "sha256-bLeU2REsKuVRei3WujGJEponiCZAviE8WyofWu2/NPg=";

     

       31
       -
         x86_64-darwin.hash = "sha256-pN+6HapDxL/anMQJ2JeGmtBcRrlLMzJlEpSTo9QBbpg=";

     

       32
       -
         aarch64-darwin.hash = "sha256-9y8NDrwiz9ql1Ia2F0UYF0XWBCyCahHZaAPOsvIJ5l0=";

     

       33
        
       

     

       34
        
         sources = {

     

       35
        
           x86_64-linux = linuxSource "x64" x86_64-linux.hash;

···

       15
        
       

     

       16
        
       let

     

       17
        
         pname = "trilium-desktop";

     

       18
       +
         version = "0.98.1";

     

       19
        
       

     

       20
        
         triliumSource = os: arch: hash: {

     

       21
        
           url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";

     
···

       26
        
         darwinSource = triliumSource "macos";

     

       27
        
       

     

       28
        
         # exposed like this for update.sh

     

       29
       +
         x86_64-linux.hash = "sha256-e8duXDIODrU3eYuZvUcOoT8pAquRIOQ1aUtceY49s+s=";

     

       30
       +
         aarch64-linux.hash = "sha256-HtNzzlnqApwt04R9W6cby8J/0xuYdUX2kMN4vBNKeiQ=";

     

       31
       +
         x86_64-darwin.hash = "sha256-guM1FmDD+J0oBEH+hCzXBkrF0bzvyp5yvCeIO7mGcJg=";

     

       32
       +
         aarch64-darwin.hash = "sha256-fHgPbJS4ZraqowkjPdDg0BbPiI+4dk9JpMSDKASl8wE=";

     

       33
        
       

     

       34
        
         sources = {

     

       35
        
           x86_64-linux = linuxSource "x64" x86_64-linux.hash;

+3 -3

pkgs/by-name/tr/trilium-server/package.nix

···

       7
        
       }:

     

       8
        
       

     

       9
        
       let

     

       10
       -
         version = "0.98.0";

     

       11
        
       

     

       12
        
         serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";

     

       13
       -
         serverSource_x64.hash = "sha256-m5QDm8XOFi5Blbif044WMm/yyRrJx5t9/LjSto/gSL0=";

     

       14
        
         serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";

     

       15
       -
         serverSource_arm64.hash = "sha256-1pdQEJIOxDU05z+31gNpsb9K4BpJ3njNsqxJymfD4wg=";

     

       16
        
       

     

       17
        
         serverSource =

     

       18
        
           if stdenv.hostPlatform.isx86_64 then

···

       7
        
       }:

     

       8
        
       

     

       9
        
       let

     

       10
       +
         version = "0.98.1";

     

       11
        
       

     

       12
        
         serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";

     

       13
       +
         serverSource_x64.hash = "sha256-Ipl9mEDj6Wgzl31WonH4nouCoYs1lLgdxRAJr6I8l9c=";

     

       14
        
         serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";

     

       15
       +
         serverSource_arm64.hash = "sha256-XssGT2F1Idv7ICuTjJTAUYyors8ml50EXiOTHeA8KOw=";

     

       16
        
       

     

       17
        
         serverSource =

     

       18
        
           if stdenv.hostPlatform.isx86_64 then

+2 -2

pkgs/by-name/wa/waymore/package.nix

···

       8
        
       

     

       9
        
       python3Packages.buildPythonApplication rec {

     

       10
        
         pname = "waymore";

     

       11
       -
         version = "4.7";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "xnl-h4ck3r";

     

       16
        
           repo = "waymore";

     

       17
        
           tag = "v${version}";

     

       18
       -
           hash = "sha256-oaswuXQPdAl2XExwEWnSN15roqNj9OVUr1Y1vsX461o=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         preBuild = ''

···

       8
        
       

     

       9
        
       python3Packages.buildPythonApplication rec {

     

       10
        
         pname = "waymore";

     

       11
       +
         version = "6.1";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "xnl-h4ck3r";

     

       16
        
           repo = "waymore";

     

       17
        
           tag = "v${version}";

     

       18
       +
           hash = "sha256-eoq1F6P3ZMb+O+SYmVhV3JHJMNbfcdyCnn4wy17RBv0=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         preBuild = ''

+1 -1

pkgs/by-name/wi/wiki-js/package.nix

···

       44
        
           homepage = "https://js.wiki/";

     

       45
        
           description = "Modern and powerful wiki app built on Node.js";

     

       46
        
           license = licenses.agpl3Only;

     

       47
       -
           maintainers = with maintainers; [ ma27 ];

     

       48
        
         };

     

       49
        
       }

···

       44
        
           homepage = "https://js.wiki/";

     

       45
        
           description = "Modern and powerful wiki app built on Node.js";

     

       46
        
           license = licenses.agpl3Only;

     

       47
       +
           maintainers = with maintainers; [ ];

     

       48
        
         };

     

       49
        
       }

+2 -2

pkgs/by-name/xf/xfsprogs/package.nix

···

       16
        
       

     

       17
        
       stdenv.mkDerivation rec {

     

       18
        
         pname = "xfsprogs";

     

       19
       -
         version = "6.15.0";

     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
        
           url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

     

       23
       -
           hash = "sha256-E7kfdL7vitERN/fZ1xBVVz2R6WG8VbsCRZVvabhM1wQ=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         outputs = [

···

       16
        
       

     

       17
        
       stdenv.mkDerivation rec {

     

       18
        
         pname = "xfsprogs";

     

       19
       +
         version = "6.16.0";

     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
        
           url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

     

       23
       +
           hash = "sha256-+nuow1y5iOfWW352MP6dDhfo15eZ07mNt+GfK5sVBQY=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         outputs = [

+4 -1

pkgs/development/beam-modules/build-mix.nix

···

       25
        
         meta ? { },

     

       26
        
         enableDebugInfo ? false,

     

       27
        
         mixEnv ? "prod",

     

       0
        
       
     

       28
        
         removeConfig ? true,

     

       29
        
         # A config directory that is considered for all the dependencies of an app, typically in $src/config/

     

       30
        
         # This was initially added, as some of Mobilizon's dependencies need to access the config at build time.

     
···

       51
        
               inherit version src;

     

       52
        
       

     

       53
        
               MIX_ENV = mixEnv;

     

       0
        
       
     

       0
        
       
     

       54
        
               MIX_DEBUG = if enableDebugInfo then 1 else 0;

     

       55
        
               HEX_OFFLINE = 1;

     

       56
        
       

     
···

       122
        
       

     

       123
        
                   # Some packages like db_connection will use _build/shared instead of

     

       124
        
                   # honoring the $MIX_ENV variable.

     

       125
       -
                   for reldir in _build/{$MIX_ENV,shared}/lib/${name}/{src,ebin,priv,include} ; do

     

       126
        
                     if test -d $reldir ; then

     

       127
        
                       # Some builds produce symlinks (eg: phoenix priv dircetory). They must

     

       128
        
                       # be followed with -H flag.

···

       25
        
         meta ? { },

     

       26
        
         enableDebugInfo ? false,

     

       27
        
         mixEnv ? "prod",

     

       28
       +
         mixTarget ? "host",

     

       29
        
         removeConfig ? true,

     

       30
        
         # A config directory that is considered for all the dependencies of an app, typically in $src/config/

     

       31
        
         # This was initially added, as some of Mobilizon's dependencies need to access the config at build time.

     
···

       52
        
               inherit version src;

     

       53
        
       

     

       54
        
               MIX_ENV = mixEnv;

     

       55
       +
               MIX_TARGET = mixTarget;

     

       56
       +
               MIX_BUILD_PREFIX = (if mixTarget == "host" then "" else "${mixTarget}_") + "${mixEnv}";

     

       57
        
               MIX_DEBUG = if enableDebugInfo then 1 else 0;

     

       58
        
               HEX_OFFLINE = 1;

     

       59
        
       

     
···

       125
        
       

     

       126
        
                   # Some packages like db_connection will use _build/shared instead of

     

       127
        
                   # honoring the $MIX_ENV variable.

     

       128
       +
                   for reldir in _build/{$MIX_BUILD_PREFIX,shared}/lib/${name}/{src,ebin,priv,include} ; do

     

       129
        
                     if test -d $reldir ; then

     

       130
        
                       # Some builds produce symlinks (eg: phoenix priv dircetory). They must

     

       131
        
                       # be followed with -H flag.

pkgs/development/beam-modules/fetch-mix-deps.nix

···

       16
        
         sha256 ? "",

     

       17
        
         src,

     

       18
        
         mixEnv ? "prod",

     

       0
        
       
     

       19
        
         debug ? false,

     

       20
        
         meta ? { },

     

       21
        
         patches ? [ ],

     
···

       53
        
           ];

     

       54
        
       

     

       55
        
           MIX_ENV = mixEnv;

     

       0
        
       
     

       56
        
           MIX_DEBUG = if debug then 1 else 0;

     

       57
        
           DEBUG = if debug then 1 else 0; # for rebar3

     

       58
        
           # the api with `mix local.rebar rebar path` makes a copy of the binary

···

       16
        
         sha256 ? "",

     

       17
        
         src,

     

       18
        
         mixEnv ? "prod",

     

       19
       +
         mixTarget ? "host",

     

       20
        
         debug ? false,

     

       21
        
         meta ? { },

     

       22
        
         patches ? [ ],

     
···

       54
        
           ];

     

       55
        
       

     

       56
        
           MIX_ENV = mixEnv;

     

       57
       +
           MIX_TARGET = mixTarget;

     

       58
        
           MIX_DEBUG = if debug then 1 else 0;

     

       59
        
           DEBUG = if debug then 1 else 0; # for rebar3

     

       60
        
           # the api with `mix local.rebar rebar path` makes a copy of the binary

+2 -2

pkgs/development/beam-modules/mix-configure-hook.sh

···

       2
        
       # this hook will symlink all dependencies found in ERL_LIBS

     

       3
        
       # since Elixir 1.12.2 elixir does not look into ERL_LIBS for

     

       4
        
       # elixir depencencies anymore, so those have to be symlinked to the _build directory

     

       5
       -
       mkdir -p _build/"$MIX_ENV"/lib

     

       6
        
       while read -r -d ':' lib; do

     

       7
        
           for dir in "$lib"/*; do

     

       8
        
           # Strip version number for directory name if it exists, so naming of

     

       9
        
           # all libs matches what mix's expectation.

     

       10
        
           dest=$(basename "$dir" | cut -d '-' -f1)

     

       11
       -
           build_dir="_build/$MIX_ENV/lib/$dest"

     

       12
        
           ((MIX_DEBUG == 1)) && echo "Linking $dir to $build_dir"

     

       13
        
           # Symlink libs to _build so that mix can find them when compiling.

     

       14
        
           # This is what allows mix to compile the package without searching

···

       2
        
       # this hook will symlink all dependencies found in ERL_LIBS

     

       3
        
       # since Elixir 1.12.2 elixir does not look into ERL_LIBS for

     

       4
        
       # elixir depencencies anymore, so those have to be symlinked to the _build directory

     

       5
       +
       mkdir -p _build/"$MIX_BUILD_PREFIX"/lib

     

       6
        
       while read -r -d ':' lib; do

     

       7
        
           for dir in "$lib"/*; do

     

       8
        
           # Strip version number for directory name if it exists, so naming of

     

       9
        
           # all libs matches what mix's expectation.

     

       10
        
           dest=$(basename "$dir" | cut -d '-' -f1)

     

       11
       +
           build_dir="_build/$MIX_BUILD_PREFIX/lib/$dest"

     

       12
        
           ((MIX_DEBUG == 1)) && echo "Linking $dir to $build_dir"

     

       13
        
           # Symlink libs to _build so that mix can find them when compiling.

     

       14
        
           # This is what allows mix to compile the package without searching

pkgs/development/beam-modules/mix-release.nix

···

       27
        
         meta ? { },

     

       28
        
         enableDebugInfo ? false,

     

       29
        
         mixEnv ? "prod",

     

       0
        
       
     

       30
        
         compileFlags ? [ ],

     

       31
        
         # Build a particular named release.

     

       32
        
         # see https://hexdocs.pm/mix/1.12/Mix.Tasks.Release.html#content

     
···

       123
        
           buildInputs = buildInputs ++ lib.optionals (escriptBinName != null) [ erlang ];

     

       124
        
       

     

       125
        
           MIX_ENV = mixEnv;

     

       0
        
       
     

       0
        
       
     

       126
        
           MIX_DEBUG = if enableDebugInfo then 1 else 0;

     

       127
        
           HEX_OFFLINE = 1;

     

       128

···

       27
        
         meta ? { },

     

       28
        
         enableDebugInfo ? false,

     

       29
        
         mixEnv ? "prod",

     

       30
       +
         mixTarget ? "host",

     

       31
        
         compileFlags ? [ ],

     

       32
        
         # Build a particular named release.

     

       33
        
         # see https://hexdocs.pm/mix/1.12/Mix.Tasks.Release.html#content

     
···

       124
        
           buildInputs = buildInputs ++ lib.optionals (escriptBinName != null) [ erlang ];

     

       125
        
       

     

       126
        
           MIX_ENV = mixEnv;

     

       127
       +
           MIX_TARGET = mixTarget;

     

       128
       +
           MIX_BUILD_PREFIX = (if mixTarget == "host" then "" else "${mixTarget}_") + "${mixEnv}";

     

       129
        
           MIX_DEBUG = if enableDebugInfo then 1 else 0;

     

       130
        
           HEX_OFFLINE = 1;

     

       131

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

···

       53
        
           filelock

     

       54
        
         ];

     

       55
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
         passthru.updateScript = nix-update-script { };

     

       57
        
       

     

       58
        
         meta = {

···

       53
        
           filelock

     

       54
        
         ];

     

       55
        
       

     

       56
       +
         disabledTests = [

     

       57
       +
           # AssertionError: assert ''

     

       58
       +
           "test_get_html"

     

       59
       +
         ];

     

       60
       +
       

     

       61
        
         passthru.updateScript = nix-update-script { };

     

       62
        
       

     

       63
        
         meta = {

+15 -26

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

···

       15
        
         ninja,

     

       16
        
         numpy,

     

       17
        
         torch,

     

       0
        
       
     

       0
        
       
     

       18
        
       }:

     

       19
        
       

     

       20
       -
       let

     

       21
        
         pname = "flashinfer";

     

       22
       -
         version = "0.2.9";

     

       23
       -
       

     

       24
       -
         src_cutlass = fetchFromGitHub {

     

       25
       -
           owner = "NVIDIA";

     

       26
       -
           repo = "cutlass";

     

       27
       -
           # Using the revision obtained in submodule inside flashinfer's `3rdparty`.

     

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

     

       29
       -
           hash = "sha256-d4czDoEv0Focf1bJHOVGX4BDS/h5O7RPoM/RrujhgFQ=";

     

       30
       -
         };

     

       31
       -
       

     

       32
       -
       in

     

       33
       -
       buildPythonPackage {

     

       34
       -
         format = "setuptools";

     

       35
       -
         inherit pname version;

     

       36
        
       

     

       37
        
         src = fetchFromGitHub {

     

       38
        
           owner = "flashinfer-ai";

     

       39
        
           repo = "flashinfer";

     

       40
        
           tag = "v${version}";

     

       41
       -
           hash = "sha256-M0q6d+EpuTehbw68AQ73Fhwmw2tzjymYjSXaol9QC7Y=";

     

       0
        
       
     

       42
        
         };

     

       43
        
       

     

       44
        
         build-system = [ setuptools ];

     
···

       48
        
           ninja

     

       49
        
           (lib.getBin cudaPackages.cuda_nvcc)

     

       50
        
         ];

     

       0
        
       
     

       51
        
         dontUseCmakeConfigure = true;

     

       52
        
       

     

       53
       -
         buildInputs = [

     

       54
       -
           cudaPackages.cuda_cudart

     

       55
       -
           cudaPackages.libcublas

     

       56
       -
           cudaPackages.cuda_cccl

     

       57
       -
           cudaPackages.libcurand

     

       58
        
         ];

     

       59
       -
       

     

       60
       -
         postPatch = ''

     

       61
       -
           rmdir 3rdparty/cutlass

     

       62
       -
           ln -s ${src_cutlass} 3rdparty/cutlass

     

       63
       -
         '';

     

       64
        
       

     

       65
        
         # FlashInfer offers two installation modes:

     

       66
        
         #

     
···

       86
        
         dependencies = [

     

       87
        
           numpy

     

       88
        
           torch

     

       0
        
       
     

       0
        
       
     

       89
        
         ];

     

       90
        
       

     

       91
        
         meta = with lib; {

···

       15
        
         ninja,

     

       16
        
         numpy,

     

       17
        
         torch,

     

       18
       +
         pynvml,

     

       19
       +
         einops,

     

       20
        
       }:

     

       21
        
       

     

       22
       +
       buildPythonPackage rec {

     

       23
        
         pname = "flashinfer";

     

       24
       +
         version = "0.2.14";

     

       25
       +
         pyproject = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
       

     

       27
        
         src = fetchFromGitHub {

     

       28
        
           owner = "flashinfer-ai";

     

       29
        
           repo = "flashinfer";

     

       30
        
           tag = "v${version}";

     

       31
       +
           hash = "sha256-MZiZwdedz+Vxa1+VBfHDKf4NVSiOAytGboIJ0DvCXmk=";

     

       32
       +
           fetchSubmodules = true;

     

       33
        
         };

     

       34
        
       

     

       35
        
         build-system = [ setuptools ];

     
···

       39
        
           ninja

     

       40
        
           (lib.getBin cudaPackages.cuda_nvcc)

     

       41
        
         ];

     

       42
       +
       

     

       43
        
         dontUseCmakeConfigure = true;

     

       44
        
       

     

       45
       +
         buildInputs = with cudaPackages; [

     

       46
       +
           cuda_cccl

     

       47
       +
           cuda_cudart

     

       48
       +
           libcublas

     

       49
       +
           libcurand

     

       50
        
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       51
        
       

     

       52
        
         # FlashInfer offers two installation modes:

     

       53
        
         #

     
···

       73
        
         dependencies = [

     

       74
        
           numpy

     

       75
        
           torch

     

       76
       +
           pynvml

     

       77
       +
           einops

     

       78
        
         ];

     

       79
        
       

     

       80
        
         meta = with lib; {

pkgs/development/python-modules/google-cloud-kms/default.nix

···

       59
        
           rev-prefix = "google-cloud-kms-v";

     

       60
        
         };

     

       61
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
         meta = {

     

       63
        
           description = "Cloud Key Management Service (KMS) API API client library";

     

       64
        
           homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms";

···

       59
        
           rev-prefix = "google-cloud-kms-v";

     

       60
        
         };

     

       61
        
       

     

       62
       +
         # picks the wrong tag

     

       63
       +
         passthru.skipBulkUpdate = true;

     

       64
       +
       

     

       65
        
         meta = {

     

       66
        
           description = "Cloud Key Management Service (KMS) API API client library";

     

       67
        
           homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms";

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

···

       158
        
         ];

     

       159
        
       

     

       160
        
         disabledTests = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       161
        
           # Require network access

     

       162
        
           "test_infer_graph_endpoint"

     

       163
        
           "test_infer_path_based_routing"

···

       158
        
         ];

     

       159
        
       

     

       160
        
         disabledTests = [

     

       161
       +
           # AssertionError: assert CompletionReq...lm_xargs=None) == CompletionReq...lm_xargs=None)

     

       162
       +
           "test_convert_params"

     

       163
       +
       

     

       164
       +
           # Flaky: ray.exceptions.ActorDiedError: The actor died unexpectedly before finishing this task.

     

       165
       +
           "test_explain"

     

       166
       +
           "test_infer"

     

       167
       +
           "test_predict"

     

       168
       +
       

     

       169
        
           # Require network access

     

       170
        
           "test_infer_graph_endpoint"

     

       171
        
           "test_infer_path_based_routing"

+67 -28

pkgs/development/python-modules/mistral-common/default.nix

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         buildPythonPackage,

     

       4
       -
         fetchPypi,

     

       5
       -
         poetry-core,

     

       6
       -
         numpy,

     

       7
       -
         pydantic,

     

       0
        
       
     

       0
        
       
     

       8
        
         jsonschema,

     

       0
        
       
     

       9
        
         opencv-python-headless,

     

       10
       -
         sentencepiece,

     

       11
       -
         typing-extensions,

     

       12
       -
         tiktoken,

     

       13
        
         pillow,

     

       0
        
       
     

       0
        
       
     

       14
        
         requests,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       }:

     

       16
        
       

     

       17
        
       buildPythonPackage rec {

     

       18
        
         pname = "mistral-common";

     

       19
       -
         version = "1.8.3";

     

       20
        
         pyproject = true;

     

       21
        
       

     

       22
       -
         src = fetchPypi {

     

       23
       -
           pname = "mistral_common";

     

       24
       -
           inherit version;

     

       25
       -
           hash = "sha256-DRl52CIntiX21xs8goF28FnajQ9aMwfN9TtIQJo5cKQ=";

     

       0
        
       
     

       26
        
         };

     

       27
        
       

     

       28
       -
         pythonRelaxDeps = [

     

       29
       -
           "pillow"

     

       30
       -
           "tiktoken"

     

       31
       -
         ];

     

       32
       -
       

     

       33
       -
         build-system = [ poetry-core ];

     

       34
        
       

     

       35
        
         dependencies = [

     

       36
       -
           numpy

     

       37
       -
           pydantic

     

       38
        
           jsonschema

     

       0
        
       
     

       39
        
           opencv-python-headless

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
           sentencepiece

     

       0
        
       
     

       41
        
           typing-extensions

     

       42
       -
           tiktoken

     

       43
       -
           pillow

     

       44
       -
           requests

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
         ];

     

       46
        
       

     

       47
       -
         doCheck = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
       

     

       49
       -
         pythonImportsCheck = [ "mistral_common" ];

     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
       -
         meta = with lib; {

     

       52
        
           description = "Tools to help you work with Mistral models";

     

       53
        
           homepage = "https://github.com/mistralai/mistral-common";

     

       54
       -
           license = licenses.asl20;

     

       55
       -
           maintainers = with maintainers; [ bgamari ];

     

       0
        
       
     

       56
        
         };

     

       57
        
       }

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         buildPythonPackage,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
       

     

       6
       +
         # build-system

     

       7
       +
         setuptools,

     

       8
       +
       

     

       9
       +
         # dependencies

     

       10
        
         jsonschema,

     

       11
       +
         numpy,

     

       12
        
         opencv-python-headless,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
         pillow,

     

       14
       +
         pydantic,

     

       15
       +
         pydantic-extra-types,

     

       16
        
         requests,

     

       17
       +
         sentencepiece,

     

       18
       +
         tiktoken,

     

       19
       +
         typing-extensions,

     

       20
       +
       

     

       21
       +
         # tests

     

       22
       +
         click,

     

       23
       +
         fastapi,

     

       24
       +
         huggingface-hub,

     

       25
       +
         openai,

     

       26
       +
         pycountry,

     

       27
       +
         pydantic-settings,

     

       28
       +
         pytestCheckHook,

     

       29
       +
         soundfile,

     

       30
       +
         soxr,

     

       31
       +
         uvicorn,

     

       32
        
       }:

     

       33
        
       

     

       34
        
       buildPythonPackage rec {

     

       35
        
         pname = "mistral-common";

     

       36
       +
         version = "1.8.4";

     

       37
        
         pyproject = true;

     

       38
        
       

     

       39
       +
         src = fetchFromGitHub {

     

       40
       +
           owner = "mistralai";

     

       41
       +
           repo = "mistral-common";

     

       42
       +
           tag = "v${version}";

     

       43
       +
           hash = "sha256-HB6dsqiDSLhjyANk7ZT/cU98mjJamegAF0uKH8GfgM8=";

     

       44
        
         };

     

       45
        
       

     

       46
       +
         build-system = [ setuptools ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       47
        
       

     

       48
        
         dependencies = [

     

       0
        
       
     

       0
        
       
     

       49
        
           jsonschema

     

       50
       +
           numpy

     

       51
        
           opencv-python-headless

     

       52
       +
           pillow

     

       53
       +
           pydantic

     

       54
       +
           pydantic-extra-types

     

       55
       +
           requests

     

       56
        
           sentencepiece

     

       57
       +
           tiktoken

     

       58
        
           typing-extensions

     

       59
       +
         ];

     

       60
       +
       

     

       61
       +
         pythonImportsCheck = [ "mistral_common" ];

     

       62
       +
       

     

       63
       +
         nativeCheckInputs = [

     

       64
       +
           click

     

       65
       +
           fastapi

     

       66
       +
           huggingface-hub

     

       67
       +
           openai

     

       68
       +
           pycountry

     

       69
       +
           pydantic-settings

     

       70
       +
           pytestCheckHook

     

       71
       +
           soundfile

     

       72
       +
           soxr

     

       73
       +
           uvicorn

     

       74
        
         ];

     

       75
        
       

     

       76
       +
         disabledTests = [

     

       77
       +
           # Require internet

     

       78
       +
           "test_download_gated_image"

     

       79
       +
           "test_image_encoder_formats"

     

       80
       +
           "test_image_processing"

     

       81
       +
       

     

       82
       +
           # AssertionError: Regex pattern did not match.

     

       83
       +
           "test_from_url"

     

       84
        
       

     

       85
       +
           # AssertionError, Extra items in the right set

     

       86
       +
           "test_openai_chat_fields"

     

       87
       +
         ];

     

       88
        
       

     

       89
       +
         meta = {

     

       90
        
           description = "Tools to help you work with Mistral models";

     

       91
        
           homepage = "https://github.com/mistralai/mistral-common";

     

       92
       +
           changelog = "https://github.com/mistralai/mistral-common/releases/tag/v${version}";

     

       93
       +
           license = lib.licenses.asl20;

     

       94
       +
           maintainers = with lib.maintainers; [ bgamari ];

     

       95
        
         };

     

       96
        
       }

+61

pkgs/development/python-modules/openai-harmony/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         buildPythonPackage,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
       

     

       6
       +
         # build-system

     

       7
       +
         rustPlatform,

     

       8
       +
       

     

       9
       +
         # dependencies

     

       10
       +
         pydantic,

     

       11
       +
       

     

       12
       +
         # optional-dependencies

     

       13
       +
         fastapi,

     

       14
       +
         uvicorn,

     

       15
       +
       }:

     

       16
       +
       

     

       17
       +
       buildPythonPackage rec {

     

       18
       +
         pname = "openai-harmony";

     

       19
       +
         version = "0.0.4";

     

       20
       +
         pyproject = true;

     

       21
       +
       

     

       22
       +
         src = fetchFromGitHub {

     

       23
       +
           owner = "openai";

     

       24
       +
           repo = "harmony";

     

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

     

       26
       +
           hash = "sha256-2LOrMLrNR1D3isbjiv5w+1Ni9IMwMEPPTOnG1rm//ag=";

     

       27
       +
         };

     

       28
       +
       

     

       29
       +
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       30
       +
           inherit pname version src;

     

       31
       +
           hash = "sha256-tQq6PFMYghIfJu8CddbXFKXxr41GJaElbCCQuSpnaqk=";

     

       32
       +
         };

     

       33
       +
       

     

       34
       +
         nativeBuildInputs = [

     

       35
       +
           rustPlatform.cargoSetupHook

     

       36
       +
           rustPlatform.maturinBuildHook

     

       37
       +
         ];

     

       38
       +
       

     

       39
       +
         dependencies = [

     

       40
       +
           pydantic

     

       41
       +
         ];

     

       42
       +
       

     

       43
       +
         optional-dependencies = {

     

       44
       +
           demo = [

     

       45
       +
             fastapi

     

       46
       +
             uvicorn

     

       47
       +
           ];

     

       48
       +
         };

     

       49
       +
       

     

       50
       +
         pythonImportsCheck = [ "openai_harmony" ];

     

       51
       +
       

     

       52
       +
         # Tests require internet access

     

       53
       +
         doCheck = false;

     

       54
       +
       

     

       55
       +
         meta = {

     

       56
       +
           description = "Renderer for the harmony response format to be used with gpt-oss";

     

       57
       +
           homepage = "https://github.com/openai/harmony";

     

       58
       +
           license = lib.licenses.asl20;

     

       59
       +
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       60
       +
         };

     

       61
       +
       }

+4 -2

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

···

       43
        
       

     

       44
        
       buildPythonPackage rec {

     

       45
        
         pname = "optuna";

     

       46
       -
         version = "4.4.0";

     

       47
        
         pyproject = true;

     

       48
        
       

     

       49
        
         src = fetchFromGitHub {

     

       50
        
           owner = "optuna";

     

       51
        
           repo = "optuna";

     

       52
        
           tag = "v${version}";

     

       53
       -
           hash = "sha256-S9F9xni1cnmIbWu5n7BFvUCvQmBP3iBYS1ntg6vQ8ZQ=";

     

       54
        
         };

     

       55
        
       

     

       56
        
         build-system = [

     
···

       137
        
           "test_target_is_none_and_study_is_multi_obj"

     

       138
        
           "test_visualizations_with_single_objectives"

     

       139
        
         ];

     

       0
        
       
     

       0
        
       
     

       140
        
       

     

       141
        
         pythonImportsCheck = [ "optuna" ];

     

       142

···

       43
        
       

     

       44
        
       buildPythonPackage rec {

     

       45
        
         pname = "optuna";

     

       46
       +
         version = "4.5.0";

     

       47
        
         pyproject = true;

     

       48
        
       

     

       49
        
         src = fetchFromGitHub {

     

       50
        
           owner = "optuna";

     

       51
        
           repo = "optuna";

     

       52
        
           tag = "v${version}";

     

       53
       +
           hash = "sha256-qaCOpqKRepm/a1Nh98PV6RcRkadLK5E429pn1zaWQDA=";

     

       54
        
         };

     

       55
        
       

     

       56
        
         build-system = [

     
···

       137
        
           "test_target_is_none_and_study_is_multi_obj"

     

       138
        
           "test_visualizations_with_single_objectives"

     

       139
        
         ];

     

       140
       +
       

     

       141
       +
         __darwinAllowLocalNetworking = true;

     

       142
        
       

     

       143
        
         pythonImportsCheck = [ "optuna" ];

     

       144

+1 -1

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

···

       50
        
           homepage = "https://pydash.readthedocs.io";

     

       51
        
           changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst";

     

       52
        
           license = licenses.mit;

     

       53
       -
           maintainers = with maintainers; [ ma27 ];

     

       54
        
         };

     

       55
        
       }

···

       50
        
           homepage = "https://pydash.readthedocs.io";

     

       51
        
           changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst";

     

       52
        
           license = licenses.mit;

     

       53
       +
           maintainers = with maintainers; [ ];

     

       54
        
         };

     

       55
        
       }

+3 -7

pkgs/development/python-modules/pyopengl-accelerate/default.nix

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "pyopengl-accelerate";

     

       13
       -
         version = "3.1.9";

     

       14
        
         format = "pyproject";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           pname = "pyopengl_accelerate";

     

       18
        
           inherit version;

     

       19
       -
           hash = "sha256-hZV8fHaXWBj/dZ7JJD+dxwke9vNz6jei61DDIP2ahvM=";

     

       20
        
         };

     

       0
        
       
     

       21
        
         build-system = [

     

       22
        
           cython

     

       23
        
           numpy

     

       24
        
           setuptools

     

       25
        
           wheel

     

       26
       -
         ];

     

       27
       -
       

     

       28
       -
         env.NIX_CFLAGS_COMPILE = toString [

     

       29
       -
           "-Wno-error=int-conversion"

     

       30
       -
           "-Wno-error=incompatible-pointer-types"

     

       31
        
         ];

     

       32
        
       

     

       33
        
         meta = {

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "pyopengl-accelerate";

     

       13
       +
         version = "3.1.10";

     

       14
        
         format = "pyproject";

     

       15
        
       

     

       16
        
         src = fetchPypi {

     

       17
        
           pname = "pyopengl_accelerate";

     

       18
        
           inherit version;

     

       19
       +
           hash = "sha256-gnUcg/Cm9zK4tZI5kO3CRB04F2qYdWsXGOjWxDefWnE=";

     

       20
        
         };

     

       21
       +
       

     

       22
        
         build-system = [

     

       23
        
           cython

     

       24
        
           numpy

     

       25
        
           setuptools

     

       26
        
           wheel

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
         ];

     

       28
        
       

     

       29
        
         meta = {

-18

pkgs/development/python-modules/vllm/0004-drop-lsmod.patch

···

       1
       -
       --- a/setup.py

     

       2
       -
       +++ b/setup.py

     

       3
       -
       @@ -340,14 +340,7 @@ def _is_hpu() -> bool:

     

       4
       -
                out = subprocess.run(["hl-smi"], capture_output=True, check=True)

     

       5
       -
                is_hpu_available = out.returncode == 0

     

       6
       -
            except (FileNotFoundError, PermissionError, subprocess.CalledProcessError):

     

       7
       -
       -        if sys.platform.startswith("linux"):

     

       8
       -
       -            try:

     

       9
       -
       -                output = subprocess.check_output(

     

       10
       -
       -                    'lsmod | grep habanalabs | wc -l', shell=True)

     

       11
       -
       -                is_hpu_available = int(output) > 0

     

       12
       -
       -            except (ValueError, FileNotFoundError, PermissionError,

     

       13
       -
       -                    subprocess.CalledProcessError):

     

       14
       -
       -                pass

     

       15
       -
       +        is_hpu_available = False

     

       16
       -
            return is_hpu_available

     

       17
       -
        

     

       18
       -

+6 -19

pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch

···

       1
       -
       From 7511784ceb9252091a9d63ac6b54dcc67dd2b262 Mon Sep 17 00:00:00 2001

     

       2
       -
       From: Conroy Cheers <conroy@corncheese.org>

     

       3
       -
       Date: Fri, 13 Jun 2025 17:42:10 +1000

     

       4
       -
       Subject: [PATCH] drop intel reqs

     

       5
       -
       

     

       6
       -
       ---

     

       7
       -
        requirements/cpu.txt | 3 ---

     

       8
       -
        1 file changed, 3 deletions(-)

     

       9
       -
       

     

       10
        
       diff --git a/requirements/cpu.txt b/requirements/cpu.txt

     

       11
       -
       index d7b0fc6d8..be2df751b 100644

     

       12
        
       --- a/requirements/cpu.txt

     

       13
        
       +++ b/requirements/cpu.txt

     

       14
       -
       @@ -24,8 +24,5 @@ datasets # for benchmark scripts

     

       15
       -
        # cpu cannot use triton 3.3.0

     

       16
       -
        triton==3.2.0; platform_machine == "x86_64"

     

       17
        
        

     

       18
        
       -# Intel Extension for PyTorch, only for x86_64 CPUs

     

       19
        
       -intel-openmp==2024.2.1; platform_machine == "x86_64"

     

       20
       -
       -intel_extension_for_pytorch==2.7.0; platform_machine == "x86_64"

     

       21
       -
        py-libnuma; platform_system != "Darwin"

     

       22
       -
        psutil; platform_system != "Darwin"

     

       23
       -
       -- 

     

       24
       -
       2.49.0

     

       25
       -

···

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1
        
       diff --git a/requirements/cpu.txt b/requirements/cpu.txt

     

       2
       +
       index d80354342..7434f32f0 100644

     

       3
        
       --- a/requirements/cpu.txt

     

       4
        
       +++ b/requirements/cpu.txt

     

       5
       +
       @@ -21,7 +21,4 @@ torchvision; platform_machine != "ppc64le" and platform_machine != "s390x"

     

       6
       +
        torchvision==0.22.0; platform_machine == "ppc64le"

     

       7
       +
        datasets # for benchmark scripts

     

       8
        
        

     

       9
        
       -# Intel Extension for PyTorch, only for x86_64 CPUs

     

       10
        
       -intel-openmp==2024.2.1; platform_machine == "x86_64"

     

       11
       +
       -intel_extension_for_pytorch==2.6.0; platform_machine == "x86_64" # torch>2.6.0+cpu has performance regression on x86 platform, see https://github.com/pytorch/pytorch/pull/151218

     

       12
       +
        triton==3.2.0; platform_machine == "x86_64" # Triton is required for torch 2.6+cpu, as it is imported in torch.compile.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

+19 -25

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

···

       5
        
         buildPythonPackage,

     

       6
        
         pythonAtLeast,

     

       7
        
         fetchFromGitHub,

     

       8
       -
         fetchpatch,

     

       9
        
         symlinkJoin,

     

       10
        
         autoAddDriverRunpath,

     

       11
        
       

     
···

       45
        
         lm-format-enforcer,

     

       46
        
         prometheus-fastapi-instrumentator,

     

       47
        
         cupy,

     

       0
        
       
     

       0
        
       
     

       48
        
         gguf,

     

       49
        
         einops,

     

       50
        
         importlib-metadata,

     
···

       69
        
         bitsandbytes,

     

       70
        
         flashinfer,

     

       71
        
         py-libnuma,

     

       0
        
       
     

       0
        
       
     

       72
        
       

     

       73
        
         # internal dependency - for overriding in overlays

     

       74
        
         vllm-flash-attn ? null,

     
···

       92
        
         shouldUsePkg =

     

       93
        
           pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;

     

       94
        
       

     

       95
       -
         # see CMakeLists.txt, grepping for GIT_TAG near cutlass

     

       96
        
         # https://github.com/vllm-project/vllm/blob/v${version}/CMakeLists.txt

     

       97
        
         cutlass = fetchFromGitHub {

     

       98
        
           owner = "NVIDIA";

     

       99
        
           repo = "cutlass";

     

       100
       -
           tag = "v3.9.2";

     

       101
       -
           hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";

     

       102
        
         };

     

       103
        
       

     

       104
        
         flashmla = stdenv.mkDerivation {

     
···

       111
        
           src = fetchFromGitHub {

     

       112
        
             owner = "vllm-project";

     

       113
        
             repo = "FlashMLA";

     

       114
       -
             rev = "575f7724b9762f265bbee5889df9c7d630801845";

     

       115
       -
             hash = "sha256-8WrKMl0olr0nYV4FRJfwSaJ0F5gWQpssoFMjr9tbHBk=";

     

       116
        
           };

     

       117
        
       

     

       118
        
           dontConfigure = true;

     
···

       138
        
           src = fetchFromGitHub {

     

       139
        
             owner = "vllm-project";

     

       140
        
             repo = "flash-attention";

     

       141
       -
             rev = "8798f27777fb57f447070301bf33a9f9c607f491";

     

       142
       -
             hash = "sha256-UTUvATGN1NU/Bc8qo078q6bEgILLmlrjL7Yk2iAJhg4=";

     

       143
        
           };

     

       144
        
       

     

       145
        
           dontConfigure = true;

     
···

       161
        
       

     

       162
        
         cpuSupport = !cudaSupport && !rocmSupport;

     

       163
        
       

     

       164
       -
         # https://github.com/pytorch/pytorch/blob/v2.7.0/torch/utils/cpp_extension.py#L2343-L2345

     

       165
        
         supportedTorchCudaCapabilities =

     

       166
        
           let

     

       167
        
             real = [

     
···

       231
        
           libcusolver # cusolverDn.h

     

       232
        
           cuda_nvtx

     

       233
        
           cuda_nvrtc

     

       0
        
       
     

       234
        
           libcublas

     

       235
        
         ];

     

       236
        
       

     
···

       247
        
       

     

       248
        
       buildPythonPackage rec {

     

       249
        
         pname = "vllm";

     

       250
       -
         version = "0.9.1";

     

       251
        
         pyproject = true;

     

       252
        
       

     

       253
        
         # https://github.com/vllm-project/vllm/issues/12083

     
···

       259
        
           owner = "vllm-project";

     

       260
        
           repo = "vllm";

     

       261
        
           tag = "v${version}";

     

       262
       -
           hash = "sha256-sp7rDpewTPXTVRBJHJMj+8pJDS6wAu0/OTJZwbPPqKc=";

     

       263
        
         };

     

       264
        
       

     

       265
        
         patches = [

     

       266
       -
           (fetchpatch {

     

       267
       -
             name = "remove-unused-opentelemetry-semantic-conventions-ai-dep.patch";

     

       268
       -
             url = "https://github.com/vllm-project/vllm/commit/6a5d7e45f52c3a13de43b8b4fa9033e3b342ebd2.patch";

     

       269
       -
             hash = "sha256-KYthqu+6XwsYYd80PtfrMMjuRV9+ionccr7EbjE4jJE=";

     

       270
       -
           })

     

       271
       -
           (fetchpatch {

     

       272
       -
             name = "fall-back-to-gloo-when-nccl-unavailable.patch";

     

       273
       -
             url = "https://github.com/vllm-project/vllm/commit/aa131a94410683b0a02e74fed2ce95e6c2b6b030.patch";

     

       274
       -
             hash = "sha256-jNlQZQ8xiW85JWyBjsPZ6FoRQsiG1J8bwzmQjnaWFBg=";

     

       275
       -
           })

     

       276
        
           ./0002-setup.py-nix-support-respect-cmakeFlags.patch

     

       277
        
           ./0003-propagate-pythonpath.patch

     

       278
       -
           ./0004-drop-lsmod.patch

     

       279
        
           ./0005-drop-intel-reqs.patch

     

       280
        
         ];

     

       281
        
       

     
···

       354
        
           aioprometheus

     

       355
        
           blake3

     

       356
        
           cachetools

     

       0
        
       
     

       357
        
           depyf

     

       358
        
           fastapi

     

       359
        
           llguidance

     
···

       366
        
           prometheus-fastapi-instrumentator

     

       367
        
           py-cpuinfo

     

       368
        
           pyarrow

     

       0
        
       
     

       369
        
           pydantic

     

       370
        
           python-json-logger

     

       371
        
           python-multipart

     
···

       393
        
           opentelemetry-api

     

       394
        
           opentelemetry-exporter-otlp

     

       395
        
           bitsandbytes

     

       0
        
       
     

       0
        
       
     

       396
        
           # vLLM needs Torch's compiler to be present in order to use torch.compile

     

       397
        
           torch.stdenv.cc

     

       398
        
         ]

     
···

       476
        
             # find_isa

     

       477
        
             "x86_64-darwin"

     

       478
        
           ];

     

       479
       -
           # ValueError: 'aimv2' is already used by a Transformers config, pick another name.

     

       480
       -
           # Version bump ongoing in https://github.com/NixOS/nixpkgs/pull/429117

     

       481
       -
           broken = true;

     

       482
        
         };

     

       483
        
       }

···

       5
        
         buildPythonPackage,

     

       6
        
         pythonAtLeast,

     

       7
        
         fetchFromGitHub,

     

       0
        
       
     

       8
        
         symlinkJoin,

     

       9
        
         autoAddDriverRunpath,

     

       10
        
       

     
···

       44
        
         lm-format-enforcer,

     

       45
        
         prometheus-fastapi-instrumentator,

     

       46
        
         cupy,

     

       47
       +
         cbor2,

     

       48
       +
         pybase64,

     

       49
        
         gguf,

     

       50
        
         einops,

     

       51
        
         importlib-metadata,

     
···

       70
        
         bitsandbytes,

     

       71
        
         flashinfer,

     

       72
        
         py-libnuma,

     

       73
       +
         setproctitle,

     

       74
       +
         openai-harmony,

     

       75
        
       

     

       76
        
         # internal dependency - for overriding in overlays

     

       77
        
         vllm-flash-attn ? null,

     
···

       95
        
         shouldUsePkg =

     

       96
        
           pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;

     

       97
        
       

     

       98
       +
         # see CMakeLists.txt, grepping for CUTLASS_REVISION

     

       99
        
         # https://github.com/vllm-project/vllm/blob/v${version}/CMakeLists.txt

     

       100
        
         cutlass = fetchFromGitHub {

     

       101
        
           owner = "NVIDIA";

     

       102
        
           repo = "cutlass";

     

       103
       +
           tag = "v4.0.0";

     

       104
       +
           hash = "sha256-HJY+Go1viPkSVZPEs/NyMtYJzas4mMLiIZF3kNX+WgA=";

     

       105
        
         };

     

       106
        
       

     

       107
        
         flashmla = stdenv.mkDerivation {

     
···

       114
        
           src = fetchFromGitHub {

     

       115
        
             owner = "vllm-project";

     

       116
        
             repo = "FlashMLA";

     

       117
       +
             rev = "0e43e774597682284358ff2c54530757b654b8d1";

     

       118
       +
             hash = "sha256-wxL/jtq/lsLg1o+4392KNgfw5TYlW6lqEVbmR3Jl4/Q=";

     

       119
        
           };

     

       120
        
       

     

       121
        
           dontConfigure = true;

     
···

       141
        
           src = fetchFromGitHub {

     

       142
        
             owner = "vllm-project";

     

       143
        
             repo = "flash-attention";

     

       144
       +
             rev = "57b4e68b9f9d94750b46de8f8dbd2bfcc86edd4f";

     

       145
       +
             hash = "sha256-c7L7WZVVEnXMOTPBoSp7jhkl9d4TA4sj11QvOSWTDIE=";

     

       146
        
           };

     

       147
        
       

     

       148
        
           dontConfigure = true;

     
···

       164
        
       

     

       165
        
         cpuSupport = !cudaSupport && !rocmSupport;

     

       166
        
       

     

       167
       +
         # https://github.com/pytorch/pytorch/blob/v2.7.1/torch/utils/cpp_extension.py#L2343-L2345

     

       168
        
         supportedTorchCudaCapabilities =

     

       169
        
           let

     

       170
        
             real = [

     
···

       234
        
           libcusolver # cusolverDn.h

     

       235
        
           cuda_nvtx

     

       236
        
           cuda_nvrtc

     

       237
       +
           # cusparselt # cusparseLt.h

     

       238
        
           libcublas

     

       239
        
         ];

     

       240
        
       

     
···

       251
        
       

     

       252
        
       buildPythonPackage rec {

     

       253
        
         pname = "vllm";

     

       254
       +
         version = "0.10.1.1";

     

       255
        
         pyproject = true;

     

       256
        
       

     

       257
        
         # https://github.com/vllm-project/vllm/issues/12083

     
···

       263
        
           owner = "vllm-project";

     

       264
        
           repo = "vllm";

     

       265
        
           tag = "v${version}";

     

       266
       +
           hash = "sha256-lLNjBv5baER0AArX3IV4HWjDZ2jTGXyGIvnHupR8MGM=";

     

       267
        
         };

     

       268
        
       

     

       269
        
         patches = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       270
        
           ./0002-setup.py-nix-support-respect-cmakeFlags.patch

     

       271
        
           ./0003-propagate-pythonpath.patch

     

       0
        
       
     

       272
        
           ./0005-drop-intel-reqs.patch

     

       273
        
         ];

     

       274
        
       

     
···

       347
        
           aioprometheus

     

       348
        
           blake3

     

       349
        
           cachetools

     

       350
       +
           cbor2

     

       351
        
           depyf

     

       352
        
           fastapi

     

       353
        
           llguidance

     
···

       360
        
           prometheus-fastapi-instrumentator

     

       361
        
           py-cpuinfo

     

       362
        
           pyarrow

     

       363
       +
           pybase64

     

       364
        
           pydantic

     

       365
        
           python-json-logger

     

       366
        
           python-multipart

     
···

       388
        
           opentelemetry-api

     

       389
        
           opentelemetry-exporter-otlp

     

       390
        
           bitsandbytes

     

       391
       +
           setproctitle

     

       392
       +
           openai-harmony

     

       393
        
           # vLLM needs Torch's compiler to be present in order to use torch.compile

     

       394
        
           torch.stdenv.cc

     

       395
        
         ]

     
···

       473
        
             # find_isa

     

       474
        
             "x86_64-darwin"

     

       475
        
           ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       476
        
         };

     

       477
        
       }

+8 -4

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

···

       67
        
             '"ffmpeg"' '"${lib.getExe ffmpeg}"'

     

       68
        
         '';

     

       69
        
       

     

       70
       -
         # > Checking runtime dependencies for whisperx-3.3.2-py3-none-any.whl

     

       71
       -
         # >   - faster-whisper==1.1.0 not satisfied by version 1.1.1

     

       72
       -
         # This has been updated on main, so we expect this clause to be removed upon the next update.

     

       73
       -
         pythonRelaxDeps = [ "faster-whisper" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
       

     

       75
        
         # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime

     

       76
        
         # not finding its default logger, which then promptly segfaults.

···

       67
        
             '"ffmpeg"' '"${lib.getExe ffmpeg}"'

     

       68
        
         '';

     

       69
        
       

     

       70
       +
         pythonRelaxDeps = [

     

       71
       +
           # > Checking runtime dependencies for whisperx-3.3.2-py3-none-any.whl

     

       72
       +
           # >   - faster-whisper==1.1.0 not satisfied by version 1.1.1

     

       73
       +
           # This has been updated on main, so we expect this clause to be removed upon the next update.

     

       74
       +
           "faster-whisper"

     

       75
       +
       

     

       76
       +
           "ctranslate2"

     

       77
       +
         ];

     

       78
        
       

     

       79
        
         # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime

     

       80
        
         # not finding its default logger, which then promptly segfaults.

+2 -2

pkgs/development/tools/qtcreator/default.nix

···

       31
        
       

     

       32
        
       stdenv.mkDerivation rec {

     

       33
        
         pname = "qtcreator";

     

       34
       -
         version = "17.0.0";

     

       35
        
       

     

       36
        
         src = fetchurl {

     

       37
        
           url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";

     

       38
       -
           hash = "sha256-YW3+pDphYrwajM9EDh32p0uXf8sCjXa3x3mh+43jnow=";

     

       39
        
         };

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

···

       31
        
       

     

       32
        
       stdenv.mkDerivation rec {

     

       33
        
         pname = "qtcreator";

     

       34
       +
         version = "17.0.1";

     

       35
        
       

     

       36
        
         src = fetchurl {

     

       37
        
           url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";

     

       38
       +
           hash = "sha256-9WcYCEdnBzkami7bmWPqSmtrkMeMvnTs4aygxrQuUYQ=";

     

       39
        
         };

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

+10 -8

pkgs/games/doom-ports/slade/default.nix pkgs/by-name/sl/slade/package.nix

···

       6
        
         pkg-config,

     

       7
        
         which,

     

       8
        
         zip,

     

       9
       -
         wxGTK,

     

       10
        
         gtk3,

     

       11
        
         sfml_2,

     

       12
        
         fluidsynth,

     
···

       19
        
         wrapGAppsHook3,

     

       20
        
       }:

     

       21
        
       

     

       22
       -
       stdenv.mkDerivation rec {

     

       23
        
         pname = "slade";

     

       24
        
         version = "3.2.7";

     

       25
        
       

     

       26
        
         src = fetchFromGitHub {

     

       27
        
           owner = "sirjuddington";

     

       28
        
           repo = "SLADE";

     

       29
       -
           rev = version;

     

       30
        
           hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns=";

     

       31
        
         };

     

       32
        
       

     
···

       39
        
         ];

     

       40
        
       

     

       41
        
         buildInputs = [

     

       42
       -
           wxGTK

     

       43
        
           gtk3

     

       44
        
           sfml_2

     

       45
        
           fluidsynth

     
···

       52
        
         ];

     

       53
        
       

     

       54
        
         cmakeFlags = [

     

       55
       -
           "-DwxWidgets_LIBRARIES=${wxGTK}/lib"

     

       56
       -
           (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK) "wx-config"))

     

       57
        
         ];

     

       58
        
       

     

       59
        
         env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

     
···

       67
        
         meta = {

     

       68
        
           description = "Doom editor";

     

       69
        
           homepage = "http://slade.mancubus.net/";

     

       0
        
       
     

       0
        
       
     

       70
        
           license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754

     

       71
        
           platforms = lib.platforms.linux;

     

       72
       -
           maintainers = [ ];

     

       73
        
         };

     

       74
       -
       }

···

       6
        
         pkg-config,

     

       7
        
         which,

     

       8
        
         zip,

     

       9
       +
         wxGTK32,

     

       10
        
         gtk3,

     

       11
        
         sfml_2,

     

       12
        
         fluidsynth,

     
···

       19
        
         wrapGAppsHook3,

     

       20
        
       }:

     

       21
        
       

     

       22
       +
       stdenv.mkDerivation (finalAttrs: {

     

       23
        
         pname = "slade";

     

       24
        
         version = "3.2.7";

     

       25
        
       

     

       26
        
         src = fetchFromGitHub {

     

       27
        
           owner = "sirjuddington";

     

       28
        
           repo = "SLADE";

     

       29
       +
           tag = finalAttrs.version;

     

       30
        
           hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns=";

     

       31
        
         };

     

       32
        
       

     
···

       39
        
         ];

     

       40
        
       

     

       41
        
         buildInputs = [

     

       42
       +
           wxGTK32

     

       43
        
           gtk3

     

       44
        
           sfml_2

     

       45
        
           fluidsynth

     
···

       52
        
         ];

     

       53
        
       

     

       54
        
         cmakeFlags = [

     

       55
       +
           "-DwxWidgets_LIBRARIES=${wxGTK32}/lib"

     

       56
       +
           (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config"))

     

       57
        
         ];

     

       58
        
       

     

       59
        
         env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

     
···

       67
        
         meta = {

     

       68
        
           description = "Doom editor";

     

       69
        
           homepage = "http://slade.mancubus.net/";

     

       70
       +
           changelog = "https://github.com/sirjuddington/SLADE/releases/tag/${finalAttrs.version}";

     

       71
       +
           mainProgram = "slade";

     

       72
        
           license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754

     

       73
        
           platforms = lib.platforms.linux;

     

       74
       +
           maintainers = with lib.maintainers; [ Gliczy ];

     

       75
        
         };

     

       76
       +
       })

+6 -4

pkgs/games/doom-ports/slade/git.nix pkgs/by-name/sl/slade-unstable/package.nix

···

       6
        
         pkg-config,

     

       7
        
         which,

     

       8
        
         zip,

     

       9
       -
         wxGTK,

     

       10
        
         gtk3,

     

       11
        
         sfml_2,

     

       12
        
         fluidsynth,

     
···

       40
        
         ];

     

       41
        
       

     

       42
        
         buildInputs = [

     

       43
       -
           wxGTK

     

       44
        
           gtk3

     

       45
        
           sfml_2

     

       46
        
           fluidsynth

     
···

       53
        
         ];

     

       54
        
       

     

       55
        
         cmakeFlags = [

     

       56
       -
           "-DwxWidgets_LIBRARIES=${wxGTK}/lib"

     

       57
       -
           (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK) "wx-config"))

     

       58
        
         ];

     

       59
        
       

     

       60
        
         env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

     
···

       72
        
         meta = {

     

       73
        
           description = "Doom editor";

     

       74
        
           homepage = "http://slade.mancubus.net/";

     

       0
        
       
     

       75
        
           license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754

     

       76
        
           platforms = lib.platforms.linux;

     

       0
        
       
     

       77
        
         };

     

       78
        
       }

···

       6
        
         pkg-config,

     

       7
        
         which,

     

       8
        
         zip,

     

       9
       +
         wxGTK32,

     

       10
        
         gtk3,

     

       11
        
         sfml_2,

     

       12
        
         fluidsynth,

     
···

       40
        
         ];

     

       41
        
       

     

       42
        
         buildInputs = [

     

       43
       +
           wxGTK32

     

       44
        
           gtk3

     

       45
        
           sfml_2

     

       46
        
           fluidsynth

     
···

       53
        
         ];

     

       54
        
       

     

       55
        
         cmakeFlags = [

     

       56
       +
           "-DwxWidgets_LIBRARIES=${wxGTK32}/lib"

     

       57
       +
           (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config"))

     

       58
        
         ];

     

       59
        
       

     

       60
        
         env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

     
···

       72
        
         meta = {

     

       73
        
           description = "Doom editor";

     

       74
        
           homepage = "http://slade.mancubus.net/";

     

       75
       +
           mainProgram = "slade";

     

       76
        
           license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754

     

       77
        
           platforms = lib.platforms.linux;

     

       78
       +
           maintainers = with lib.maintainers; [ Gliczy ];

     

       79
        
         };

     

       80
        
       }

+4 -3

pkgs/os-specific/linux/kernel/generic.nix

···

       38
        
             # Additional make flags passed to kbuild

     

       39
        
             extraMakeFlags ? [ ],

     

       40
        
       

     

       41
       -
             # enables the options in ./common-config.nix; if `false` then only

     

       42
       -
             # `structuredExtraConfig` is used

     

       43
        
             enableCommonConfig ? true

     

       44
        
       

     

       45
        
             , # kernel intermediate config overrides, as a set

     
···

       136
        
               configfile.moduleStructuredConfig.intermediateNixConfig

     

       137
        
               # extra config in legacy string format

     

       138
        
               + extraConfig

     

       139
       -
               + stdenv.hostPlatform.linux-kernel.extraConfig or "";

     

       0
        
       
     

       140
        
       

     

       141
        
             structuredConfigFromPatches = map (

     

       142
        
               {

···

       38
        
             # Additional make flags passed to kbuild

     

       39
        
             extraMakeFlags ? [ ],

     

       40
        
       

     

       41
       +
             # enables the options in ./common-config.nix and lib/systems/platform.nix;

     

       42
       +
             # if `false` then only `structuredExtraConfig` is used

     

       43
        
             enableCommonConfig ? true

     

       44
        
       

     

       45
        
             , # kernel intermediate config overrides, as a set

     
···

       136
        
               configfile.moduleStructuredConfig.intermediateNixConfig

     

       137
        
               # extra config in legacy string format

     

       138
        
               + extraConfig

     

       139
       +
               # need the 'or ""' at the end in case enableCommonConfig = true and extraConfig is not present

     

       140
       +
               + lib.optionalString enableCommonConfig stdenv.hostPlatform.linux-kernel.extraConfig or "";

     

       141
        
       

     

       142
        
             structuredConfigFromPatches = map (

     

       143
        
               {

+15 -15

pkgs/os-specific/linux/kernel/kernels-org.json

···

       5
        
               "lts": false

     

       6
        
           },

     

       7
        
           "6.1": {

     

       8
       -
               "version": "6.1.148",

     

       9
       -
               "hash": "sha256:18c024bqqc3srzv2gva55p95yghjc6x3p3f54v3hziki4wx3v86r",

     

       10
       -
               "lts": false

     

       11
        
           },

     

       12
        
           "5.15": {

     

       13
       -
               "version": "5.15.189",

     

       14
       -
               "hash": "sha256:1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73",

     

       15
        
               "lts": true

     

       16
        
           },

     

       17
        
           "5.10": {

     

       18
       -
               "version": "5.10.240",

     

       19
       -
               "hash": "sha256:04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d",

     

       20
        
               "lts": true

     

       21
        
           },

     

       22
        
           "5.4": {

     

       23
       -
               "version": "5.4.296",

     

       24
       -
               "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx",

     

       25
        
               "lts": true

     

       26
        
           },

     

       27
        
           "6.6": {

     

       28
       -
               "version": "6.6.102",

     

       29
       -
               "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0",

     

       30
        
               "lts": true

     

       31
        
           },

     

       32
        
           "6.12": {

     

       33
       -
               "version": "6.12.43",

     

       34
       -
               "hash": "sha256:1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg",

     

       35
        
               "lts": true

     

       36
        
           },

     

       37
        
           "6.15": {

     
···

       40
        
               "lts": false

     

       41
        
           },

     

       42
        
           "6.16": {

     

       43
       -
               "version": "6.16.3",

     

       44
       -
               "hash": "sha256:118bg72mdrf75r36gki5zi18ynl2kcygrf24pwd58by1anh9nhw0",

     

       45
        
               "lts": false

     

       46
        
           }

     

       47
        
       }

···

       5
        
               "lts": false

     

       6
        
           },

     

       7
        
           "6.1": {

     

       8
       +
               "version": "6.1.149",

     

       9
       +
               "hash": "sha256:0fdyfxw80zhkwh29m5v7xfmbyks5wi6isdq6bv96cn4ssfw0dsf4",

     

       10
       +
               "lts": true

     

       11
        
           },

     

       12
        
           "5.15": {

     

       13
       +
               "version": "5.15.190",

     

       14
       +
               "hash": "sha256:0146lslj0my0mhcx7wfp984f270zr8iiyq9899v6f7cflkqi9f32",

     

       15
        
               "lts": true

     

       16
        
           },

     

       17
        
           "5.10": {

     

       18
       +
               "version": "5.10.241",

     

       19
       +
               "hash": "sha256:1mnqjvb1hmr7p035c66k3z0idirhsj9j5zwgb92gi0ac0s1fkh88",

     

       20
        
               "lts": true

     

       21
        
           },

     

       22
        
           "5.4": {

     

       23
       +
               "version": "5.4.297",

     

       24
       +
               "hash": "sha256:0hd8x32xgvj4qnc6cls0q21zfgvxxfz7xhbwgl48hxfggbmgq37i",

     

       25
        
               "lts": true

     

       26
        
           },

     

       27
        
           "6.6": {

     

       28
       +
               "version": "6.6.103",

     

       29
       +
               "hash": "sha256:13mi8blsw0gps586qbvh7ga5r9pv9jld4fkbp9vaaaz6qcwdv26j",

     

       30
        
               "lts": true

     

       31
        
           },

     

       32
        
           "6.12": {

     

       33
       +
               "version": "6.12.44",

     

       34
       +
               "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n",

     

       35
        
               "lts": true

     

       36
        
           },

     

       37
        
           "6.15": {

     
···

       40
        
               "lts": false

     

       41
        
           },

     

       42
        
           "6.16": {

     

       43
       +
               "version": "6.16.4",

     

       44
       +
               "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",

     

       45
        
               "lts": false

     

       46
        
           }

     

       47
        
       }

+8 -8

pkgs/servers/monitoring/grafana/default.nix

···

       28
        
         # stable is on an older patch-release of Go and then the build would fail

     

       29
        
         # after a backport.

     

       30
        
         patchGoVersion = ''

     

       31
       -
           find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do

     

       32
        
             substituteInPlace "$line" \

     

       33
       -
               --replace-fail "go 1.24.4" "go 1.24.0"

     

       34
        
           done

     

       35
        
           find . -name go.work -print0 | while IFS= read -r -d ''' line; do

     

       36
        
             substituteInPlace "$line" \

     

       37
       -
               --replace-fail "go 1.24.4" "go 1.24.0"

     

       38
        
           done

     

       39
        
           substituteInPlace Makefile \

     

       40
       -
             --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.0"

     

       41
        
         '';

     

       42
        
       in

     

       43
        
       buildGoModule rec {

     

       44
        
         pname = "grafana";

     

       45
       -
         version = "12.1.0";

     

       46
        
       

     

       47
        
         subPackages = [

     

       48
        
           "pkg/cmd/grafana"

     
···

       54
        
           owner = "grafana";

     

       55
        
           repo = "grafana";

     

       56
        
           rev = "v${version}";

     

       57
       -
           hash = "sha256-yraCuPLe68ryCgFzOZPL1H/JYynEvxijjgxMmQvcPZE=";

     

       58
        
         };

     

       59
        
       

     

       60
        
         # Fix build

     
···

       78
        
         missingHashes = ./missing-hashes.json;

     

       79
        
         offlineCache = yarn-berry_4.fetchYarnBerryDeps {

     

       80
        
           inherit src missingHashes;

     

       81
       -
           hash = "sha256-+0L68wHR2nCp1g1PqyLIYatc+CIbvLqVUDa7CoyV/fo=";

     

       82
        
         };

     

       83
        
       

     

       84
        
         disallowedRequisites = [ offlineCache ];

     

       85
        
       

     

       86
        
         postPatch = patchGoVersion;

     

       87
        
       

     

       88
       -
         vendorHash = "sha256-a31jJN1NIHihFwbtBuLzV4lRKYWv8GtIHh6EwVMWdbM=";

     

       89
        
       

     

       90
        
         proxyVendor = true;

     

       91

···

       28
        
         # stable is on an older patch-release of Go and then the build would fail

     

       29
        
         # after a backport.

     

       30
        
         patchGoVersion = ''

     

       31
       +
           find . -name go.mod -not -path "./.bingo/*" -and -not -path "./hack/*" -and -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do

     

       32
        
             substituteInPlace "$line" \

     

       33
       +
               --replace-fail "go 1.24.6" "go 1.24.0"

     

       34
        
           done

     

       35
        
           find . -name go.work -print0 | while IFS= read -r -d ''' line; do

     

       36
        
             substituteInPlace "$line" \

     

       37
       +
               --replace-fail "go 1.24.6" "go 1.24.0"

     

       38
        
           done

     

       39
        
           substituteInPlace Makefile \

     

       40
       +
             --replace-fail "GO_VERSION = 1.24.6" "GO_VERSION = 1.24.0"

     

       41
        
         '';

     

       42
        
       in

     

       43
        
       buildGoModule rec {

     

       44
        
         pname = "grafana";

     

       45
       +
         version = "12.1.1";

     

       46
        
       

     

       47
        
         subPackages = [

     

       48
        
           "pkg/cmd/grafana"

     
···

       54
        
           owner = "grafana";

     

       55
        
           repo = "grafana";

     

       56
        
           rev = "v${version}";

     

       57
       +
           hash = "sha256-41OqvOTHlP66UtAecrpeArKldj0DNxK1oxTtQEihbo8=";

     

       58
        
         };

     

       59
        
       

     

       60
        
         # Fix build

     
···

       78
        
         missingHashes = ./missing-hashes.json;

     

       79
        
         offlineCache = yarn-berry_4.fetchYarnBerryDeps {

     

       80
        
           inherit src missingHashes;

     

       81
       +
           hash = "sha256-51jCwnfWJoBICesM3SKiEvRC/Q1qUD310q59DucPdMs=";

     

       82
        
         };

     

       83
        
       

     

       84
        
         disallowedRequisites = [ offlineCache ];

     

       85
        
       

     

       86
        
         postPatch = patchGoVersion;

     

       87
        
       

     

       88
       +
         vendorHash = "sha256-9z3HqheXLNh3zfmp1A620vzzf5yZBUJsbj/cc6J+xTg=";

     

       89
        
       

     

       90
        
         proxyVendor = true;

     

       91

+18

pkgs/servers/monitoring/grafana/plugins/grafana-sentry-datasource/default.nix

···

       1
       +
       { grafanaPlugin, lib }:

     

       2
       +
       

     

       3
       +
       grafanaPlugin {

     

       4
       +
         pname = "grafana-sentry-datasource";

     

       5
       +
         version = "2.2.1";

     

       6
       +
         zipHash = {

     

       7
       +
           x86_64-linux = "sha256-6pjBUqUHXLLgFzfal/OKsMBVlVXxuRglOj3XRnnduRY=";

     

       8
       +
           aarch64-linux = "sha256-0kjxBnv34lRB5qeVOyik7qvlEsz7CYur9EyIDTe+AKM=";

     

       9
       +
           x86_64-darwin = "sha256-yHgF+XmJXnJjfPwabs1dsrnWvssTmYpeZUXUl+gQxfM=";

     

       10
       +
           aarch64-darwin = "sha256-ysLXSKG7q/u70NynYqKKRlYIl5rkYy0AMoza3sQSPNM=";

     

       11
       +
         };

     

       12
       +
         meta = {

     

       13
       +
           description = "Integrate Sentry data into Grafana";

     

       14
       +
           license = lib.licenses.asl20;

     

       15
       +
           maintainers = with lib.maintainers; [ arianvp ];

     

       16
       +
           platforms = lib.platforms.unix;

     

       17
       +
         };

     

       18
       +
       }

pkgs/servers/monitoring/grafana/plugins/plugins.nix

···

       23
        
         grafana-piechart-panel = callPackage ./grafana-piechart-panel { };

     

       24
        
         grafana-polystat-panel = callPackage ./grafana-polystat-panel { };

     

       25
        
         grafana-pyroscope-app = callPackage ./grafana-pyroscope-app { };

     

       0
        
       
     

       26
        
         grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };

     

       27
        
         marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { };

     

       28
        
         marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { };

···

       23
        
         grafana-piechart-panel = callPackage ./grafana-piechart-panel { };

     

       24
        
         grafana-polystat-panel = callPackage ./grafana-polystat-panel { };

     

       25
        
         grafana-pyroscope-app = callPackage ./grafana-pyroscope-app { };

     

       26
       +
         grafana-sentry-datasource = callPackage ./grafana-sentry-datasource { };

     

       27
        
         grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };

     

       28
        
         marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { };

     

       29
        
         marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { };

+4 -4

pkgs/servers/nextcloud/default.nix

···

       59
        
       in

     

       60
        
       {

     

       61
        
         nextcloud30 = generic {

     

       62
       -
           version = "30.0.13";

     

       63
       -
           hash = "sha256-viMmo689YHK08Uza05O5Y3qj3EDK9W/TgXXuo6j/j4Y=";

     

       64
        
           packages = nextcloud30Packages;

     

       65
        
         };

     

       66
        
       

     

       67
        
         nextcloud31 = generic {

     

       68
       -
           version = "31.0.7";

     

       69
       -
           hash = "sha256-ACpdA64Fp/DDBWlH1toLeaRNPXIPVyj+UVWgxaO07Gk=";

     

       70
        
           packages = nextcloud31Packages;

     

       71
        
         };

     

       72

···

       59
        
       in

     

       60
        
       {

     

       61
        
         nextcloud30 = generic {

     

       62
       +
           version = "30.0.14";

     

       63
       +
           hash = "sha256-LUT1nji4UE/98GhY9I+yVboTqsJONVzfR6Q+qiLY0EE=";

     

       64
        
           packages = nextcloud30Packages;

     

       65
        
         };

     

       66
        
       

     

       67
        
         nextcloud31 = generic {

     

       68
       +
           version = "31.0.8";

     

       69
       +
           hash = "sha256-YhF9t4P+d1Z3zotoD0tIwTuVkWV/7TtQi9w6MrQRXLA=";

     

       70
        
           packages = nextcloud31Packages;

     

       71
        
         };

     

       72

+18 -18

pkgs/servers/nextcloud/packages/30.json

···

       40
        
           ]

     

       41
        
         },

     

       42
        
         "contacts": {

     

       43
       -
           "hash": "sha256-D0p9ny3KeuBdWVirQUDb4gq+eCusZKrDxJ+UAjEJz84=",

     

       44
       -
           "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.4/contacts-v7.2.4.tar.gz",

     

       45
       -
           "version": "7.2.4",

     

       46
        
           "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",

     

       47
        
           "homepage": "https://github.com/nextcloud/contacts#readme",

     

       48
        
           "licenses": [

     
···

       210
        
           ]

     

       211
        
         },

     

       212
        
         "maps": {

     

       213
       -
           "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",

     

       214
       -
           "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",

     

       215
        
           "version": "1.6.0",

     

       216
        
           "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",

     

       217
        
           "homepage": "https://github.com/nextcloud/maps",

     
···

       250
        
           ]

     

       251
        
         },

     

       252
        
         "notes": {

     

       253
       -
           "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=",

     

       254
       -
           "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz",

     

       255
       -
           "version": "4.12.2",

     

       256
        
           "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",

     

       257
        
           "homepage": "https://github.com/nextcloud/notes",

     

       258
        
           "licenses": [

     
···

       270
        
           ]

     

       271
        
         },

     

       272
        
         "onlyoffice": {

     

       273
       -
           "hash": "sha256-Nj8siAeNyN/lyq+K5y92ZXMqRLmhawtR9Q6b5dq7LL0=",

     

       274
       -
           "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz",

     

       275
       -
           "version": "9.9.0",

     

       276
       -
           "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",

     

       277
        
           "homepage": "https://www.onlyoffice.com",

     

       278
        
           "licenses": [

     

       279
        
             "agpl"

     
···

       450
        
           ]

     

       451
        
         },

     

       452
        
         "user_saml": {

     

       453
       -
           "hash": "sha256-MS1+fiDTufQXtKCG/45B2hQEfAVbsZb+TZb74f4EvAE=",

     

       454
       -
           "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.6.0/user_saml-v6.6.0.tar.gz",

     

       455
       -
           "version": "6.6.0",

     

       456
        
           "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",

     

       457
        
           "homepage": "https://github.com/nextcloud/user_saml",

     

       458
        
           "licenses": [

     
···

       460
        
           ]

     

       461
        
         },

     

       462
        
         "whiteboard": {

     

       463
       -
           "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=",

     

       464
       -
           "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz",

     

       465
       -
           "version": "1.1.2",

     

       466
        
           "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",

     

       467
        
           "homepage": "https://github.com/nextcloud/whiteboard",

     

       468
        
           "licenses": [

···

       40
        
           ]

     

       41
        
         },

     

       42
        
         "contacts": {

     

       43
       +
           "hash": "sha256-A8dFfPee4Te1zbLaJfohuyxnMbaysmfDa3hicJnqfkM=",

     

       44
       +
           "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.5/contacts-v7.2.5.tar.gz",

     

       45
       +
           "version": "7.2.5",

     

       46
        
           "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",

     

       47
        
           "homepage": "https://github.com/nextcloud/contacts#readme",

     

       48
        
           "licenses": [

     
···

       210
        
           ]

     

       211
        
         },

     

       212
        
         "maps": {

     

       213
       +
           "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=",

     

       214
       +
           "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz",

     

       215
        
           "version": "1.6.0",

     

       216
        
           "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",

     

       217
        
           "homepage": "https://github.com/nextcloud/maps",

     
···

       250
        
           ]

     

       251
        
         },

     

       252
        
         "notes": {

     

       253
       +
           "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=",

     

       254
       +
           "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz",

     

       255
       +
           "version": "4.12.3",

     

       256
        
           "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",

     

       257
        
           "homepage": "https://github.com/nextcloud/notes",

     

       258
        
           "licenses": [

     
···

       270
        
           ]

     

       271
        
         },

     

       272
        
         "onlyoffice": {

     

       273
       +
           "hash": "sha256-JNAQQK1jA2RI3aDuIXw7NC047oXSZKkzkVjZbw8BxXs=",

     

       274
       +
           "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz",

     

       275
       +
           "version": "9.10.0",

     

       276
       +
           "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",

     

       277
        
           "homepage": "https://www.onlyoffice.com",

     

       278
        
           "licenses": [

     

       279
        
             "agpl"

     
···

       450
        
           ]

     

       451
        
         },

     

       452
        
         "user_saml": {

     

       453
       +
           "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=",

     

       454
       +
           "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz",

     

       455
       +
           "version": "7.0.0",

     

       456
        
           "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",

     

       457
        
           "homepage": "https://github.com/nextcloud/user_saml",

     

       458
        
           "licenses": [

     
···

       460
        
           ]

     

       461
        
         },

     

       462
        
         "whiteboard": {

     

       463
       +
           "hash": "sha256-oNu4q/s+77+h4xDhfwn4y3bQ6hxooj9gG2FC38EY8gY=",

     

       464
       +
           "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.3/whiteboard-v1.1.3.tar.gz",

     

       465
       +
           "version": "1.1.3",

     

       466
        
           "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",

     

       467
        
           "homepage": "https://github.com/nextcloud/whiteboard",

     

       468
        
           "licenses": [

+16 -16

pkgs/servers/nextcloud/packages/31.json

···

       40
        
           ]

     

       41
        
         },

     

       42
        
         "contacts": {

     

       43
       -
           "hash": "sha256-D0p9ny3KeuBdWVirQUDb4gq+eCusZKrDxJ+UAjEJz84=",

     

       44
       -
           "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.4/contacts-v7.2.4.tar.gz",

     

       45
       -
           "version": "7.2.4",

     

       46
        
           "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",

     

       47
        
           "homepage": "https://github.com/nextcloud/contacts#readme",

     

       48
        
           "licenses": [

     
···

       250
        
           ]

     

       251
        
         },

     

       252
        
         "notes": {

     

       253
       -
           "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=",

     

       254
       -
           "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz",

     

       255
       -
           "version": "4.12.2",

     

       256
        
           "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",

     

       257
        
           "homepage": "https://github.com/nextcloud/notes",

     

       258
        
           "licenses": [

     
···

       270
        
           ]

     

       271
        
         },

     

       272
        
         "onlyoffice": {

     

       273
       -
           "hash": "sha256-Nj8siAeNyN/lyq+K5y92ZXMqRLmhawtR9Q6b5dq7LL0=",

     

       274
       -
           "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz",

     

       275
       -
           "version": "9.9.0",

     

       276
       -
           "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",

     

       277
        
           "homepage": "https://www.onlyoffice.com",

     

       278
        
           "licenses": [

     

       279
        
             "agpl"

     
···

       450
        
           ]

     

       451
        
         },

     

       452
        
         "user_saml": {

     

       453
       -
           "hash": "sha256-MS1+fiDTufQXtKCG/45B2hQEfAVbsZb+TZb74f4EvAE=",

     

       454
       -
           "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.6.0/user_saml-v6.6.0.tar.gz",

     

       455
       -
           "version": "6.6.0",

     

       456
        
           "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",

     

       457
        
           "homepage": "https://github.com/nextcloud/user_saml",

     

       458
        
           "licenses": [

     
···

       460
        
           ]

     

       461
        
         },

     

       462
        
         "whiteboard": {

     

       463
       -
           "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=",

     

       464
       -
           "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz",

     

       465
       -
           "version": "1.1.2",

     

       466
        
           "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",

     

       467
        
           "homepage": "https://github.com/nextcloud/whiteboard",

     

       468
        
           "licenses": [

···

       40
        
           ]

     

       41
        
         },

     

       42
        
         "contacts": {

     

       43
       +
           "hash": "sha256-A8dFfPee4Te1zbLaJfohuyxnMbaysmfDa3hicJnqfkM=",

     

       44
       +
           "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.5/contacts-v7.2.5.tar.gz",

     

       45
       +
           "version": "7.2.5",

     

       46
        
           "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",

     

       47
        
           "homepage": "https://github.com/nextcloud/contacts#readme",

     

       48
        
           "licenses": [

     
···

       250
        
           ]

     

       251
        
         },

     

       252
        
         "notes": {

     

       253
       +
           "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=",

     

       254
       +
           "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz",

     

       255
       +
           "version": "4.12.3",

     

       256
        
           "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",

     

       257
        
           "homepage": "https://github.com/nextcloud/notes",

     

       258
        
           "licenses": [

     
···

       270
        
           ]

     

       271
        
         },

     

       272
        
         "onlyoffice": {

     

       273
       +
           "hash": "sha256-JNAQQK1jA2RI3aDuIXw7NC047oXSZKkzkVjZbw8BxXs=",

     

       274
       +
           "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz",

     

       275
       +
           "version": "9.10.0",

     

       276
       +
           "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",

     

       277
        
           "homepage": "https://www.onlyoffice.com",

     

       278
        
           "licenses": [

     

       279
        
             "agpl"

     
···

       450
        
           ]

     

       451
        
         },

     

       452
        
         "user_saml": {

     

       453
       +
           "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=",

     

       454
       +
           "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz",

     

       455
       +
           "version": "7.0.0",

     

       456
        
           "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",

     

       457
        
           "homepage": "https://github.com/nextcloud/user_saml",

     

       458
        
           "licenses": [

     
···

       460
        
           ]

     

       461
        
         },

     

       462
        
         "whiteboard": {

     

       463
       +
           "hash": "sha256-oNu4q/s+77+h4xDhfwn4y3bQ6hxooj9gG2FC38EY8gY=",

     

       464
       +
           "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.3/whiteboard-v1.1.3.tar.gz",

     

       465
       +
           "version": "1.1.3",

     

       466
        
           "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",

     

       467
        
           "homepage": "https://github.com/nextcloud/whiteboard",

     

       468
        
           "licenses": [

+2 -8

pkgs/servers/shishi/default.nix

···

       25
        
       in

     

       26
        
       stdenv.mkDerivation rec {

     

       27
        
         pname = "shishi";

     

       28
       -
         version = "1.0.2";

     

       29
        
       

     

       30
        
         src = fetchurl {

     

       31
        
           url = "mirror://gnu/shishi/shishi-${version}.tar.gz";

     

       32
       -
           sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";

     

       33
        
         };

     

       34
        
       

     

       35
        
         separateDebugInfo = true;

     

       36
       -
       

     

       37
       -
         # Fixes support for gcrypt 1.6+

     

       38
       -
         patches = [

     

       39
       -
           ./gcrypt-fix.patch

     

       40
       -
           ./freebsd-unistd.patch

     

       41
       -
         ];

     

       42
        
       

     

       43
        
         nativeBuildInputs = [ pkg-config ];

     

       44
        
         buildInputs = [

···

       25
        
       in

     

       26
        
       stdenv.mkDerivation rec {

     

       27
        
         pname = "shishi";

     

       28
       +
         version = "1.0.3";

     

       29
        
       

     

       30
        
         src = fetchurl {

     

       31
        
           url = "mirror://gnu/shishi/shishi-${version}.tar.gz";

     

       32
       +
           hash = "sha256-lXmP/RLdAaT4jgMR7gPKSibly05ekFmkDk/E2fKRfpI=";

     

       33
        
         };

     

       34
        
       

     

       35
        
         separateDebugInfo = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       36
        
       

     

       37
        
         nativeBuildInputs = [ pkg-config ];

     

       38
        
         buildInputs = [

-12

pkgs/servers/shishi/freebsd-unistd.patch

···

       1
       -
       diff --git a/gl/unistd.in.h b/gl/unistd.in.h

     

       2
       -
       index 2ea9af4..ed58960 100644

     

       3
       -
       --- a/gl/unistd.in.h

     

       4
       -
       +++ b/gl/unistd.in.h

     

       5
       -
       @@ -116,6 +116,7 @@

     

       6
       -
        # include <getopt.h>

     

       7
       -
        #endif

     

       8
       -
        

     

       9
       -
       +#include "config.h"

     

       10
       -
        _GL_INLINE_HEADER_BEGIN

     

       11
       -
        #ifndef _GL_UNISTD_INLINE

     

       12
       -
        # define _GL_UNISTD_INLINE _GL_INLINE

-34

pkgs/servers/shishi/gcrypt-fix.patch

···

       1
       -
       diff --git a/configure b/configure

     

       2
       -
       index c9a442b..a596bfe 100755

     

       3
       -
       --- a/configure

     

       4
       -
       +++ b/configure

     

       5
       -
       @@ -24491,12 +24491,6 @@ else

     

       6
       -
        /* end confdefs.h.  */

     

       7
       -
        

     

       8
       -
        #include <gcrypt.h>

     

       9
       -
       -/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c

     

       10
       -
       -   will fail on startup if we don't have 1.4.4 or later, so

     

       11
       -
       -   test for it early. */

     

       12
       -
       -#if !defined GCRY_MODULE_ID_USER

     

       13
       -
       -error too old libgcrypt

     

       14
       -
       -#endif

     

       15
       -
        

     

       16
       -
        int

     

       17
       -
        main ()

     

       18
       -
       diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4

     

       19
       -
       index b352e33..4bab9f4 100644

     

       20
       -
       --- a/gl/m4/gc.m4

     

       21
       -
       +++ b/gl/m4/gc.m4

     

       22
       -
       @@ -12,12 +12,6 @@ AC_DEFUN([gl_GC],

     

       23
       -
          if test "$libgcrypt" != no; then

     

       24
       -
            AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [

     

       25
       -
        #include <gcrypt.h>

     

       26
       -
       -/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c

     

       27
       -
       -   will fail on startup if we don't have 1.4.4 or later, so

     

       28
       -
       -   test for it early. */

     

       29
       -
       -#if !defined GCRY_MODULE_ID_USER

     

       30
       -
       -error too old libgcrypt

     

       31
       -
       -#endif

     

       32
       -
        ])

     

       33
       -
          fi

     

       34
       -
        ])

pkgs/top-level/aliases.nix

···

       2132
        
         SkypeExport = skypeexport; # Added 2024-06-12

     

       2133
        
         skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05

     

       2134
        
         slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17

     

       0
        
       
     

       2135
        
         slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26

     

       2136
        
         slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06

     

       2137
        
         sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17

···

       2132
        
         SkypeExport = skypeexport; # Added 2024-06-12

     

       2133
        
         skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05

     

       2134
        
         slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17

     

       2135
       +
         sladeUnstable = slade-unstable; # Added 2025-08-26

     

       2136
        
         slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26

     

       2137
        
         slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06

     

       2138
        
         sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17

-12

pkgs/top-level/all-packages.nix

···

       13830
        
       

     

       13831
        
         enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };

     

       13832
        
       

     

       13833
       -
         slade = callPackage ../games/doom-ports/slade {

     

       13834
       -
           wxGTK = wxGTK32.override {

     

       13835
       -
             withWebKit = true;

     

       13836
       -
           };

     

       13837
       -
         };

     

       13838
       -
       

     

       13839
       -
         sladeUnstable = callPackage ../games/doom-ports/slade/git.nix {

     

       13840
       -
           wxGTK = wxGTK32.override {

     

       13841
       -
             withWebKit = true;

     

       13842
       -
           };

     

       13843
       -
         };

     

       13844
       -
       

     

       13845
        
         zandronum = callPackage ../games/doom-ports/zandronum { };

     

       13846
        
       

     

       13847
        
         zandronum-server = zandronum.override {

···

       13830
        
       

     

       13831
        
         enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };

     

       13832
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13833
        
         zandronum = callPackage ../games/doom-ports/zandronum { };

     

       13834
        
       

     

       13835
        
         zandronum-server = zandronum.override {

+7 -1

pkgs/top-level/python-packages.nix

···

       1801
        
       

     

       1802
        
         bech32 = callPackage ../development/python-modules/bech32 { };

     

       1803
        
       

     

       1804
       -
         beetcamp = callPackage ../development/python-modules/beetcamp { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1805
        
       

     

       1806
        
         beewi-smartclim = callPackage ../development/python-modules/beewi-smartclim { };

     

       1807
        
       

     
···

       10796
        
         openai = callPackage ../development/python-modules/openai { };

     

       10797
        
       

     

       10798
        
         openai-agents = callPackage ../development/python-modules/openai-agents { };

     

       0
        
       
     

       0
        
       
     

       10799
        
       

     

       10800
        
         openai-whisper = callPackage ../development/python-modules/openai-whisper { };

     

       10801

···

       1801
        
       

     

       1802
        
         bech32 = callPackage ../development/python-modules/bech32 { };

     

       1803
        
       

     

       1804
       +
         beetcamp = callPackage ../development/python-modules/beetcamp {

     

       1805
       +
           beets = pkgs.beets.override {

     

       1806
       +
             python3Packages = self;

     

       1807
       +
           };

     

       1808
       +
         };

     

       1809
        
       

     

       1810
        
         beewi-smartclim = callPackage ../development/python-modules/beewi-smartclim { };

     

       1811
        
       

     
···

       10800
        
         openai = callPackage ../development/python-modules/openai { };

     

       10801
        
       

     

       10802
        
         openai-agents = callPackage ../development/python-modules/openai-agents { };

     

       10803
       +
       

     

       10804
       +
         openai-harmony = callPackage ../development/python-modules/openai-harmony { };

     

       10805
        
       

     

       10806
        
         openai-whisper = callPackage ../development/python-modules/openai-whisper { };

     

       10807