diff options
Diffstat (limited to 'pkgs/tools/misc')
-rwxr-xr-x | pkgs/tools/misc/coreutils/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 5 | ||||
-rwxr-xr-x | pkgs/tools/misc/findutils/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/misc/getopt/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/getopt/default.nix | 4 |
6 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/tools/misc/coreutils/builder.sh b/pkgs/tools/misc/coreutils/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/misc/coreutils/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 009ff76ab6722..b69428a0ceb6d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "coreutils-5.0"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.0.tar.bz2; md5 = "94e5558ee2a65723d4840bfde2d323f0"; }; - inherit stdenv; } diff --git a/pkgs/tools/misc/findutils/builder.sh b/pkgs/tools/misc/findutils/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/misc/findutils/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 1aafc99991593..ea20991062965 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "findutils-4.1.20"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz; md5 = "e90ce7222daadeb8616b8db461e17cbc"; }; - inherit stdenv; } diff --git a/pkgs/tools/misc/getopt/builder.sh b/pkgs/tools/misc/getopt/builder.sh index 30ac6e3d453dd..b086693baece0 100755..100644 --- a/pkgs/tools/misc/getopt/builder.sh +++ b/pkgs/tools/misc/getopt/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index c34230ddeeef6..1e27204a5afbf 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "getopt-1.1.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz; md5 = "7b7637dcb0ac531f1af29f4d6b018e86"; }; - stdenv = stdenv; } |