commit d4d107cf3db12beb0b9463d1e12a91748975fbaf · pyrox.dev/nixpkgs

+53

lib/fileset/default.nix

···

       9
       9
        
           _fileFilter

     

       10
       10
        
           _printFileset

     

       11
       11
        
           _intersection

     

       12
       12
       +
           _difference

     

       12
       13
        
           ;

     

       13
       14
        
       

     

       14
       15
        
         inherit (builtins)

     
···

       365
       366
        
             ];

     

       366
       367
        
           in

     

       367
       368
        
           _intersection

     

       369
       369
       +
             (elemAt filesets 0)

     

       370
       370
       +
             (elemAt filesets 1);

     

       371
       371
       +
       

     

       372
       372
       +
         /*

     

       373
       373
       +
           The file set containing all files from the first file set that are not in the second file set.

     

       374
       374
       +
           See also [Difference (set theory)](https://en.wikipedia.org/wiki/Complement_(set_theory)#Relative_complement).

     

       375
       375
       +
       

     

       376
       376
       +
           The given file sets are evaluated as lazily as possible,

     

       377
       377
       +
           with the first argument being evaluated first if needed.

     

       378
       378
       +
       

     

       379
       379
       +
           Type:

     

       380
       380
       +
             union :: FileSet -> FileSet -> FileSet

     

       381
       381
       +
       

     

       382
       382
       +
           Example:

     

       383
       383
       +
             # Create a file set containing all files from the current directory,

     

       384
       384
       +
             # except ones under ./tests

     

       385
       385
       +
             difference ./. ./tests

     

       386
       386
       +
       

     

       387
       387
       +
             let

     

       388
       388
       +
               # A set of Nix-related files

     

       389
       389
       +
               nixFiles = unions [ ./default.nix ./nix ./tests/default.nix ];

     

       390
       390
       +
             in

     

       391
       391
       +
             # Create a file set containing all files under ./tests, except ones in `nixFiles`,

     

       392
       392
       +
             # meaning only without ./tests/default.nix

     

       393
       393
       +
             difference ./tests nixFiles

     

       394
       394
       +
         */

     

       395
       395
       +
         difference =

     

       396
       396
       +
           # The positive file set.

     

       397
       397
       +
           # The result can only contain files that are also in this file set.

     

       398
       398
       +
           #

     

       399
       399
       +
           # This argument can also be a path,

     

       400
       400
       +
           # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).

     

       401
       401
       +
           positive:

     

       402
       402
       +
           # The negative file set.

     

       403
       403
       +
           # The result will never contain files that are also in this file set.

     

       404
       404
       +
           #

     

       405
       405
       +
           # This argument can also be a path,

     

       406
       406
       +
           # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).

     

       407
       407
       +
           negative:

     

       408
       408
       +
           let

     

       409
       409
       +
             filesets = _coerceMany "lib.fileset.difference" [

     

       410
       410
       +
               {

     

       411
       411
       +
                 context = "first argument (positive set)";

     

       412
       412
       +
                 value = positive;

     

       413
       413
       +
               }

     

       414
       414
       +
               {

     

       415
       415
       +
                 context = "second argument (negative set)";

     

       416
       416
       +
                 value = negative;

     

       417
       417
       +
               }

     

       418
       418
       +
             ];

     

       419
       419
       +
           in

     

       420
       420
       +
           _difference

     

       368
       421
        
             (elemAt filesets 0)

     

       369
       422
        
             (elemAt filesets 1);

     

       370
       423

+80

lib/fileset/internal.nix

