From 28390562062f77b572cefe4a9b1295f6e9f9f375 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:50:44 +0200 Subject: [PATCH 1/7] apparmor-kernel-patches: deprecate phases --- pkgs/os-specific/linux/apparmor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 1b1fb415451..5acf8e560e3 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -256,7 +256,7 @@ let name = "apparmor-kernel-patches-${apparmor-version}"; src = apparmor-sources; - phases = "unpackPhase installPhase"; + dontBuild = true; installPhase = '' mkdir "$out" From a3556b20058f79cfdc278639b9094573376702df Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:56:43 +0200 Subject: [PATCH 2/7] zenstates: deprecate phases --- pkgs/os-specific/linux/zenstates/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix index a56337cfef2..8e31073151b 100644 --- a/pkgs/os-specific/linux/zenstates/default.nix +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; - phases = [ "installPhase" ]; - installPhase = '' mkdir -p $out/bin cp $src/zenstates.py $out/bin/zenstates From 127ee35a573997a852358eaa7e4c7202ce70493a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:56:59 +0200 Subject: [PATCH 3/7] i810switch: deprecate phases --- pkgs/os-specific/linux/i810switch/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index ffca983a35e..993a19caadf 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -3,8 +3,6 @@ stdenv.mkDerivation { name = "i810switch-0.6.5"; - phases = "unpackPhase installPhase"; - installPhase = " sed -i -e 's+/usr++' Makefile sed -i -e 's+^\\(.*putenv(\"PATH=\\).*$+\\1${pciutils}/sbin\");+' i810switch.c From 0561d480b2b1dc54a6750df4c4f5dfdf11bf876f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:57:22 +0200 Subject: [PATCH 4/7] rtl8723bs-firmware: deprecate phases --- pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index 36580d4b1b9..c587994ccec 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; inherit (linuxPackages.rtl8723bs) src; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' mkdir -p "$out/lib/firmware/rtlwifi" From d6db3ac67f289df5bfa0a17acea9b3e1e04a569f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:57:37 +0200 Subject: [PATCH 5/7] rtl8192su-firmware: deprecate phases --- pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 34c2b683ea4..6cbaa4acb8d 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l"; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' for i in rtl8192sfw.bin \ From abd4f4a03596a9cbd2fbe070815d4b8dac8668f1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:58:03 +0200 Subject: [PATCH 6/7] b43-firmware-6: remove phases --- pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index c0226065ea2..45019dd5a98 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ b43FirmwareCutter ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "."; installPhase = '' From 8952b6df3ca0952e2368f2fdc73dcc50b15846b7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 20:58:15 +0200 Subject: [PATCH 7/7] b43-firmware-5: remove phases --- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 42444d784d5..1355d5bc9a0 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { buildInputs = [ b43FirmwareCutter ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/lib/firmware b43-fwcutter -w $out/lib/firmware linux/wl_apsta.o