commit 1e6d3c55f0a11e85cd22d361ce02da351f833d5a · pyrox.dev/nixpkgs

+10 -13

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

···

       77
       77
        
       

     

       78
       78
        
             propagatedBuildInputs = [ boehmgc ];

     

       79
       79
        
       

     

       80
       80
       -
             # Seems to be required when using std::atomic with 64-bit types

     

       81
       81
       -
             NIX_LDFLAGS =

     

       82
       82
       -
               # need to list libraries individually until

     

       80
       80
       +
             NIX_LDFLAGS = lib.optionals (!is24) [

     

       83
       81
        
               # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba

     

       84
       84
       -
               # is in a release

     

       85
       85
       -
                 lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto"

     

       86
       86
       -
       

     

       87
       87
       -
               # need to detect it here until

     

       82
       82
       +
               (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto")

     

       88
       83
        
               # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8

     

       89
       89
       -
               # is in a release

     

       90
       90
       -
               + lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic";

     

       84
       84
       +
               (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic")

     

       85
       85
       +
             ];

     

       91
       86
        
       

     

       92
       87
        
             preConfigure =

     

       93
       88
        
               # Copy libboost_context so we don't get all of Boost in our closure.

     
···

       152
       147
        
               export TMPDIR=$NIX_BUILD_TOP

     

       153
       148
        
             '';

     

       154
       149
        
       

     

       155
       155
       -
             separateDebugInfo = stdenv.isLinux;

     

       150
       150
       +
             separateDebugInfo = stdenv.isLinux && (is24 -> !enableStatic);

     

       156
       151
        
       

     

       157
       152
        
             enableParallelBuilding = true;

     

       158
       153
        
       

     
···

       218
       213
        
       

     

       219
       214
        
         nix = nixStable;

     

       220
       215
        
       

     

       221
       221
       -
         nixStable = callPackage common (rec {

     

       216
       216
       +
         nixStable = nix_2_3;

     

       217
       217
       +
       

     

       218
       218
       +
         nix_2_3 = callPackage common (rec {

     

       222
       219
        
           pname = "nix";

     

       223
       220
        
           version = "2.3.16";

     

       224
       221
        
           src = fetchurl {

     
···

       233
       230
        
       

     

       234
       231
        
         nix_2_4 = callPackage common (rec {

     

       235
       232
        
           pname = "nix";

     

       236
       236
       -
           version = "2.4pre-rc1";

     

       233
       233
       +
           version = "2.4";

     

       237
       234
        
       

     

       238
       235
        
           src = fetchFromGitHub {

     

       239
       236
        
             owner = "NixOS";

     

       240
       237
        
             repo = "nix";

     

       241
       238
        
             rev = version;

     

       242
       242
       -
             sha256 = "sha256-KOb8etMm5LksvT2l+CkvqzMO1bgmo9tJmyaNh0LvaR8=";

     

       239
       239
       +
             sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k=";

     

       243
       240
        
           };

     

       244
       241
        
       

     

       245
       242
        
           boehmgc = boehmgc_nixUnstable;

+1 -1

pkgs/top-level/aliases.nix

···

       590
       590
        
         nginxUnstable = nginxMainline; # added 2018-04-25

     

       591
       591
        
         nilfs_utils = nilfs-utils; # added 2018-04-25

     

       592
       592
        
         nix-review = nixpkgs-review; # added 2019-12-22

     

       593
       593
       -
         nixFlakes = nixUnstable; # added 2021-05-21

     

       593
       593
       +
         nixFlakes = nix_2_4; # added 2021-05-21

     

       594
       594
        
         nmap_graphical = nmap-graphical;  # added 2017-01-19

     

       595
       595
        
         nmap-unfree = nmap; # added 2021-04-06

     

       596
       596
        
         nologin = shadow; # added 2018-04-25

pkgs/top-level/all-packages.nix

···

       32252
       32252
        
             })

     

       32253
       32253
        
           nix

     

       32254
       32254
        
           nixStable

     

       32255
       32255
       +
           nix_2_3

     

       32255
       32256
        
           nix_2_4

     

       32256
       32257
        
           nixUnstable;

     

       32257
       32258