From d7b1fdabd3a93894b5b2bc7dbaf85c67c6a683fd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 7 May 2008 07:23:20 +0000
Subject: [PATCH] all-packages.nix changes; now builderDefsPackage includes
.meta.function attribute
svn path=/nixpkgs/trunk/; revision=11767
---
.../socat/{1.6.0.0.nix => 1.6.0.1.nix} | 0
pkgs/top-level/all-packages.nix | 16 ++++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
rename pkgs/tools/networking/socat/{1.6.0.0.nix => 1.6.0.1.nix} (100%)
diff --git a/pkgs/tools/networking/socat/1.6.0.0.nix b/pkgs/tools/networking/socat/1.6.0.1.nix
similarity index 100%
rename from pkgs/tools/networking/socat/1.6.0.0.nix
rename to pkgs/tools/networking/socat/1.6.0.1.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 218e923ab270..bac5e2372d19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -270,7 +270,9 @@ let pkgs = rec {
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);
stringsWithDeps = import ../lib/strings-with-deps.nix {
@@ -991,11 +993,9 @@ let pkgs = rec {
smbfsFuse = smbfsFuseFun null;
- socatFun = lib.sumArgs (selectVersion ../tools/networking/socat "1.6.0.0") {
- inherit builderDefs openssl;
- };
-
- socat = socatFun null;
+ socat = builderDefsPackage (selectVersion ../tools/networking/socat "1.6.0.1") {
+ inherit openssl;
+ } null;
sudo = import ../tools/security/sudo {
inherit fetchurl stdenv coreutils pam;
@@ -5792,6 +5792,10 @@ let pkgs = rec {
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)
teamspeak_client = import ../applications/networking/instant-messengers/teamspeak/client.nix {
inherit fetchurl stdenv;