···

       651
       651
        
             # In all other cases it's the rhs

     

       652
       652
        
             rhs;

     

       653
       653
        
       

     

       654
       654
       +
         # Compute the set difference between two file sets.

     

       655
       655
       +
         # The filesets must already be coerced and validated to be in the same filesystem root.

     

       656
       656
       +
         # Type: Fileset -> Fileset -> Fileset

     

       657
       657
       +
         _difference = positive: negative:

     

       658
       658
       +
           let

     

       659
       659
       +
             # The common base components prefix, e.g.

     

       660
       660
       +
             # (/foo/bar, /foo/bar/baz) -> /foo/bar

     

       661
       661
       +
             # (/foo/bar, /foo/baz) -> /foo

     

       662
       662
       +
             commonBaseComponentsLength =

     

       663
       663
       +
               # TODO: Have a `lib.lists.commonPrefixLength` function such that we don't need the list allocation from commonPrefix here

     

       664
       664
       +
               length (

     

       665
       665
       +
                 commonPrefix

     

       666
       666
       +
                   positive._internalBaseComponents

     

       667
       667
       +
                   negative._internalBaseComponents

     

       668
       668
       +
               );

     

       669
       669
       +
       

     

       670
       670
       +
             # We need filesetTree's with the same base to be able to compute the difference between them

     

       671
       671
       +
             # This here is the filesetTree from the negative file set, but for a base path that matches the positive file set.

     

       672
       672
       +
             # Examples:

     

       673
       673
       +
             # For `difference /foo /foo/bar`, `negativeTreeWithPositiveBase = { bar = "directory"; }`

     

       674
       674
       +
             #   because under the base path of `/foo`, only `bar` from the negative file set is included

     

       675
       675
       +
             # For `difference /foo/bar /foo`, `negativeTreeWithPositiveBase = "directory"`

     

       676
       676
       +
             #   because under the base path of `/foo/bar`, everything from the negative file set is included

     

       677
       677
       +
             # For `difference /foo /bar`, `negativeTreeWithPositiveBase = null`

     

       678
       678
       +
             #   because under the base path of `/foo`, nothing from the negative file set is included

     

       679
       679
       +
             negativeTreeWithPositiveBase =

     

       680
       680
       +
               if commonBaseComponentsLength == length positive._internalBaseComponents then

     

       681
       681
       +
                 # The common prefix is the same as the positive base path, so the second path is equal or longer.

     

       682
       682
       +
                 # We need to _shorten_ the negative filesetTree to the same base path as the positive one

     

       683
       683
       +
                 # E.g. for `difference /foo /foo/bar` the common prefix is /foo, equal to the positive file set's base

     

       684
       684
       +
                 # So we need to shorten the base of the tree for the negative argument from /foo/bar to just /foo

     

       685
       685
       +
                 _shortenTreeBase positive._internalBaseComponents negative

     

       686
       686
       +
               else if commonBaseComponentsLength == length negative._internalBaseComponents then

     

       687
       687
       +
                 # The common prefix is the same as the negative base path, so the first path is longer.

     

       688
       688
       +
                 # We need to lengthen the negative filesetTree to the same base path as the positive one.

     

       689
       689
       +
                 # E.g. for `difference /foo/bar /foo` the common prefix is /foo, equal to the negative file set's base

     

       690
       690
       +
                 # So we need to lengthen the base of the tree for the negative argument from /foo to /foo/bar

     

       691
       691
       +
                 _lengthenTreeBase positive._internalBaseComponents negative

     

       692
       692
       +
               else

     

       693
       693
       +
                 # The common prefix is neither the first nor the second path.

     

       694
       694
       +
                 # This means there's no overlap between the two file sets,

     

       695
       695
       +
                 # and nothing from the negative argument should get removed from the positive one

     

       696
       696
       +
                 # E.g for `difference /foo /bar`, we remove nothing to get the same as `/foo`

     

       697
       697
       +
                 null;

     

       698
       698
       +
       

     

       699
       699
       +
             resultingTree =

     

       700
       700
       +
               _differenceTree

     

       701
       701
       +
               positive._internalBase

     

       702
       702
       +
               positive._internalTree

     

       703
       703
       +
               negativeTreeWithPositiveBase;

     

       704
       704
       +
           in

     

       705
       705
       +
           # If the first file set is empty, we can never have any files in the result

     

       706
       706
       +
           if positive._internalIsEmptyWithoutBase then

     

       707
       707
       +
             _emptyWithoutBase

     

       708
       708
       +
           # If the second file set is empty, nothing gets removed, so the result is just the first file set

     

       709
       709
       +
           else if negative._internalIsEmptyWithoutBase then

     

       710
       710
       +
             positive

     

       711
       711
       +
           else

     

       712
       712
       +
             # We use the positive file set base for the result,

     

       713
       713
       +
             # because only files from the positive side may be included,

     

       714
       714
       +
             # which is what base path is for

     

       715
       715
       +
             _create positive._internalBase resultingTree;

     

       716
       716
       +
       

     

       717
       717
       +
         # Computes the set difference of two filesetTree's

     

       718
       718
       +
         # Type: Path -> filesetTree -> filesetTree

     

       719
       719
       +
         _differenceTree = path: lhs: rhs:

     

       720
       720
       +
           # If the lhs doesn't have any files, or the right hand side includes all files

     

       721
       721
       +
           if lhs == null || isString rhs then

     

       722
       722
       +
             # The result will always be empty

     

       723
       723
       +
             null

     

       724
       724
       +
           # If the right hand side has no files

     

       725
       725
       +
           else if rhs == null then

     

       726
       726
       +
             # The result is always the left hand side, because nothing gets removed

     

       727
       727
       +
             lhs

     

       728
       728
       +
           else

     

       729
       729
       +
             # Otherwise we always have two attribute sets to recurse into

     

       730
       730
       +
             mapAttrs (name: lhsValue:

     

       731
       731
       +
               _differenceTree (path + "/${name}") lhsValue (rhs.${name} or null)

     

       732
       732
       +
             ) (_directoryEntries path lhs);

     

       733
       733
       +
       

     

       654
       734
        
         _fileFilter = predicate: fileset:

     

       655
       735
        
           let

     

       656
       736
        
             recurse = path: tree:

