* 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
This commit is contained in:
2
pkgs/development/perl-modules/BerkeleyDB/builder.sh
Executable file → Normal file
2
pkgs/development/perl-modules/BerkeleyDB/builder.sh
Executable file → Normal file
@@ -1,5 +1,3 @@
|
||||
#! /bin/sh
|
||||
|
||||
buildinputs="$perl $db4"
|
||||
. $stdenv/setup || exit 1
|
||||
|
||||
|
||||
@@ -2,15 +2,13 @@
|
||||
|
||||
assert perl != null && db4 != null;
|
||||
|
||||
derivation {
|
||||
stdenv.mkDerivation {
|
||||
name = "perl-BerkeleyDB-0.25";
|
||||
system = stdenv.system;
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.25.tar.gz;
|
||||
md5 = "fcef06232d1ccd6c2a9cd114e388ea3d";
|
||||
};
|
||||
stdenv = stdenv;
|
||||
perl = perl;
|
||||
db4 = db4;
|
||||
}
|
||||
|
||||
2
pkgs/development/perl-modules/XML-Parser/builder.sh
Executable file → Normal file
2
pkgs/development/perl-modules/XML-Parser/builder.sh
Executable file → Normal file
@@ -1,5 +1,3 @@
|
||||
#! /bin/sh
|
||||
|
||||
buildinputs="$perl $expat"
|
||||
. $stdenv/setup || exit 1
|
||||
|
||||
|
||||
@@ -2,15 +2,13 @@
|
||||
|
||||
assert perl != null && expat != null;
|
||||
|
||||
derivation {
|
||||
stdenv.mkDerivation {
|
||||
name = "perl-XML-Parser-2.34";
|
||||
system = stdenv.system;
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.34.tar.gz;
|
||||
md5 = "84d9e0001fe01c14867256c3fe115899";
|
||||
};
|
||||
stdenv = stdenv;
|
||||
perl = perl;
|
||||
expat = expat;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user