mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Changed version-related syntax in python, gettext and ocaml
svn path=/nixpkgs/trunk/; revision=10316
This commit is contained in:
parent
0aef28a212
commit
b3cd1e644a
@ -1,7 +1,7 @@
|
||||
args:
|
||||
rec {
|
||||
default = v_3_09_1;
|
||||
v_3_08_0 = import ./3.08.0.nix (args // {stdenv = args.stdenv34;});
|
||||
v_3_09_1 = import ./3.09.1.nix args;
|
||||
v_3_10_0 = import ./3.10.0.nix (args // {stdenv = args.stdenvUsingSetupNew2;});
|
||||
}
|
||||
args.stdenv.lib.listOfListsToAttrs [
|
||||
[ "3.08.0" (import ./3.08.0.nix (args // {stdenv = args.stdenv34;})) ]
|
||||
[ "3.09.1" (import ./3.09.1.nix args) ]
|
||||
[ "3.10.0" (import ./3.10.0.nix (args // {stdenv = args.stdenvUsingSetupNew2;})) ]
|
||||
[ "default" (import ./3.09.1.nix args) ]
|
||||
]
|
||||
|
@ -1,5 +1,5 @@
|
||||
args: rec {
|
||||
default = v_2_4;
|
||||
v_2_4 = import ./2.4.nix args;
|
||||
v_2_5 = import ./2.5 args;
|
||||
}
|
||||
args:
|
||||
args.stdenv.lib.listOfListsToAttrs [
|
||||
[ "2.4" (import ./2.4.nix args) ]
|
||||
[ "2.5" (import ./2.5 args) ]
|
||||
]
|
||||
|
@ -1,5 +1,5 @@
|
||||
args:
|
||||
args.lib.listOfListsToAttrs [
|
||||
args.stdenv.lib.listOfListsToAttrs [
|
||||
[ "recurseForDerivations" true ]
|
||||
[ "0.14.6" (import ./0.14.6.nix args) ]
|
||||
[ "0.15" (import ./0.15.nix args) ]
|
||||
|
@ -1908,7 +1908,7 @@ rec {
|
||||
gettext = getVersion "gettext" gettext_alts;
|
||||
|
||||
gettext_alts = import ../development/libraries/gettext {
|
||||
inherit fetchurl stdenv lib;
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
gd = import ../development/libraries/gd {
|
||||
|
Loading…
Reference in New Issue
Block a user