+98

lib/fileset/tests.sh

···

       684
       684
        
       )

     

       685
       685
        
       checkFileset 'intersection (unions [ ./a/b ./c/d ./c/e ]) (unions [ ./a ./c/d/f ./c/e ])'

     

       686
       686
        
       

     

       687
       687
       +
       ## Difference

     

       688
       688
       +
       

     

       689
       689
       +
       # Subtracting something from itself results in nothing

     

       690
       690
       +
       tree=(

     

       691
       691
       +
           [a]=0

     

       692
       692
       +
       )

     

       693
       693
       +
       checkFileset 'difference ./. ./.'

     

       694
       694
       +
       

     

       695
       695
       +
       # The tree of the second argument should not be evaluated if not needed

     

       696
       696
       +
       checkFileset 'difference _emptyWithoutBase (_create ./. (abort "This should not be used!"))'

     

       697
       697
       +
       checkFileset 'difference (_create ./. null) (_create ./. (abort "This should not be used!"))'

     

       698
       698
       +
       

     

       699
       699
       +
       # Subtracting nothing gives the same thing back

     

       700
       700
       +
       tree=(

     

       701
       701
       +
           [a]=1

     

       702
       702
       +
       )

     

       703
       703
       +
       checkFileset 'difference ./. _emptyWithoutBase'

     

       704
       704
       +
       checkFileset 'difference ./. (_create ./. null)'

     

       705
       705
       +
       

     

       706
       706
       +
       # Subtracting doesn't influence the base path

     

       707
       707
       +
       mkdir a b

     

       708
       708
       +
       touch {a,b}/x

     

       709
       709
       +
       expectEqual 'toSource { root = ./a; fileset = difference ./a ./b; }' 'toSource { root = ./a; fileset = ./a; }'

     

       710
       710
       +
       rm -rf -- *

     

       711
       711
       +
       

     

       712
       712
       +
       # Also not the other way around

     

       713
       713
       +
       mkdir a

     

       714
       714
       +
       expectFailure 'toSource { root = ./a; fileset = difference ./. ./a; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions:

     

       715
       715
       +
       \s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path.

     

       716
       716
       +
       \s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.'

     

       717
       717
       +
       rm -rf -- *

     

       718
       718
       +
       

     

       719
       719
       +
       # Difference actually works

     

       720
       720
       +
       # We test all combinations of ./., ./a, ./a/x and ./b

     

       721
       721
       +
       tree=(

     

       722
       722
       +
           [a/x]=0

     

       723
       723
       +
           [a/y]=0

     

       724
       724
       +
           [b]=0

     

       725
       725
       +
           [c]=0

     

       726
       726
       +
       )

     

       727
       727
       +
       checkFileset 'difference ./. ./.'

     

       728
       728
       +
       checkFileset 'difference ./a ./.'

     

       729
       729
       +
       checkFileset 'difference ./a/x ./.'

     

       730
       730
       +
       checkFileset 'difference ./b ./.'

     

       731
       731
       +
       checkFileset 'difference ./a ./a'

     

       732
       732
       +
       checkFileset 'difference ./a/x ./a'

     

       733
       733
       +
       checkFileset 'difference ./a/x ./a/x'

     

       734
       734
       +
       checkFileset 'difference ./b ./b'

     

       735
       735
       +
       tree=(

     

       736
       736
       +
           [a/x]=0

     

       737
       737
       +
           [a/y]=0

     

       738
       738
       +
           [b]=1

     

       739
       739
       +
           [c]=1

     

       740
       740
       +
       )

     

       741
       741
       +
       checkFileset 'difference ./. ./a'

     

       742
       742
       +
       tree=(

     

       743
       743
       +
           [a/x]=1

     

       744
       744
       +
           [a/y]=1

     

       745
       745
       +
           [b]=0

     

       746
       746
       +
           [c]=0

     

       747
       747
       +
       )

     

       748
       748
       +
       checkFileset 'difference ./a ./b'

     

       749
       749
       +
       tree=(

     

       750
       750
       +
           [a/x]=1

     

       751
       751
       +
           [a/y]=0

     

       752
       752
       +
           [b]=0

     

       753
       753
       +
           [c]=0

     

       754
       754
       +
       )

     

       755
       755
       +
       checkFileset 'difference ./a/x ./b'

     

       756
       756
       +
       tree=(

     

       757
       757
       +
           [a/x]=0

     

       758
       758
       +
           [a/y]=1

     

       759
       759
       +
           [b]=0

     

       760
       760
       +
           [c]=0

     

       761
       761
       +
       )

     

       762
       762
       +
       checkFileset 'difference ./a ./a/x'

     

       763
       763
       +
       tree=(

     

       764
       764
       +
           [a/x]=0

     

       765
       765
       +
           [a/y]=0

     

       766
       766
       +
           [b]=1

     

       767
       767
       +
           [c]=0

     

       768
       768
       +
       )

     

       769
       769
       +
       checkFileset 'difference ./b ./a'

     

       770
       770
       +
       checkFileset 'difference ./b ./a/x'

     

       771
       771
       +
       tree=(

     

       772
       772
       +
           [a/x]=0

     

       773
       773
       +
           [a/y]=1

     

       774
       774
       +
           [b]=1

     

       775
       775
       +
           [c]=1

     

       776
       776
       +
       )

     

       777
       777
       +
       checkFileset 'difference ./. ./a/x'

     

       778
       778
       +
       tree=(

     

       779
       779
       +
           [a/x]=1

     

       780
       780
       +
           [a/y]=1

     

       781
       781
       +
           [b]=0

     

       782
       782
       +
           [c]=1

     

       783
       783
       +
       )

     

       784
       784
       +
       checkFileset 'difference ./. ./b'

     

       687
       785
        
       

     

       688
       786
        
       ## File filter

     

       689
       787

