diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:23:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:23:01 +0000 |
| commit | 12ae5363ea658d399bdb008f6ded3cde355f9310 (patch) | |
| tree | e2a2ab3210854bfaad01f955c32b1cda724a8790 /pkgs/tools/text/diffutils | |
| parent | bc71554fc80a760c3a8e01f9e9e97500aa9ccde1 (diff) | |
* Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
`mkDerivation'. These transformations were all done automatically,
so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.
svn path=/nixpkgs/trunk/; revision=874
Diffstat (limited to 'pkgs/tools/text/diffutils')
| -rwxr-xr-x | pkgs/tools/text/diffutils/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/tools/text/diffutils/builder.sh b/pkgs/tools/text/diffutils/builder.sh deleted file mode 100755 index 46f69284ae87..000000000000 --- a/pkgs/tools/text/diffutils/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index bcb9a4891b6d..7fc4fe3d5fb7 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "diffutils-2.8.1"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz; md5 = "71f9c5ae19b60608f6c7f162da86a428"; }; - inherit stdenv; } |