public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace ./../* with ../* in Nix expressions (#16414)

Browse Source
This commit is contained in:
John Ericson 2016-06-22 01:39:50 -07:00 committed by Domen Kožar
parent 48f1d9c483
commit f073df60d6
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/default.nix
View File

@ -57,11 +57,11 @@ stdenv.mkDerivation {
outputFile = "./languages-frameworks/haskell.xml"; outputFile = "./languages-frameworks/haskell.xml";
} }
+ toDocbook { + toDocbook {
inputFile = ./../pkgs/development/idris-modules/README.md; inputFile = ../pkgs/development/idris-modules/README.md;
outputFile = "languages-frameworks/idris.xml"; outputFile = "languages-frameworks/idris.xml";
} }
+ toDocbook { + toDocbook {
inputFile = ./../pkgs/development/r-modules/README.md; inputFile = ../pkgs/development/r-modules/README.md;
outputFile = "languages-frameworks/r.xml"; outputFile = "languages-frameworks/r.xml";
} }
+ '' + ''

2
lib/tests/release.nix
View File

@ -1,6 +1,6 @@
{ nixpkgs }: { nixpkgs }:
with import ./../.. { }; with import ../.. { };
with lib; with lib;
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/top-level/all-packages.nix
View File

@ -43,7 +43,7 @@ in
overridePackages = f: pkgsWithOverrides f; overridePackages = f: pkgsWithOverrides f;
# 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 ./../..) { 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
@ -3945,7 +3945,7 @@ in
# load into the Ben Nanonote # load into the Ben Nanonote
gccCross = gccCross =
let let
pkgsCross = (import ./../..) { 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 ./../..; allPackages = import ../..;
pkgsFun = { system ? builtins.currentSystem }: pkgsFun = { system ? builtins.currentSystem }:
allPackages { allPackages {

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

@ -1,5 +1,5 @@
{ supportedSystems { supportedSystems
, packageSet ? (import ./../..) , 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 ./../.. {}).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 ./../.. {}).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 ./../.. {}).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" ]

4
pkgs/top-level/stdenv.nix
View File

@ -6,7 +6,7 @@ with super;
rec { rec {
allStdenvs = import ../stdenv { allStdenvs = import ../stdenv {
inherit system platform config lib; inherit system platform config lib;
allPackages = args: import ./../.. ({ inherit config system; } // args); allPackages = args: import ../.. ({ inherit config system; } // args);
}; };
defaultStdenv = allStdenvs.stdenv // { inherit platform; }; defaultStdenv = allStdenvs.stdenv // { inherit platform; };
@ -21,7 +21,7 @@ rec {
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 ./../.. { pkgs = import ../.. {
# We remove packageOverrides to avoid recursivities # We remove packageOverrides to avoid recursivities
config = removeAttrs config [ "replaceStdenv" ]; config = removeAttrs config [ "replaceStdenv" ];
}; };