+8 -2

lib/tests/filesystem.sh

···

       64
       64
        
       expectSuccess "pathType $PWD/regular" '"regular"'

     

       65
       65
        
       expectSuccess "pathType $PWD/symlink" '"symlink"'

     

       66
       66
        
       expectSuccess "pathType $PWD/fifo" '"unknown"'

     

       67
       67
       -
       # Different errors depending on whether the builtins.readFilePath primop is available or not

     

       68
       68
       -
       expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)"

     

       67
       67
       +
       

     

       68
       68
       +
       # Only check error message when a Nixpkgs-specified error is thrown,

     

       69
       69
       +
       # which is only the case when `readFileType` is not available

     

       70
       70
       +
       # and the fallback implementation needs to be used.

     

       71
       71
       +
       if [[ "$(nix-instantiate --eval --expr 'builtins ? readFileType')" == false ]]; then

     

       72
       72
       +
           expectFailure "pathType $PWD/non-existent" \

     

       73
       73
       +
               "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'"

     

       74
       74
       +
       fi

     

       69
       75
        
       

     

       70
       76
        
       expectSuccess "pathIsDirectory /." "true"

     

       71
       77
        
       expectSuccess "pathIsDirectory $PWD/directory" "true"

+6

maintainers/maintainer-list.nix

