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

* Tab removal.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12405
This commit is contained in:
Eelco Dolstra 2008-07-23 13:40:03 +00:00
parent 39cfcd6929
commit 32fc747f3e
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -1940,7 +1940,7 @@ let pkgs = rec {
rLang = import ../development/interpreters/r-lang { rLang = import ../development/interpreters/r-lang {
inherit fetchurl stdenv readline perl g77_42 libpng zlib; inherit fetchurl stdenv readline perl g77_42 libpng zlib;
inherit (xorg) libX11 libXt; inherit (xorg) libX11 libXt;
}; };
rubygemsFun = builderDefsPackage (import ../development/interpreters/ruby/gems.nix) { rubygemsFun = builderDefsPackage (import ../development/interpreters/ruby/gems.nix) {
@ -2090,7 +2090,7 @@ let pkgs = rec {
ddd = import ../development/tools/misc/ddd { ddd = import ../development/tools/misc/ddd {
inherit fetchurl stdenv lesstif ncurses; inherit fetchurl stdenv lesstif ncurses;
inherit (xlibs) libX11 libXt; inherit (xlibs) libX11 libXt;
}; };
elfutilsFun = lib.sumArgs elfutilsFun = lib.sumArgs
@ -7044,7 +7044,7 @@ let pkgs = rec {
emboss = import ../applications/science/biology/emboss { emboss = import ../applications/science/biology/emboss {
inherit fetchurl stdenv readline perl libpng zlib; inherit fetchurl stdenv readline perl libpng zlib;
inherit (xorg) libX11 libXt; inherit (xorg) libX11 libXt;
}; };
mrbayes = import ../applications/science/biology/mrbayes { mrbayes = import ../applications/science/biology/mrbayes {

4
pkgs/top-level/builder-defs.nix
View File

@ -453,8 +453,8 @@ args: with args; with stringsWithDeps; with lib;
"; ";
doMakeCheck = FullDepEntry ('' doMakeCheck = FullDepEntry (''
make check make check
'') ["minInit"]; '') ["minInit"];
extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args; extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args;

38
pkgs/top-level/template-composing+config.nix
View File

@ -1,22 +1,22 @@
args : with args; let localDefs = builderDefs (args // rec { args : with args; let localDefs = builderDefs (args // rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
(abort "Specify source"); (abort "Specify source");
useConfig = true; useConfig = true;
reqsList = [ reqsList = [
["true" ] ["true" ]
["false"] ["false"]
]; ];
/* List consisiting of an even number of strings; "key" "value" */ /* List consisiting of an even number of strings; "key" "value" */
configFlags = [ configFlags = [
]; ];
}) args null; /* null is a terminator for sumArgs */ }) args null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${(abort "Specify name")}"+version; name = "${(abort "Specify name")}"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]); (textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = "${(abort "Specify description")}"; description = "${(abort "Specify description")}";
inherit src; inherit src;
}; };
} }