diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 54a0d36cf76..10d1ced407f 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,8 +1,7 @@ args: -rec { - recurseForDerivations = true; - default = v_0_14_6; - v_0_14_6 = (import ./0.14.6.nix) args; - v_0_15 = (import ./0.15.nix) args; - v_0_16_x = (import ./0.16.x.nix) args; -} +builtins.listToAttrs [ + { name = "recurseForDerivations"; value = true; } + { name = "0.14.6"; value = (import ./0.14.6.nix) args; } + { name = "0.15"; value = (import ./0.15.nix) args; } + { name = "0.16.x"; value = (import ./0.16.x.nix) args; } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 599b4fbdc2c..8afad6b24e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -142,10 +142,10 @@ rec { # pkgname = getVersion "name" pkgname_alts; # # user will be able to write in his configuration.nix something like - # environment = { versions = { name = v_0_2; }; }; and pkgname will be equal - # to pkgname_alts.v_0_2. Using alts.default by default. + # name = { version = "0.2"; }; and pkgname will be equal + # to getAttr pkgname_alts "0.2". Using alts.default by default. getVersion = name: alts: builtins.getAttr - (getConfig [ "environment" "versions" name ] "default") alts; + (getConfig [ name "version" ] "default") alts; # The same, another syntax. # Warning: syntax for configuration.nix changed too