···

       17167
       17167
        
           githubId = 7075751;

     

       17168
       17168
        
           name = "Patrick Hilhorst";

     

       17169
       17169
        
         };

     

       17170
       17170
       +
         sysedwinistrator = {

     

       17171
       17171
       +
           email = "edwin.mowen@gmail.com";

     

       17172
       17172
       +
           github = "sysedwinistrator";

     

       17173
       17173
       +
           githubId = 71331875;

     

       17174
       17174
       +
           name = "Edwin Mackenzie-Owen";

     

       17175
       17175
       +
         };

     

       17170
       17176
        
         szczyp = {

     

       17171
       17177
        
           email = "qb@szczyp.com";

     

       17172
       17178
        
           github = "Szczyp";

+1 -1

nixos/tests/predictable-interface-names.nix

···

       36
       36
        
             networking.useDHCP = !withNetworkd;

     

       37
       37
        
       

     

       38
       38
        
             # Check if predictable interface names are working in stage-1

     

       39
       39
       -
             boot.initrd.postDeviceCommands = script;

     

       39
       39
       +
             boot.initrd.postDeviceCommands = lib.mkIf (!systemdStage1) script;

     

       40
       40
        
       

     

       41
       41
        
             boot.initrd.systemd = lib.mkIf systemdStage1 {

     

       42
       42
        
               enable = true;

+3 -3

pkgs/applications/audio/reaper/default.nix

···

       25
       25
        
       in

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
        
         pname = "reaper";

     

       28
       28
       -
         version = "7.0";

     

       28
       28
       +
         version = "7.02";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = url_for_platform version stdenv.hostPlatform.qemuArch;

     

       32
       32
        
           hash = {

     

       33
       33
       -
             x86_64-linux = "sha256-lHXy1xSwhNht6dt30e35nE1ZpOm8oTMMpoZJI7ELsjg=";

     

       34
       34
       -
             aarch64-linux = "sha256-a/e8DQ9NvbLyZHqg7pUxm+kV7i5vKCjeq9EOO0/5TJk=";

     

       33
       33
       +
             x86_64-linux = "sha256-86BGWaZ+zkxgC1Tz14lkBniwhs26G4EPpG2LjsSe9io=";

     

       34
       34
       +
             aarch64-linux = "sha256-kJfy4ji5YBv5ztilkAIuPswu3O9pwBL0coD6wU1gU5c=";

     

       35
       35
        
           }.${stdenv.hostPlatform.system};

     

       36
       36
        
         };

     

       37
       37

+3 -3

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

···

       167
       167
        
         mkTerraform = attrs: pluggable (generic attrs);

     

       168
       168
        
       

     

       169
       169
        
         terraform_1 = mkTerraform {

     

       170
       170
       -
           version = "1.6.2";

     

       171
       171
       -
           hash = "sha256-24B8YlorL00OqmYYVM1xg5dM9hZ4enDWJ1XIGmeEAiM=";

     

       172
       172
       -
           vendorHash = "sha256-fIirGWt4Os2uZHo4ui7wmZEp+DRUHu/0p+cQCbUbzjc=";

     

       170
       170
       +
           version = "1.6.3";

     

       171
       171
       +
           hash = "sha256-2ai0WAknz4rt33BuBoqnTCsfPNHmet9+PdgYeeJKQkQ=";

     

       172
       172
       +
           vendorHash = "sha256-ZtaXUX0PgL1nwXgohcfCyj/fLPAodx8amHEsQnlOQrc=";

     

       173
       173
        
           patches = [ ./provider-path-0_15.patch ];

     

       174
       174
        
           passthru = {

     

       175
       175
        
             inherit plugins;

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gh";

     

       5
       5
       -
         version = "2.37.0";

     

       5
       5
       +
         version = "2.38.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cli";

     

       9
       9
        
           repo = "cli";

     

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

     

       11
       11
       -
           hash = "sha256-EAvBPUm2U31gzpfyjEPClT1lbBYiITXpdc+T3nUMOeg=";

     

       11
       11
       +
           hash = "sha256-t+JpCxJM2PO9nT9nYn/Rsz/s2lQQviggbjuEy0OQV88=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-G3cpR5S+upk3js5anZHXxcRayTEGMqnBpmtp4HO0pjQ=";

     

       14
       14
       +
         vendorHash = "sha256-XZhZDYdbjA/1g7/mPxm5u1b+z/TmwoH60/sJZ63LQMg=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17
       17

+2 -6

pkgs/applications/video/streamlink/default.nix

···

       6
       6
        
       

     

       7
       7
        
       python3Packages.buildPythonApplication rec {

     

       8
       8
        
         pname = "streamlink";

     

       9
       9
       -
         version = "6.2.1";

     

       9
       9
       +
         version = "6.3.1";

     

       10
       10
        
         format = "pyproject";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI=";

     

       14
       14
       +
           hash = "sha256-k8Dfrl0Xie5zF/GhVdP/RKGajDyGblAwu49UekX1WEQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeCheckInputs = with python3Packages; [

     
···

       21
       21
        
           freezegun

     

       22
       22
        
           pytest-asyncio

     

       23
       23
        
           pytest-trio

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       26
       -
         nativeBuildInputs = with python3Packages; [

     

       27
       27
       -
           versioningit

     

       28
       24
        
         ];

     

       29
       25
        
       

     

       30
       26
        
         propagatedBuildInputs = (with python3Packages; [

+2 -2

pkgs/applications/virtualization/crun/default.nix

···

       39
       39
        
       in

     

       40
       40
        
       stdenv.mkDerivation rec {

     

       41
       41
        
         pname = "crun";

     

       42
       42
       -
         version = "1.11";

     

       42
       42
       +
         version = "1.11.1";

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

     

       45
       45
        
           owner = "containers";

     

       46
       46
        
           repo = pname;

     

       47
       47
        
           rev = version;

     

       48
       48
       -
           hash = "sha256-38IqVt/XZeZQRXjiPNz4qDibBHMBVZwzAcxrobzEWdI=";

     

       48
       48
       +
           hash = "sha256-D4Y+n/6R2v3U/BhYQitsHd6ckda1vfAzciFbTM/1J80=";

     

       49
       49
        
           fetchSubmodules = true;

     

       50
       50
        
         };

     

       51
       51

+2 -2

pkgs/applications/virtualization/runc/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildGoModule rec {

     

       16
       16
        
         pname = "runc";

     

       17
       17
       -
         version = "1.1.9";

     

       17
       17
       +
         version = "1.1.10";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "opencontainers";

     

       21
       21
        
           repo = "runc";

     

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

     

       23
       23
       -
           hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo=";

     

       23
       23
       +
           hash = "sha256-YoRwr5imolblix1st/YeVTrAUdQXTqrx1BdNMdYlt/0=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         vendorHash = null;

+42

pkgs/by-name/co/cosmic-icons/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenvNoCC

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , just

     

       5
       5
       +
       , pop-icon-theme

     

       6
       6
       +
       , hicolor-icon-theme

     

       7
       7
       +
       }:

     

       8
       8
       +
       stdenvNoCC.mkDerivation rec {

     

       9
       9
       +
         pname = "cosmic-icons";

     

       10
       10
       +
         version = "unstable-2023-08-30";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "pop-os";

     

       14
       14
       +
           repo = pname;

     

       15
       15
       +
           rev = "14d8e2048087be1ad444f9b3ebb75885509f72c6";

     

       16
       16
       +
           sha256 = "sha256-WbdgHmTn403x95x9wEYL0T9ksbN+YLzEB2yE0UrF9T0=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ just ];

     

       20
       20
       +
       

     

       21
       21
       +
         justFlags = [

     

       22
       22
       +
           "--set"

     

       23
       23
       +
           "prefix"

     

       24
       24
       +
           (placeholder "out")

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           pop-icon-theme

     

       29
       29
       +
           hicolor-icon-theme

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         dontDropIconThemeCache = true;

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "System76 Cosmic icon theme for Linux";

     

       36
       36
       +
           homepage = "https://github.com/pop-os/cosmic-icons";

     

       37
       37
       +
           license = with licenses; [

     

       38
       38
       +
             cc-by-sa-40

     

       39
       39
       +
           ];

     

       40
       40
       +
           maintainers = with maintainers; [ a-kenji ];

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+2 -2

pkgs/development/compilers/owl-lisp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "owl-lisp";

     

       5
       5
       -
         version = "0.2.1";

     

       5
       5
       +
         version = "0.2.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner  = "owl-lisp";

     

       9
       9
        
           repo   = "owl";

     

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

     

       11
       11
       -
           sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A=";

     

       11
       11
       +
           sha256 = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ which ];

+2 -2

pkgs/development/misc/brev-cli/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "brev-cli";

     

       8
       8
       -
         version = "0.6.262";

     

       8
       8
       +
         version = "0.6.264";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "brevdev";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-JzAhoeEwSqeZOVXZCVw/MmpUMh/ufEa8CdOYc1mvReY=";

     

       14
       14
       +
           sha256 = "sha256-bE1tQgFg01FsR/rYgKZCDkhor0NZrHN3ACDbXHcpO6Q=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";

+5 -3

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

···

       222
       222
        
           "test_binops"

     

       223
       223
        
           # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.

     

       224
       224
        
           "test_rolling"

     

       225
       225
       +
         ] ++ lib.optional stdenv.is32bit [

     

       226
       226
       +
           # https://github.com/pandas-dev/pandas/issues/37398

     

       227
       227
       +
           "test_rolling_var_numerical_issues"

     

       225
       228
        
         ];

     

       226
       229
        
       

     

       227
       230
        
         # Tests have relative paths, and need to reference compiled C extensions

     
···

       246
       249
        
         ];

     

       247
       250
        
       

     

       248
       251
        
         meta = with lib; {

     

       249
       249
       -
           # https://github.com/pandas-dev/pandas/issues/14866

     

       250
       250
       -
           # pandas devs are no longer testing i686 so safer to assume it's broken

     

       251
       251
       -
           broken = stdenv.isi686;

     

       252
       252
       +
           # pandas devs no longer test i686, it's commonly broken

     

       253
       253
       +
           # broken = stdenv.isi686;

     

       252
       254
        
           changelog = "https://pandas.pydata.org/docs/whatsnew/index.html";

     

       253
       255
        
           description = "Powerful data structures for data analysis, time series, and statistics";

     

       254
       256
        
           downloadPage = "https://github.com/pandas-dev/pandas";

+7 -2

pkgs/development/tools/bbin/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenvNoCC

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , gitUpdater

     

       4
       5
        
       , makeWrapper

     

       5
       6
        
       , babashka-unwrapped

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       stdenvNoCC.mkDerivation rec {

     

       9
       10
        
         pname = "bbin";

     

       10
       10
       -
         version = "0.1.5";

     

       11
       11
       +
         version = "0.2.1";

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "babashka";

     

       14
       15
        
           repo = "bbin";

     

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

     

       16
       16
       -
           sha256 = "sha256-5hohAr6a8C9jPwhQi3E66onSa6+P9plS939fQM/fl9Q=";

     

       17
       17
       +
           sha256 = "sha256-mF8+Fm1vwLUw5l2PqV+vFFlr6y2JpKBwc+J3PdKQ6Fo=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         nativeBuildInputs = [ makeWrapper ];

     
···

       32
       33
        
       

     

       33
       34
        
           runHook postInstall

     

       34
       35
        
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         passthru = {

     

       38
       38
       +
           updateScript = gitUpdater { rev-prefix = "v"; };

     

       39
       39
       +
         };

     

       35
       40
        
       

     

       36
       41
        
         meta = with lib; {

     

       37
       42
        
           homepage = "https://github.com/babashka/bbin";

+3 -3

pkgs/development/tools/fblog/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "fblog";

     

       5
       5
       -
         version = "4.4.0";

     

       5
       5
       +
         version = "4.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "brocode";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-f4iJ9Fp6Rd1jv2ywRCjvFHjbdCGb116NiQ42fvQUE8A=";

     

       11
       11
       +
           hash = "sha256-T0NvcNg2UeUpEf1hjSdoaUkIzCAP29vo6edfeno/oyo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-dt8OMlqNxd78sDxMPHG6jHEmF4LuFIMSo0BuQDWOM6o=";

     

       14
       14
       +
         cargoHash = "sha256-3/j/TjsQjXFe+rTfCncjoownXzaUiUBUkCXbFc5RM2o=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "A small command-line JSON log viewer";

+26

pkgs/development/tools/language-servers/jq-lsp/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildGoModule {

     

       7
       7
       +
         pname = "jq-lsp";

     

       8
       8
       +
         version = "unstable-2023-10-27";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "wader";

     

       12
       12
       +
           repo = "jq-lsp";

     

       13
       13
       +
           rev = "b4707e7776a4eb3093b1a7533ebd41368240095a";

     

       14
       14
       +
           hash = "sha256-AU4xGweeFx+kSsrqkTtSjl+N77cITF/qvAVZGUZY5SE=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw=";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "jq language server";

     

       21
       21
       +
           homepage = "https://github.com/wader/jq-lsp";

     

       22
       22
       +
           license = licenses.mit;

     

       23
       23
       +
           maintainers = with maintainers; [ sysedwinistrator ];

     

       24
       24
       +
           mainProgram = "jq-lsp";

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+21 -6

pkgs/development/tools/spring-boot-cli/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }:

     

       1
       1
       +
       { lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils, testers, gitUpdater }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       3
       3
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       4
        
         pname = "spring-boot-cli";

     

       5
       5
       -
         version = "2.3.2";

     

       5
       5
       +
         version = "3.1.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
       -
           url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip";

     

       9
       9
       -
           sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq";

     

       8
       8
       +
           url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip";

     

       9
       9
       +
           hash = "sha256-5Q6bAuEEBkiRHjX8Ie5FFhPfzwKRdlNIQucTqDEIZuQ=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper installShellFiles ];

     
···

       24
       24
        
           runHook postInstall

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       +
         passthru = {

     

       28
       28
       +
           tests.version = testers.testVersion {

     

       29
       29
       +
             package = finalAttrs.finalPackage;

     

       30
       30
       +
             command = "${lib.getExe finalAttrs.finalPackage} --version";

     

       31
       31
       +
             version = "v${finalAttrs.version}";

     

       32
       32
       +
           };

     

       33
       33
       +
           updateScript = gitUpdater {

     

       34
       34
       +
             url = "https://github.com/spring-projects/spring-boot";

     

       35
       35
       +
             ignoredVersions = ".*-(RC|M).*";

     

       36
       36
       +
             rev-prefix = "v";

     

       37
       37
       +
           };

     

       38
       38
       +
         };

     

       39
       39
       +
       

     

       27
       40
        
         meta = with lib; {

     

       28
       41
        
           description = ''

     

       29
       42
        
             CLI which makes it easy to create spring-based applications

     
···

       40
       53
        
             a command line tool that runs “spring scripts”.

     

       41
       54
        
           '';

     

       42
       55
        
           homepage = "https://spring.io/projects/spring-boot";

     

       56
       56
       +
           changelog = "https://github.com/spring-projects/spring-boot/releases/tag/v${finalAttrs.version}";

     

       43
       57
        
           sourceProvenance = with sourceTypes; [ binaryBytecode ];

     

       58
       58
       +
           mainProgram = "spring";

     

       44
       59
        
           license = licenses.asl20;

     

       45
       60
        
           platforms = platforms.all;

     

       46
       61
        
           maintainers = with maintainers; [ moaxcp ];

     

       47
       62
        
         };

     

       48
       48
       -
       }

     

       63
       63
       +
       })

+30

pkgs/servers/sql/postgresql/ext/pg_embedding.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, postgresql }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "pg_embedding";

     

       5
       5
       +
         version = "0.3.6";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "neondatabase";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           hash = "sha256-NTBxsQB8mR7e/CWwkCEyDiYhi3Nxl/aKgRBwqc0THcI=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ postgresql ];

     

       15
       15
       +
       

     

       16
       16
       +
         installPhase = ''

     

       17
       17
       +
           install -D -t $out/lib *.so

     

       18
       18
       +
           install -D -t $out/share/postgresql/extension *.sql

     

       19
       19
       +
           install -D -t $out/share/postgresql/extension *.control

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "PostgreSQL extension implementing the HNSW algorithm for vector similarity search";

     

       24
       24
       +
           homepage = "https://github.com/neondatabase/pg_embedding";

     

       25
       25
       +
           maintainers = with maintainers; [ ivan ];

     

       26
       26
       +
           platforms = postgresql.meta.platforms;

     

       27
       27
       +
           license = licenses.asl20;

     

       28
       28
       +
           broken = versionOlder postgresql.version "12";

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+2

pkgs/servers/sql/postgresql/packages.nix

···

       18
       18
        
       

     

       19
       19
        
           pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { };

     

       20
       20
        
       

     

       21
       21
       +
           pg_embedding = super.callPackage ./ext/pg_embedding.nix { };

     

       22
       22
       +
       

     

       21
       23
        
           pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { };

     

       22
       24
        
       

     

       23
       25
        
           pg_ivm = super.callPackage ./ext/pg_ivm.nix { };

+3 -3

pkgs/tools/admin/triton/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildNpmPackage rec {

     

       10
       10
        
         pname = "triton";

     

       11
       11
       -
         version = "7.15.4";

     

       11
       11
       +
         version = "7.16.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "TritonDataCenter";

     

       15
       15
        
           repo = "node-triton";

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-RjYJT8Iw9JZzvd2d9zh2CS27qUx12nDi12k+YuTh7tk=";

     

       17
       17
       +
           hash = "sha256-JjQAf1pbNraatWvrfys3ydqk3FPOoJ5XWJH/4qgfINk=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         npmDepsHash = "sha256-2ZTTgJ4LzmlfFoNNNPrrmna5pbREshdw5x9w5N7nasc=";

     

       20
       20
       +
         npmDepsHash = "sha256-E5yJwLSNLkK3OfwJrm59C4qfrd2y3nw/45B68MVBqV8=";

     

       21
       21
        
       

     

       22
       22
        
         dontBuild = true;

     

       23
       23

+2 -2

pkgs/tools/admin/wander/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "wander";

     

       5
       5
       -
         version = "0.11.1";

     

       5
       5
       +
         version = "0.11.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "robinovitch61";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-EIMHCal4jt8tMEfx2Lol2/7IK8uROaNC1ABB+0d0YTg=";

     

       11
       11
       +
           sha256 = "sha256-zAvPtTUrSHeIMy9MgJviyMvMJ0Ny5Nkx6oLwWPSc9bE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-SqDGXV8MpvEQFAkcE1NWvWjdzYsvbO5vA6k+hpY0js0=";

+2 -2

pkgs/tools/text/ispell/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "ispell";

     

       5
       5
       -
         version = "3.4.05";

     

       5
       5
       +
         version = "3.4.06";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-zwxt7eP9JfraQ3XYasr+WDy5bY/lRt50apLrtt+JVgI=";

     

       9
       9
       +
           sha256 = "sha256-F8kWM9TIB1rMUDFjoWRj/FSrHHRTKArTnNPbdceD66Y=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ bison ncurses ];

+2

pkgs/top-level/all-packages.nix

···

       40456
       40456
        
       

     

       40457
       40457
        
         j2cli = with python3Packages; toPythonApplication j2cli;

     

       40458
       40458
        
       

     

       40459
       40459
       +
         jq-lsp = callPackage ../development/tools/language-servers/jq-lsp { };

     

       40460
       40460
       +
       

     

       40459
       40461
        
         jquake = callPackage ../applications/misc/jquake { };

     

       40460
       40462
        
       

     

       40461
       40463
        
         jstest-gtk = callPackage ../tools/misc/jstest-gtk { };