alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #13896 from nbp/import-top-level

Browse source 
Replace references to all-packages.nix, by references to the top-level
This commit is contained in:
Eelco Dolstra 2016-03-14 13:49:42 +01:00
parent ccbfe2dfd5 6313a5698a
commit 27af419541
17 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/strings-with-deps.nix
View file

@ -15,7 +15,7 @@ Usage:
Attention: Attention:
let let
pkgs = (import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix) {}; pkgs = (import <nixpkgs>) {};
in let in let
inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap; inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap;
inherit (pkgs.lib) id; inherit (pkgs.lib) id;

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

@ -16,7 +16,7 @@ let
sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv";
}; };
cygwinCross = (import ../../../../top-level/all-packages.nix { cygwinCross = (import ../../../../.. {
inherit (stdenv) system; inherit (stdenv) system;
crossSystem = { crossSystem = {
libc = "msvcrt"; libc = "msvcrt";

4
pkgs/stdenv/darwin/default.nix
View file

@ -1,5 +1,5 @@
{ system ? builtins.currentSystem { system ? builtins.currentSystem
, allPackages ? import ../../top-level/all-packages.nix , allPackages ? import ../../..
, platform ? null , platform ? null
, config ? {} , config ? {}
@ -22,7 +22,7 @@ let
(import "${./standard-sandbox.sb}") (import "${./standard-sandbox.sb}")
''; '';
in rec { in rec {
allPackages = import ../../top-level/all-packages.nix; allPackages = import ../../..;
commonPreHook = '' commonPreHook = ''
export NIX_ENFORCE_PURITY=1 export NIX_ENFORCE_PURITY=1

4
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file

@ -1,6 +1,6 @@
{ system ? builtins.currentSystem }: { system ? builtins.currentSystem }:
with import ../../top-level/all-packages.nix { inherit system; }; with import ../../.. { inherit system; };
rec { rec {
# We want coreutils without ACL support. # We want coreutils without ACL support.
@ -291,7 +291,7 @@ rec {
# The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
test-pkgs = let test-pkgs = let
stdenv = import ./. { inherit system bootstrapFiles; }; stdenv = import ./. { inherit system bootstrapFiles; };
in import ../../top-level/all-packages.nix { in import ../../.. {
inherit system; inherit system;
bootStdenv = stdenv.stdenvDarwin; bootStdenv = stdenv.stdenvDarwin;
}; };

4
pkgs/stdenv/freebsd/default.nix
View file

@ -1,11 +1,11 @@
{ system ? builtins.currentSystem { system ? builtins.currentSystem
, allPackages ? import ../../top-level/all-packages.nix , allPackages ? import ../../..
, platform ? null , platform ? null
, config ? {} , config ? {}
}: }:
rec { rec {
allPackages = import ../../top-level/all-packages.nix; allPackages = import ../../..;
bootstrapTools = derivation { bootstrapTools = derivation {
inherit system; inherit system;

2
pkgs/stdenv/linux/default.nix
View file

@ -6,7 +6,7 @@
# The function defaults are for easy testing. # The function defaults are for easy testing.
{ system ? builtins.currentSystem { system ? builtins.currentSystem
, allPackages ? import ../../top-level/all-packages.nix , allPackages ? import ../../..
, platform ? null, config ? {}, lib ? (import ../../../lib) , platform ? null, config ? {}, lib ? (import ../../../lib)
, customBootstrapFiles ? null }: , customBootstrapFiles ? null }:

2
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file

@ -3,7 +3,7 @@
let buildFor = toolsArch: ( let buildFor = toolsArch: (
let let
pkgsFun = import ../../top-level/all-packages.nix; pkgsFun = import ../../..;
pkgsNoParams = pkgsFun {}; pkgsNoParams = pkgsFun {};
sheevaplugCrossSystem = { sheevaplugCrossSystem = {

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View file

@ -1,6 +1,6 @@
{ system ? builtins.currentSystem }: { system ? builtins.currentSystem }:
with import ../../top-level/all-packages.nix {inherit system;}; with import ../../.. {inherit system;};
rec { rec {

2
pkgs/test/mkOption/keep.nix
View file

@ -1,5 +1,5 @@
let let
pkgs = import ../../top-level/all-packages.nix {}; pkgs = import ../../.. {};
config = import ./declare.nix; config = import ./declare.nix;
in in
with (pkgs.lib); with (pkgs.lib);

2
pkgs/test/mkOption/merge.nix
View file

@ -1,5 +1,5 @@
let let
pkgs = import ../../top-level/all-packages.nix {}; pkgs = import ../../.. {};
config = import ./declare.nix; config = import ./declare.nix;
# Define the handler of unbound options. # Define the handler of unbound options.

8
pkgs/top-level/all-packages.nix
View file

@ -164,7 +164,7 @@ let
in newpkgs; in newpkgs;
# Override system. This is useful to build i686 packages on x86_64-linux. # Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: kernel: (import ./all-packages.nix) { forceSystem = system: kernel: (import ./../..) {
inherit system; inherit system;
platform = platform // { kernelArch = kernel; }; platform = platform // { kernelArch = kernel; };
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
@ -211,7 +211,7 @@ let
allStdenvs = import ../stdenv { allStdenvs = import ../stdenv {
inherit system platform config lib; inherit system platform config lib;
allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); allPackages = args: import ./../.. ({ inherit config system; } // args);
}; };
defaultStdenv = allStdenvs.stdenv // { inherit platform; }; defaultStdenv = allStdenvs.stdenv // { inherit platform; };
@ -228,7 +228,7 @@ let
in if changer != null then in if changer != null then
changer { changer {
# We import again all-packages to avoid recursivities. # We import again all-packages to avoid recursivities.
pkgs = import ./all-packages.nix { pkgs = import ./../.. {
# We remove packageOverrides to avoid recursivities # We remove packageOverrides to avoid recursivities
config = removeAttrs config [ "replaceStdenv" ]; config = removeAttrs config [ "replaceStdenv" ];
}; };
@ -3843,7 +3843,7 @@ let
# load into the Ben Nanonote # load into the Ben Nanonote
gccCross = gccCross =
let let
pkgsCross = (import ./all-packages.nix) { pkgsCross = (import ./../..) {
inherit system; inherit system;
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
# Ben Nanonote system # Ben Nanonote system

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

@ -4,7 +4,7 @@
-- ludo@gnu.org */ -- ludo@gnu.org */
let let
allPackages = import ./all-packages.nix; allPackages = import ./../..;
pkgsFun = { system ? builtins.currentSystem }: pkgsFun = { system ? builtins.currentSystem }:
allPackages { allPackages {

4
pkgs/top-level/make-tarball.nix
View file

@ -48,8 +48,8 @@ releaseTools.sourceTarball rec {
# Make sure that derivation paths do not depend on the Nixpkgs path. # Make sure that derivation paths do not depend on the Nixpkgs path.
mkdir $TMPDIR/foo mkdir $TMPDIR/foo
ln -s $(readlink -f .) $TMPDIR/foo/bar ln -s $(readlink -f .) $TMPDIR/foo/bar
p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace) p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)
p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox) p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)
if [ "$p1" != "$p2" ]; then if [ "$p1" != "$p2" ]; then
echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
exit 1 exit 1

2
pkgs/top-level/release-lib.nix
View file

@ -1,5 +1,5 @@
{ supportedSystems { supportedSystems
, packageSet ? (import ./all-packages.nix) , packageSet ? (import ./../..)
, allowTexliveBuilds ? false , allowTexliveBuilds ? false
, scrubJobs ? true , scrubJobs ? true
}: }:

2
pkgs/top-level/release-python.nix
View file

@ -3,7 +3,7 @@
$ hydra-eval-jobs pkgs/top-level/release-python.nix $ hydra-eval-jobs pkgs/top-level/release-python.nix
*/ */
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
, # The platforms for which we build Nixpkgs. , # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" ] supportedSystems ? [ "x86_64-linux" ]

2
pkgs/top-level/release-small.nix
View file

@ -1,7 +1,7 @@
/* A small release file, with few packages to be built. The aim is to reduce /* A small release file, with few packages to be built. The aim is to reduce
the load on Hydra when testing the `stdenv-updates' branch. */ the load on Hydra when testing the `stdenv-updates' branch. */
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
}: }:

2
pkgs/top-level/release.nix
View file

@ -9,7 +9,7 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/ */
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
, # The platforms for which we build Nixpkgs. , # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]