* 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=874wip/yesman
parent
bc71554fc8
commit
12ae5363ea
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "nxml-mode-20031031"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://www.thaiopensource.com/download/nxml-mode-20031031.tar.gz; |
||||
md5 = "4cbc32047183e6cc1b7a2757d1078bd2"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,13 +1,11 @@ |
||||
{stdenv, fetchurl, perl}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "hello-2.1.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz; |
||||
md5 = "70c9ccf9fac07f762c24f2df2290784d"; |
||||
}; |
||||
stdenv = stdenv; |
||||
perl = perl; |
||||
} |
||||
|
@ -1,5 +0,0 @@ |
||||
#! /bin/sh -e |
||||
|
||||
buildInputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre" |
||||
. $stdenv/setup |
||||
genericBuild |
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "win32codecs-1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2; |
||||
md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,12 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "docbook-xsl-1.64.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://cesnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.tar.gz; |
||||
md5 = "ed766902e8381f6206d12f5c326fbd47"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "jikes-1.18"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2; |
||||
md5 = "74bbcfd31aa2d7df4b86c5fe2db315cc"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,12 +1,11 @@ |
||||
{stdenv, fetchurl, aterm, sdf}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "strategoxt-0.9.4"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.4.tar.gz; |
||||
md5 = "b61aee784cebac6cce0d96383bdb1b37"; |
||||
}; |
||||
inherit stdenv aterm sdf; |
||||
inherit aterm sdf; |
||||
} |
||||
|
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "a52dec-0.7.4"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz; |
||||
md5 = "caa9f5bc44232dc8aeea773fea56be80"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,12 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "audiofile-0.2.3"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz; |
||||
md5 = "fd07c62a17ceafa317929e55e51e26c5"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "db4-4.2.52"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://www.sleepycat.com/update/snapshot/db-4.2.52.tar.gz; |
||||
md5 = "cbc77517c9278cdb47613ce8cb55779f"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "expat-1.95.7"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://heanet.dl.sourceforge.net/sourceforge/expat/expat-1.95.7.tar.gz; |
||||
md5 = "2ff59c2a5cbdd21a285c5f343e214fa9"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,3 +0,0 @@ |
||||
#! /bin/sh -e |
||||
. $stdenv/setup |
||||
genericBuild |
@ -1,13 +1,11 @@ |
||||
{stdenv, fetchurl, pkgconfig, libX11}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "libICE-6.3.2"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libICE-6.3.2.tar.bz2; |
||||
md5 = "06db02e3df846b127a6e2dc3e345039c"; |
||||
}; |
||||
buildInputs = [pkgconfig libX11]; |
||||
inherit stdenv; |
||||
} |
||||
|
@ -1,3 +0,0 @@ |
||||
#! /bin/sh -e |
||||
. $stdenv/setup |
||||
genericBuild |
@ -1,3 +0,0 @@ |
||||
#! /bin/sh -e |
||||
. $stdenv/setup |
||||
genericBuild |
@ -1,5 +0,0 @@ |
||||
#! /bin/sh |
||||
|
||||
. $stdenv/setup |
||||
|
||||
genericBuild |
@ -1,13 +1,11 @@ |
||||
{stdenv, fetchurl, pkgconfig, xproto}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "libXau-0.1.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXau-0.1.1.tar.bz2; |
||||
md5 = "3d747ada4a7d17538fa21c62d5608656"; |
||||
}; |
||||
buildInputs = [pkgconfig xproto]; |
||||
inherit stdenv; |
||||
} |
||||
|
@ -1,3 +0,0 @@ |
||||
#! /bin/sh -e |
||||
. $stdenv/setup |
||||
genericBuild |
@ -1,5 +0,0 @@ |
||||
#! /bin/sh |
||||
|
||||
. $stdenv/setup |
||||
|
||||
genericBuild |
@ -1,12 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "libXtrans-0.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXtrans-0.1.tar.bz2; |
||||
md5 = "a5ae4c7a75f930053b8327f7bd0c1361"; |
||||
}; |
||||
inherit stdenv; |
||||
} |
||||
|
@ -1,5 +0,0 @@ |
||||
#! /bin/sh |
||||
|
||||
. $stdenv/setup |
||||
|
||||
genericBuild |
@ -1,12 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "xextensions-1.0.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xextensions-1.0.1.tar.bz2; |
||||
md5 = "e61bca2a4757b736c9557dc8a7df2217"; |
||||
}; |
||||
inherit stdenv; |
||||
} |
||||
|
@ -1,5 +0,0 @@ |
||||
#! /bin/sh |
||||
|
||||
. $stdenv/setup |
||||
|
||||
genericBuild |
@ -1,12 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
derivation { |
||||
stdenv.mkDerivation { |
||||
name = "xproto-6.6.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xproto-6.6.1.tar.bz2; |
||||
md5 = "8a7546a607dcd61b2ee595c763fd7f85"; |
||||
}; |
||||
inherit stdenv; |
||||
} |
||||
|
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "freetype-2.1.5"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.5.tar.bz2; |
||||
md5 = "54537b518b84d04190a1eccd393a29df"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
@ -1,10 +1,8 @@ |
||||
{stdenv, fetchurl}: derivation { |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "gettext-0.12.1"; |
||||
system = stdenv.system; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz; |
||||
md5 = "5d4bddd300072315e668247e5b7d5bdb"; |
||||
}; |
||||
stdenv = stdenv; |
||||
} |
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue