From b763e1d5201e42402a9eef513e28d5ca0de202ee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2009 15:49:58 +0000 Subject: [PATCH] * makeOverridable: call the override function "override" instead of "function", which isn't very descriptive ;-) Also, the argument to "override" can be either a function (that takes the old arguments and returns the overriding arguments), or a plain attribute set that contains the overriding arguments. E.g. you can say nixUnstable.override { supportOldDBs = false; } and nixUnstable.override (oldArgs: { name = oldArgs.name + "-my-version"; }) svn path=/nixpkgs/trunk/; revision=14468 --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f70204a7f1..e9cfa7d11a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -195,7 +195,8 @@ let import (dir + "/${pVersion}.nix") (args // { version = pVersion; }); makeOverridable = f: origArgs: f origArgs // - { function = newArgsFun: makeOverridable f (origArgs // (newArgsFun origArgs)); + { override = newArgs: + makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); }; @@ -9401,7 +9402,7 @@ let }; # The bleeding edge. - nixUnstable = import ../tools/package-management/nix/unstable.nix { + nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { inherit fetchurl stdenv perl curl bzip2 openssl; aterm = aterm242fixes; db4 = db45;