From a1371d3e523a067edb2d0470bc32fa3c594d6535 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:02:34 +0200 Subject: [PATCH 1/8] wavrsocvt: remove phases --- pkgs/applications/misc/audio/wavrsocvt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 3b32f0d7f30..6b09a2e38d8 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "15qlvdfwbiclljj7075ycm78yzqahzrgl4ky8pymix5179acm05h"; }; - phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' tar -zxf $src ''; From 4660bf1d1b450a87aa1ac8b1ddb8d4944a457a11 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:02:45 +0200 Subject: [PATCH 2/8] avrdudess: deprecate phases --- pkgs/applications/misc/avrdudess/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 14b372d91e5..61cab2b6a2a 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; - phases = [ "buildPhase" ]; + dontUnpack = true; + dontInstall = true; buildPhase = '' mkdir -p "$out/avrdudess" From 9a6357c736071ca5636f9818cfeb29dbbd14077c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:03:13 +0200 Subject: [PATCH 3/8] azuredatastudio: deprecate phases --- pkgs/applications/misc/azuredatastudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 56894a29a66..fca1ad12fd1 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { at-spi2-atk ]; - phases = "unpackPhase fixupPhase"; + dontInstall = true; # change this to azuredatastudio-insiders for insiders releases edition = "azuredatastudio"; From 5f6fa38b58a67b47e50152083a87f383ae62a07e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:03:30 +0200 Subject: [PATCH 4/8] emem: deprecate phases --- pkgs/applications/misc/emem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index ab718cdffcf..f82ce53d974 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1"; }; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' mkdir -p $out/bin $out/share/java From 2bd399b9daca383bc0501ce6dc7e0347280f245f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:03:47 +0200 Subject: [PATCH 5/8] ganttproject-bin: remove phases --- pkgs/applications/misc/ganttproject-bin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 2b4504a1dce..76a19f5188c 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = let desktopItem = makeDesktopItem { From bd52b05ad2c666bcfc73c48b49806fff35e00bb1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:04:03 +0200 Subject: [PATCH 6/8] gollum: deprecate phases --- pkgs/applications/misc/gollum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 59bb05f85ce..cc9f9df0c60 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { From d947fc3f3cb47b7e286d177ec0508491210b393a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:04:36 +0200 Subject: [PATCH 7/8] hello-unfree: deprecate phases --- pkgs/applications/misc/hello-unfree/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index 7c54c320111..5c9a507fc07 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "example-unfree-package"; version = "1.0"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin From 91b7879feda05962f6ba914a2f03a81539c7a9f7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 3 Aug 2021 14:06:02 +0200 Subject: [PATCH 8/8] smos: deprecate phases --- pkgs/applications/misc/smos/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/smos/default.nix b/pkgs/applications/misc/smos/default.nix index 7d994a749bd..aa2f53b5a2c 100644 --- a/pkgs/applications/misc/smos/default.nix +++ b/pkgs/applications/misc/smos/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "smos-${version}"; + pname = "smos"; version = "0.1.0"; src = fetchurl { @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:07yavk7xl92yjwwjdig90yq421n8ldv4fjfw7izd4hfpzw849a12"; }; - phases = [ "unpackPhase" ]; + dontInstall = true; + unpackCmd = "${unzip}/bin/unzip -d $out $curSrc"; sourceRoot = ".";