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

all-packages.nix changes; now builderDefsPackage includes .meta.function attribute

Browse Source 
svn path=/nixpkgs/trunk/; revision=11767
This commit is contained in:
Michael Raskin 2008-05-07 07:23:20 +00:00
parent 8fa23b53af
commit d7b1fdabd3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/tools/networking/socat/1.6.0.0.nix → pkgs/tools/networking/socat/1.6.0.1.nix
View File

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

@ -270,7 +270,9 @@ let pkgs = rec {
inherit stringsWithDeps lib stdenv writeScript fetchurl; inherit stringsWithDeps lib stdenv writeScript fetchurl;
}; };
builderDefsPackage = expr: lib.composedArgs composedArgsAndFun = f : lib.composedArgs (arg : (f arg)//{meta={function=(composedArgsAndFun f) arg;};});
builderDefsPackage = expr: composedArgsAndFun
(((builderDefs null).builderDefsPackage builderDefs) expr); (((builderDefs null).builderDefsPackage builderDefs) expr);
stringsWithDeps = import ../lib/strings-with-deps.nix { stringsWithDeps = import ../lib/strings-with-deps.nix {
@ -991,11 +993,9 @@ let pkgs = rec {
smbfsFuse = smbfsFuseFun null; smbfsFuse = smbfsFuseFun null;
socatFun = lib.sumArgs (selectVersion ../tools/networking/socat "1.6.0.0") { socat = builderDefsPackage (selectVersion ../tools/networking/socat "1.6.0.1") {
inherit builderDefs openssl; inherit openssl;
}; } null;
socat = socatFun null;
sudo = import ../tools/security/sudo { sudo = import ../tools/security/sudo {
inherit fetchurl stdenv coreutils pam; inherit fetchurl stdenv coreutils pam;
@ -5792,6 +5792,10 @@ let pkgs = rec {
inherit (xlibs) xextproto libXtst inputproto; inherit (xlibs) xextproto libXtst inputproto;
}; };
tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.31") {
python = python25;
} null;
/* does'nt work yet i686-linux only (32bit version) /* does'nt work yet i686-linux only (32bit version)
teamspeak_client = import ../applications/networking/instant-messengers/teamspeak/client.nix { teamspeak_client = import ../applications/networking/instant-messengers/teamspeak/client.nix {
inherit fetchurl stdenv; inherit fetchurl stdenv;