From 87ff8d6347cd99618bc8f9ff58ddf357ce38c522 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 Aug 2008 05:54:09 +0000
Subject: Changed builderDefs to use composedArgsAndFun, reduced number of
 nulls, made overrides in builderDefsPackage to work in an intuitive manner.

svn path=/nixpkgs/trunk/; revision=12655
---
 pkgs/development/interpreters/pyrex/0.9.5.nix | 4 ++--
 pkgs/development/interpreters/pyrex/0.9.6.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/interpreters/pyrex')

diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index d494b5a15394..0b57d690e01f 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -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;
         
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 02c1d532abb3..7125a2aff20e 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -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;
         
-- 
cgit 1.4.1