diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 15:52:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:37:08 +0200 |
| commit | 91e71725d49c185401f459f58062b02bcbf1651e (patch) | |
| tree | c11a4de8589c8c74fa36315437e5cae12b0bef92 | |
| parent | 7f9b8866bfcdc3a4d268834ba8f123628d6c7847 (diff) | |
| download | nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.tar nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.tar.gz nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.tar.bz2 nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.tar.lz nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.tar.xz nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.tar.zst nixpkgs-91e71725d49c185401f459f58062b02bcbf1651e.zip | |
Remove some obsolete references to <nixos>
| -rw-r--r-- | nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/misc/assertions.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/profiles/clone-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/blivet/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh index f9cbfffde70..4e981c074a5 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh @@ -53,5 +53,5 @@ fi # Build a network of VMs -nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \ +nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \ --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix index c42de038e61..3b50e60a0ff 100644 --- a/nixos/modules/misc/assertions.nix +++ b/nixos/modules/misc/assertions.nix @@ -30,5 +30,5 @@ with lib; }; }; - # impl of assertions is in <nixos/modules/system/activation/top-level.nix> + # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix> } diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index f0d60bb6c42..77d86f8d740 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -30,7 +30,7 @@ let relocatedModuleFiles = let relocateNixOS = path: - "<nixos" + removePrefix nixosPath (toString path) + ">"; + "<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">"; relocateOthers = null; in { nixos = map relocateNixOS partitionedModuleFiles.nixos; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 3065af0fd15..0b7069ab67d 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { six ]; - # Tests are in <nixos/tests/blivet.nix>. + # Tests are in <nixpkgs/nixos/tests/blivet.nix>. doCheck = false; meta = with stdenv.lib; { |