summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-06-19 11:45:34 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-07-01 04:23:51 -0400
commit3f4a353737f165d4935c0404404c0de6eea92093 (patch)
treeadfa77773876bb21a3e8707648c8259546905bb6 /nixos/modules
parentb10e4624041cbbc824c034ee91bdca90d1132958 (diff)
downloadnixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.tar
nixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.tar.gz
nixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.tar.bz2
nixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.tar.lz
nixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.tar.xz
nixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.tar.zst
nixpkgs-3f4a353737f165d4935c0404404c0de6eea92093.zip
treewide: use dontUnpack
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/misc/gitlab.nix4
-rw-r--r--nixos/modules/virtualisation/openvswitch.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 71277b48ecd..576ca7bfc05 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 47e07e7432c..edec3740230 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