diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix
index 74d1378968cf..f058db31364a 100644
--- a/pkgs/development/compilers/ocaml/default.nix
+++ b/pkgs/development/compilers/ocaml/default.nix
@@ -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) ]
+]
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 3ac782e1aee3..1ca85603a1fb 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -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) ]
+]
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index e98d365022fa..b0e64639d87d 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -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) ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d94449af3963..79ea38c7e1e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {