diff options
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/lib/testing.nix | 2 | ||||
-rw-r--r-- | nixos/lib/testing/jquery.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 4 | ||||
-rw-r--r-- | nixos/modules/virtualisation/openvswitch.nix | 2 | ||||
-rw-r--r-- | nixos/tests/hydra/default.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index a13e76a69560..767068771036 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -24,7 +24,7 @@ in rec { buildInputs = [ makeWrapper perl ]; - unpackPhase = "true"; + dontUnpack = true; preferLocalBuild = true; diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix index 103721cadc38..e272f66a5765 100644 --- a/nixos/lib/testing/jquery.nix +++ b/nixos/lib/testing/jquery.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 71277b48ecd9..576ca7bfc055 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -149,7 +149,7 @@ let name = "gitlab-rake"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ @@ -164,7 +164,7 @@ let name = "gitlab-rails"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \ diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 47e07e7432cb..edec37402308 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -54,7 +54,7 @@ in { # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; buildInputs = with pkgs; [ cfg.package diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 882bced86d39..f99b367ac9b7 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -17,7 +17,7 @@ let createTrivialProject = pkgs.stdenv.mkDerivation { name = "create-trivial-project"; - unpackPhase = ":"; + dontUnpack = true; buildInputs = [ pkgs.makeWrapper ]; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; postFixup = '' |