commit 27af419541a50c33d2bf0762c8740552794e5b1a · pyrox.dev/nixpkgs

+1 -1

lib/strings-with-deps.nix

···

       15
       15
        
         Attention:

     

       16
       16
        
       

     

       17
       17
        
         let

     

       18
       18
       -
           pkgs = (import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix) {};

     

       18
       18
       +
           pkgs = (import <nixpkgs>) {};

     

       19
       19
        
         in let

     

       20
       20
        
           inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap;

     

       21
       21
        
           inherit (pkgs.lib) id;

+1 -1

pkgs/build-support/vm/windows/cygwin-iso/default.nix

···

       16
       16
        
           sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cygwinCross = (import ../../../../top-level/all-packages.nix {

     

       19
       19
       +
         cygwinCross = (import ../../../../.. {

     

       20
       20
        
           inherit (stdenv) system;

     

       21
       21
        
           crossSystem = {

     

       22
       22
        
             libc = "msvcrt";

+2 -2

pkgs/stdenv/darwin/default.nix

···

       1
       1
        
       { system         ? builtins.currentSystem

     

       2
       2
       -
       , allPackages    ? import ../../top-level/all-packages.nix

     

       2
       2
       +
       , allPackages    ? import ../../..

     

       3
       3
        
       , platform       ? null

     

       4
       4
        
       , config         ? {}

     

       5
       5
        
       

     
···

       22
       22
        
           (import "${./standard-sandbox.sb}")

     

       23
       23
        
         '';

     

       24
       24
        
       in rec {

     

       25
       25
       -
         allPackages = import ../../top-level/all-packages.nix;

     

       25
       25
       +
         allPackages = import ../../..;

     

       26
       26
        
       

     

       27
       27
        
         commonPreHook = ''

     

       28
       28
        
           export NIX_ENFORCE_PURITY=1

+2 -2

pkgs/stdenv/darwin/make-bootstrap-tools.nix

···

       1
       1
        
       { system ? builtins.currentSystem }:

     

       2
       2
        
       

     

       3
       3
       -
       with import ../../top-level/all-packages.nix { inherit system; };

     

       3
       3
       +
       with import ../../.. { inherit system; };

     

       4
       4
        
       

     

       5
       5
        
       rec {

     

       6
       6
        
         # We want coreutils without ACL support.

     
···

       291
       291
        
         # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it

     

       292
       292
        
         test-pkgs = let

     

       293
       293
        
           stdenv = import ./. { inherit system bootstrapFiles; };

     

       294
       294
       -
         in import ../../top-level/all-packages.nix {

     

       294
       294
       +
         in import ../../.. {

     

       295
       295
        
           inherit system;

     

       296
       296
        
           bootStdenv = stdenv.stdenvDarwin;

     

       297
       297
        
         };

+2 -2

pkgs/stdenv/freebsd/default.nix

···

       1
       1
        
       { system      ? builtins.currentSystem

     

       2
       2
       -
       , allPackages ? import ../../top-level/all-packages.nix

     

       2
       2
       +
       , allPackages ? import ../../..

     

       3
       3
        
       , platform    ? null

     

       4
       4
        
       , config      ? {}

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       rec {

     

       8
       8
       -
         allPackages = import ../../top-level/all-packages.nix;

     

       8
       8
       +
         allPackages = import ../../..;

     

       9
       9
        
       

     

       10
       10
        
         bootstrapTools = derivation {

     

       11
       11
        
           inherit system;

+1 -1

pkgs/stdenv/linux/default.nix

···

       6
       6
        
       

     

       7
       7
        
       # The function defaults are for easy testing.

     

       8
       8
        
       { system ? builtins.currentSystem

     

       9
       9
       -
       , allPackages ? import ../../top-level/all-packages.nix

     

       9
       9
       +
       , allPackages ? import ../../..

     

       10
       10
        
       , platform ? null, config ? {}, lib ? (import ../../../lib)

     

       11
       11
        
       , customBootstrapFiles ? null }:

     

       12
       12

+1 -1

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       3
       3
        
       let buildFor = toolsArch: (

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         pkgsFun = import ../../top-level/all-packages.nix;

     

       6
       6
       +
         pkgsFun = import ../../..;

     

       7
       7
        
         pkgsNoParams = pkgsFun {};

     

       8
       8
        
         

     

       9
       9
        
         sheevaplugCrossSystem = {

+1 -1

pkgs/stdenv/linux/make-bootstrap-tools.nix

···

       1
       1
        
       { system ? builtins.currentSystem }:

     

       2
       2
        
       

     

       3
       3
       -
       with import ../../top-level/all-packages.nix {inherit system;};

     

       3
       3
       +
       with import ../../.. {inherit system;};

     

       4
       4
        
       

     

       5
       5
        
       rec {

     

       6
       6

+1 -1

pkgs/test/mkOption/keep.nix

···

       1
       1
        
       let

     

       2
       2
       -
         pkgs = import ../../top-level/all-packages.nix {};

     

       2
       2
       +
         pkgs = import ../../.. {};

     

       3
       3
        
         config = import ./declare.nix;

     

       4
       4
        
       in

     

       5
       5
        
         with (pkgs.lib);

+1 -1

pkgs/test/mkOption/merge.nix

···

       1
       1
        
       let

     

       2
       2
       -
         pkgs = import ../../top-level/all-packages.nix {};

     

       2
       2
       +
         pkgs = import ../../.. {};

     

       3
       3
        
         config = import ./declare.nix;

     

       4
       4
        
       

     

       5
       5
        
         # Define the handler of unbound options.

+4 -4

pkgs/top-level/all-packages.nix

···

       164
       164
        
           in newpkgs;

     

       165
       165
        
       

     

       166
       166
        
         # Override system. This is useful to build i686 packages on x86_64-linux.

     

       167
       167
       -
         forceSystem = system: kernel: (import ./all-packages.nix) {

     

       167
       167
       +
         forceSystem = system: kernel: (import ./../..) {

     

       168
       168
        
           inherit system;

     

       169
       169
        
           platform = platform // { kernelArch = kernel; };

     

       170
       170
        
           inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config

     
···

       211
       211
        
       

     

       212
       212
        
         allStdenvs = import ../stdenv {

     

       213
       213
        
           inherit system platform config lib;

     

       214
       214
       -
           allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);

     

       214
       214
       +
           allPackages = args: import ./../.. ({ inherit config system; } // args);

     

       215
       215
        
         };

     

       216
       216
        
       

     

       217
       217
        
         defaultStdenv = allStdenvs.stdenv // { inherit platform; };

     
···

       228
       228
        
               in if changer != null then

     

       229
       229
        
                 changer {

     

       230
       230
        
                   # We import again all-packages to avoid recursivities.

     

       231
       231
       -
                   pkgs = import ./all-packages.nix {

     

       231
       231
       +
                   pkgs = import ./../.. {

     

       232
       232
        
                     # We remove packageOverrides to avoid recursivities

     

       233
       233
        
                     config = removeAttrs config [ "replaceStdenv" ];

     

       234
       234
        
                   };

     
···

       3843
       3843
        
           # load into the Ben Nanonote

     

       3844
       3844
        
           gccCross =

     

       3845
       3845
        
             let

     

       3846
       3846
       -
               pkgsCross = (import ./all-packages.nix) {

     

       3846
       3846
       +
               pkgsCross = (import ./../..) {

     

       3847
       3847
        
                 inherit system;

     

       3848
       3848
        
                 inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;

     

       3849
       3849
        
                 # Ben Nanonote system

+1 -1

pkgs/top-level/guile-2-test.nix

···

       4
       4
        
          -- ludo@gnu.org  */

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         allPackages = import ./all-packages.nix;

     

       7
       7
       +
         allPackages = import ./../..;

     

       8
       8
        
       

     

       9
       9
        
         pkgsFun = { system ? builtins.currentSystem }:

     

       10
       10
        
           allPackages {

+2 -2

pkgs/top-level/make-tarball.nix

···

       48
       48
        
           # Make sure that derivation paths do not depend on the Nixpkgs path.

     

       49
       49
        
           mkdir $TMPDIR/foo

     

       50
       50
        
           ln -s $(readlink -f .) $TMPDIR/foo/bar

     

       51
       51
       -
           p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace)

     

       52
       52
       -
           p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox)

     

       51
       51
       +
           p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)

     

       52
       52
       +
           p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)

     

       53
       53
        
           if [ "$p1" != "$p2" ]; then

     

       54
       54
        
               echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"

     

       55
       55
        
               exit 1

+1 -1

pkgs/top-level/release-lib.nix

···

       1
       1
        
       { supportedSystems

     

       2
       2
       -
       , packageSet ? (import ./all-packages.nix)

     

       2
       2
       +
       , packageSet ? (import ./../..)

     

       3
       3
        
       , allowTexliveBuilds ? false

     

       4
       4
        
       , scrubJobs ? true

     

       5
       5
        
       }:

+1 -1

pkgs/top-level/release-python.nix

···

       3
       3
        
          $ hydra-eval-jobs pkgs/top-level/release-python.nix

     

       4
       4
        
       */

     

       5
       5
        
       

     

       6
       6
       -
       { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }

     

       6
       6
       +
       { nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }

     

       7
       7
        
       , officialRelease ? false

     

       8
       8
        
       , # The platforms for which we build Nixpkgs.

     

       9
       9
        
         supportedSystems ? [ "x86_64-linux" ]

+1 -1

pkgs/top-level/release-small.nix

···

       1
       1
        
       /* A small release file, with few packages to be built.  The aim is to reduce

     

       2
       2
        
          the load on Hydra when testing the `stdenv-updates' branch. */

     

       3
       3
        
       

     

       4
       4
       -
       { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }

     

       4
       4
       +
       { nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }

     

       5
       5
        
       , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]

     

       6
       6
        
       }:

     

       7
       7

+1 -1

pkgs/top-level/release.nix

···

       9
       9
        
          $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux

     

       10
       10
        
       */

     

       11
       11
        
       

     

       12
       12
       -
       { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }

     

       12
       12
       +
       { nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }

     

       13
       13
        
       , officialRelease ? false

     

       14
       14
        
       , # The platforms for which we build Nixpkgs.

     

       15
       15
        
         supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]