aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2016-06-22 01:39:50 -0700
committerDomen Kožar <domen@dev.si>2016-06-22 10:39:50 +0200
commitf073df60d60444c30c49cb26d6b187a4100b41fe (patch)
treef1d70957cb94c3f9de765f51d9dc9599b32d6b21
parent48f1d9c483c772705b4dca1e02010d339ee0cc53 (diff)
Replace `./../*` with `../*` in Nix expressions (#16414)
-rw-r--r--doc/default.nix4
-rw-r--r--lib/tests/release.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
-rw-r--r--pkgs/top-level/guile-2-test.nix2
-rw-r--r--pkgs/top-level/release-lib.nix2
-rw-r--r--pkgs/top-level/release-python.nix2
-rw-r--r--pkgs/top-level/release-small.nix2
-rw-r--r--pkgs/top-level/release.nix2
-rw-r--r--pkgs/top-level/stdenv.nix4
9 files changed, 12 insertions, 12 deletions
diff --git a/doc/default.nix b/doc/default.nix
index 6a44587a31b1..076703213e48 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -57,11 +57,11 @@ stdenv.mkDerivation {
outputFile = "./languages-frameworks/haskell.xml";
}
+ toDocbook {
- inputFile = ./../pkgs/development/idris-modules/README.md;
+ inputFile = ../pkgs/development/idris-modules/README.md;
outputFile = "languages-frameworks/idris.xml";
}
+ toDocbook {
- inputFile = ./../pkgs/development/r-modules/README.md;
+ inputFile = ../pkgs/development/r-modules/README.md;
outputFile = "languages-frameworks/r.xml";
}
+ ''
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 093e9bcbf104..f9f57424f7d0 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -1,6 +1,6 @@
{ nixpkgs }:
-with import ./../.. { };
+with import ../.. { };
with lib;
stdenv.mkDerivation {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce95ff39f64b..f71cb9079c51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -43,7 +43,7 @@ in
overridePackages = f: pkgsWithOverrides f;
# Override system. This is useful to build i686 packages on x86_64-linux.
- forceSystem = system: kernel: (import ./../..) {
+ forceSystem = system: kernel: (import ../..) {
inherit system;
platform = platform // { kernelArch = kernel; };
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
@@ -3945,7 +3945,7 @@ in
# load into the Ben Nanonote
gccCross =
let
- pkgsCross = (import ./../..) {
+ pkgsCross = (import ../..) {
inherit system;
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
# Ben Nanonote system
diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix
index 70f2de75ae9e..9d2fbcbef5cc 100644
--- a/pkgs/top-level/guile-2-test.nix
+++ b/pkgs/top-level/guile-2-test.nix
@@ -4,7 +4,7 @@
-- ludo@gnu.org */
let
- allPackages = import ./../..;
+ allPackages = import ../..;
pkgsFun = { system ? builtins.currentSystem }:
allPackages {
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 343a3f47a4b3..b352ec0fe648 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,5 +1,5 @@
{ supportedSystems
-, packageSet ? (import ./../..)
+, packageSet ? (import ../..)
, allowTexliveBuilds ? false
, scrubJobs ? true
}:
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index cb21a660eb56..0fbd5e50d12e 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -3,7 +3,7 @@
$ 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
, # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" ]
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 0ccb160e4f68..2774ff66f576 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -1,7 +1,7 @@
/* 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. */
-{ 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" ]
}:
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b596075a2ed0..ba99fd5a0370 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -9,7 +9,7 @@
$ 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
, # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix
index aeb36b8edc35..9b8cf5a03092 100644
--- a/pkgs/top-level/stdenv.nix
+++ b/pkgs/top-level/stdenv.nix
@@ -6,7 +6,7 @@ with super;
rec {
allStdenvs = import ../stdenv {
inherit system platform config lib;
- allPackages = args: import ./../.. ({ inherit config system; } // args);
+ allPackages = args: import ../.. ({ inherit config system; } // args);
};
defaultStdenv = allStdenvs.stdenv // { inherit platform; };
@@ -21,7 +21,7 @@ rec {
in if changer != null then
changer {
# We import again all-packages to avoid recursivities.
- pkgs = import ./../.. {
+ pkgs = import ../.. {
# We remove packageOverrides to avoid recursivities
config = removeAttrs config [ "replaceStdenv" ];
};