* 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:
@@ -12,9 +12,8 @@ assert httpServer -> httpd != null && httpd.expat == expat;
|
||||
assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
|
||||
assert swigBindings -> swig != null && swig.pythonSupport;
|
||||
|
||||
derivation {
|
||||
stdenv.mkDerivation {
|
||||
name = "subversion-1.0.1";
|
||||
system = stdenv.system;
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
@@ -28,5 +27,5 @@ derivation {
|
||||
swig = if swigBindings then swig else null;
|
||||
python = if swigBindings then swig.python else null;
|
||||
|
||||
inherit stdenv expat localServer httpServer sslSupport swigBindings;
|
||||
inherit expat localServer httpServer sslSupport swigBindings;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user