From 295815bec71ccee51cbc35582e7300df00c7fd6b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 3 May 2018 21:17:14 -0500 Subject: [PATCH] treewide: Remove phases --- .../darwin/apple-source-releases/CarbonHeaders/default.nix | 2 -- .../darwin/apple-source-releases/CommonCrypto/default.nix | 2 -- .../darwin/apple-source-releases/Libc/825_40_1.nix | 2 -- .../os-specific/darwin/apple-source-releases/Libc/default.nix | 2 -- .../darwin/apple-source-releases/Libinfo/default.nix | 2 -- .../os-specific/darwin/apple-source-releases/Libm/default.nix | 4 +--- .../darwin/apple-source-releases/Libnotify/default.nix | 2 -- .../darwin/apple-source-releases/Librpcsvc/default.nix | 2 -- .../darwin/apple-source-releases/Libsystem/default.nix | 3 --- .../darwin/apple-source-releases/architecture/default.nix | 4 +--- .../darwin/apple-source-releases/copyfile/default.nix | 4 +--- .../os-specific/darwin/apple-source-releases/dyld/default.nix | 2 -- .../darwin/apple-source-releases/eap8021x/default.nix | 4 +--- .../darwin/apple-source-releases/launchd/default.nix | 4 +--- .../darwin/apple-source-releases/libclosure/default.nix | 4 +--- .../darwin/apple-source-releases/libdispatch/default.nix | 2 -- .../darwin/apple-source-releases/libplatform/default.nix | 2 -- .../darwin/apple-source-releases/libpthread/default.nix | 2 -- .../darwin/apple-source-releases/libresolv/default.nix | 2 -- .../darwin/apple-source-releases/libutil/default.nix | 2 -- pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix | 2 -- .../darwin/apple-source-releases/removefile/default.nix | 4 +--- pkgs/os-specific/darwin/xcode/default.nix | 1 - 23 files changed, 7 insertions(+), 53 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 38215fa8f900..648770660d3d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp MacTypes.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 5bcf94a18cef..ad51f1df2bcd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/CommonCrypto cp include/* $out/include/CommonCrypto diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix index 0fa9294f2290..302a657992aa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, ed, unifdef }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ ed unifdef ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 40237b27bd26..d73dc8f3ec24 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ ed unifdef ]; # TODO: asl.h actually comes from syslog project now diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index 2756857ba677..d3ffa1fa2834 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' substituteInPlace xcodescripts/install_files.sh \ --replace "/usr/local/" "/" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index b409a7347ef2..1a01d0321918 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include @@ -10,4 +8,4 @@ appleDerivation { cp Source/Intel/fenv.h $out/include cp Source/complex.h $out/include ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix index 810c8e8315a5..de691a056f3e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp notify.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 512ec6253c78..7002f82fe561 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, developer_cmds }: appleDerivation rec { - phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ developer_cmds ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 8575e0676253..9759810ef686 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,9 +3,6 @@ removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { - dontBuild = true; - dontConfigure = true; - nativeBuildInputs = [ cpio ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index edb7869269ac..2638a0afb76d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,9 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - - postUnpack = '' + postPatch = '' substituteInPlace $sourceRoot/Makefile \ --replace "/usr/include" "/include" \ --replace "/usr/bin/" "" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index c1a2acccaa97..bbc8c5e5e81d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,10 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/ cp copyfile.h $out/include/ ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix index 56b0d93f99be..ddadf1f3940b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/lib $out/include ln -s /usr/lib/dyld $out/lib/dyld diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index af9493fe32e8..c8a40a20c9d3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,11 +1,9 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/Library/Frameworks/EAP8021X.framework/Headers cp EAP8021X.fproj/EAPClientProperties.h $out/Library/Frameworks/EAP8021X.framework/Headers ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index c0e00ca1636e..86bc6e598f7d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - # No clue why the same file has two different names. Ask Apple! installPhase = '' mkdir -p $out/include/ $out/include/servers @@ -11,4 +9,4 @@ appleDerivation { cp liblaunch/bootstrap.h $out/include/servers cp liblaunch/bootstrap.h $out/include/servers/bootstrap_defs.h ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index a0201f9db2c1..826dbed1dfe0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -1,10 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp *.h $out/include/ ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index c80e37575697..44c50e468384 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/dispatch $out/include/os diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 65accc870d71..41b1bf74af9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir $out cp -r include $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index b4d8004d3e66..650c6415defc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, libdispatch, xnu }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - propagatedBuildInputs = [ libdispatch xnu ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index a565971a6fa4..5a2cd33d8a03 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, Libinfo, configd, mDNSResponder }: appleDerivation { - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildInputs = [ Libinfo configd mDNSResponder ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index c943c2068e6d..a6f484ba4e8d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -2,8 +2,6 @@ # all symbols are located in libSystem appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp *.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix index ffc19801c5dc..9ee8f2255b44 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/include/ppp diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 315f93bef084..8baf62dba01b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -1,10 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/ cp removefile.h checkint.h $out/include/ ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index d3a9ec012ebf..bea8bc5d3c21 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -14,7 +14,6 @@ in stdenv.mkDerivation rec { sha256 = "70bb550cc14eca80b9825f4ae9bfbf7f076bb75777311be428bc30a7eb7a6f7e"; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; outputs = [ "out" "toolchain" ];