public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12655
This commit is contained in:
Michael Raskin
2008-08-19 05:54:09 +00:00
parent b5b68ce414
commit 87ff8d6347
51 changed files with 224 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/qi/9.1.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = http://www.lambdassociates.org/Download/Qi9.1.zip;
@@ -7,7 +7,7 @@ args : with args;
};
buildInputs = [ unzip clisp];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
let
shell=stdenv.shell;

4
pkgs/development/interpreters/pyrex/0.9.5.nix
View File

@@ -2,7 +2,7 @@ args: with args;
let
localDefs = builderDefs {
localDefs = builderDefs.meta.function {
src = fetchurl {
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz;
@@ -11,7 +11,7 @@ let
buildInputs = [python];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;

4
pkgs/development/interpreters/pyrex/0.9.6.nix
View File

@@ -2,7 +2,7 @@ args: with args;
let
localDefs = builderDefs {
localDefs = builderDefs.meta.function {
src = fetchurl {
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz;
@@ -11,7 +11,7 @@ let
buildInputs = [python];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;

26
pkgs/development/libraries/cl-ppcre/default.nix Normal file
View File

@@ -0,0 +1,26 @@
args :
let
lib = args.lib;
fetchurl = args.fetchurl;
simplyShare = args.simplyShare;
version = lib.getAttr ["version"] "2.0.0" args;
buildInputs = with args; [ ];
in
rec {
src = fetchurl {
url = http://weitz.de/files/cl-ppcre.tar.gz;
sha256 = "14zxrmc4b4q9kg505y9lb0nqp80fpmpwn51xwkqiwkm361n6h23p";
};
inherit buildInputs;
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = [(simplyShare "cl-ppcre")];
name = "cl-ppcre-" + version;
meta = {
description = "Common Lisp Portable Perl Compatible RegExp library";
};
}

4
pkgs/development/libraries/fftw/default.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src =
fetchurl {
url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz;
@@ -7,7 +7,7 @@ args : with args;
};
buildInputs = [];
configureFlags = ["--enable-float --enable-shared"];
} null;
};
in with localDefs;
stdenv.mkDerivation {
name = "fftw-3.1.2";

4
pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz;
@@ -26,7 +26,7 @@ args : with args;
" --with-sqlite-libdir=${args.sqlite}/lib/sqlite "
] else [])
;
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
stdenv.mkDerivation rec {
name = "libdbi"+version;

4
pkgs/development/libraries/libdbi/0.8.2.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
buildInputs = [];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
stdenv.mkDerivation rec {
name = "libdbi"+version;

4
pkgs/development/libraries/libextractor/0.5.18.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
buildInputs = [ zlib];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
stdenv.mkDerivation rec {
name = "libextractor"+version;

4
pkgs/development/tools/misc/indent/2.2.9.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
buildInputs = [];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
let
preBuild = FullDepEntry ("

4
pkgs/development/tools/misc/intltool/0.36.2.nix
View File

@@ -1,5 +1,5 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
propagatedBuildInputs = [perl perlXMLParser];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
stdenv.mkDerivation rec {
name = "intltool-0.36.2";

6
pkgs/development/tools/misc/ltrace/0.5-3deb.nix
View File

@@ -1,7 +1,7 @@
args : with args; let
patch = ./ltrace_0.5-3.diff.gz;
localDefs = with (builderDefs {src="";} null);
builderDefs {
localDefs = with builderDefs;
builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;
@@ -17,7 +17,7 @@ args : with args; let
gunzip < ${patch} | patch -Np1
sed -e s@-Werror@@ -i Makefile.in
'')["minInit" "doUnpack"];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
let
preConfigure = FullDepEntry ("