commit bc4dc97301bc9d3c6b0e86644f411a4b347bafcf · pyrox.dev/nixpkgs

+3 -3

pkgs/tools/package-management/nix/common.nix

···

       1
       1
        
       { lib, fetchFromGitHub

     

       2
       2
        
       , version

     

       3
       3
        
       , suffix ? ""

     

       4
       4
       -
       , sha256 ? null

     

       5
       5
       -
       , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; }

     

       4
       4
       +
       , hash ? null

     

       5
       5
       +
       , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; }

     

       6
       6
        
       , patches ? [ ]

     

       7
       7
        
       }:

     

       8
       8
       -
       assert (sha256 == null) -> (src != null);

     

       8
       8
       +
       assert (hash == null) -> (src != null);

     

       9
       9
        
       let

     

       10
       10
        
         atLeast24 = lib.versionAtLeast version "2.4pre";

     

       11
       11
        
         atLeast25 = lib.versionAtLeast version "2.5pre";

+17 -12

pkgs/tools/package-management/nix/default.nix

···

       32
       32
        
             owner = "aws";

     

       33
       33
        
             repo = "aws-sdk-cpp";

     

       34
       34
        
             rev = version;

     

       35
       35
       -
             sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";

     

       35
       35
       +
             hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";

     

       36
       36
        
           };

     

       37
       37
        
           postPatch = ''

     

       38
       38
        
             # Avoid blanket -Werror to evade build failures on less

     
···

       94
       94
        
         patch-monitorfdhup = fetchpatch2 {

     

       95
       95
        
           name = "nix-7585-monitor-fd-hup.patch";

     

       96
       96
        
           url = "https://github.com/NixOS/nix/commit/1df3d62c769dc68c279e89f68fdd3723ed3bcb5a.patch";

     

       97
       97
       -
           sha256 = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";

     

       97
       97
       +
           hash = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";

     

       98
       98
        
         };

     

       99
       99
        
       

     

       100
       100
        
         # https://github.com/NixOS/nix/pull/7473

     

       101
       101
        
         patch-sqlite-exception = fetchpatch2 {

     

       102
       102
        
           name = "nix-7473-sqlite-exception-add-message.patch";

     

       103
       103
        
           url = "https://github.com/hercules-ci/nix/commit/c965f35de71cc9d88f912f6b90fd7213601e6eb8.patch";

     

       104
       104
       -
           sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";

     

       104
       104
       +
           hash = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";

     

       105
       105
        
         };

     

       106
       106
        
       

     

       107
       107
        
         patch-non-existing-output = fetchpatch {

     

       108
       108
        
           # https://github.com/NixOS/nix/pull/7283

     

       109
       109
        
           name = "fix-requires-non-existing-output.patch";

     

       110
       110
        
           url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";

     

       111
       111
       -
           sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";

     

       111
       111
       +
           hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";

     

       112
       112
        
         };

     

       113
       113
        
       

     

       114
       114
        
       in lib.makeExtensible (self: {

     
···

       116
       116
        
           version = "2.3.16";

     

       117
       117
        
           src = fetchurl {

     

       118
       118
        
             url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";

     

       119
       119
       -
             sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";

     

       119
       119
       +
             hash = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";

     

       120
       120
        
           };

     

       121
       121
        
           patches = [

     

       122
       122
        
             patch-monitorfdhup

     
···

       137
       137
        
       

     

       138
       138
        
         nix_2_10 = common {

     

       139
       139
        
           version = "2.10.3";

     

       140
       140
       -
           sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";

     

       140
       140
       +
           hash = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";

     

       141
       141
        
           patches = [

     

       142
       142
        
             ./patches/flaky-tests.patch

     

       143
       143
        
             patch-non-existing-output

     
···

       148
       148
        
       

     

       149
       149
        
         nix_2_11 = common {

     

       150
       150
        
           version = "2.11.1";

     

       151
       151
       -
           sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk=";

     

       151
       151
       +
           hash = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk=";

     

       152
       152
        
           patches = [

     

       153
       153
        
             ./patches/flaky-tests.patch

     

       154
       154
        
             patch-non-existing-output

     
···

       159
       159
        
       

     

       160
       160
        
         nix_2_12 = common {

     

       161
       161
        
           version = "2.12.1";

     

       162
       162
       -
           sha256 = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU=";

     

       162
       162
       +
           hash = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU=";

     

       163
       163
        
           patches = [

     

       164
       164
        
             ./patches/flaky-tests.patch

     

       165
       165
        
             patch-monitorfdhup

     
···

       169
       169
        
       

     

       170
       170
        
         nix_2_13 = common {

     

       171
       171
        
           version = "2.13.3";

     

       172
       172
       -
           sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";

     

       172
       172
       +
           hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";

     

       173
       173
        
         };

     

       174
       174
        
       

     

       175
       175
        
         nix_2_14 = common {

     

       176
       176
        
           version = "2.14.1";

     

       177
       177
       -
           sha256 = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";

     

       177
       177
       +
           hash = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";

     

       178
       178
        
         };

     

       179
       179
        
       

     

       180
       180
        
         nix_2_15 = common {

     

       181
       181
        
           version = "2.15.1";

     

       182
       182
       -
           sha256 = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro=";

     

       182
       182
       +
           hash = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro=";

     

       183
       183
       +
         };

     

       184
       184
       +
       

     

       185
       185
       +
         nix_2_16 = common {

     

       186
       186
       +
           version = "2.16.0";

     

       187
       187
       +
           hash = "sha256-KjcQkI2HgbP7KOlHxb2DvyHISQXo2OExvvjqTyK7P0o=";

     

       183
       188
        
         };

     

       184
       189
        
       

     

       185
       190
        
         stable = self.nix_2_13;

     

       186
       191
        
       

     

       187
       187
       -
         unstable = self.nix_2_15;

     

       192
       192
       +
         unstable = self.nix_2_16;

     

       188
       193
        
       })