From 5070a55b5b072db7e8cad968de63842d2ed4bb5b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 20 Jul 2021 17:02:35 +0200 Subject: pws: deprecate phases --- pkgs/tools/misc/pws/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/misc/pws/default.nix') diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index e98323b75ee..1cfa64909f3 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { -- cgit 1.4.1 From 89271903b331e5b9aed3b8919985926e776c9666 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 20 Jul 2021 18:26:48 +0200 Subject: pws: convert to pname + version --- pkgs/tools/misc/pws/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc/pws/default.nix') diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 1cfa64909f3..783bb9b5a38 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }: stdenv.mkDerivation rec { - name = "pws-${(import ./gemset.nix).pws.version}"; + pname = "pws"; + version = (import ./gemset.nix).pws.version; nativeBuildInputs = [ makeWrapper ]; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { installPhase = let env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-gems"; inherit ruby; -- cgit 1.4.1