diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-10 20:04:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-10 20:04:08 +0000 |
| commit | 2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea (patch) | |
| tree | 9074303e65e2fe97a1576e2f3da808714285863a | |
| parent | dfb33451499e9d626371927462c14c4e385331ba (diff) | |
| download | nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.tar nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.tar.gz nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.tar.bz2 nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.tar.lz nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.tar.xz nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.tar.zst nixlib-2ae9a1c9471a0fc1c7e556072fdc3bfb6191eeea.zip | |
* Doh.
svn path=/nixpkgs/trunk/; revision=14498
| -rw-r--r-- | pkgs/development/compilers/ghcs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/misc/bleeding-edge-repos/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/ghc68extraLibs/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghcs/default.nix b/pkgs/development/compilers/ghcs/default.nix index 8865ce78d03b..1eeadd06f6a7 100644 --- a/pkgs/development/compilers/ghcs/default.nix +++ b/pkgs/development/compilers/ghcs/default.nix @@ -173,7 +173,7 @@ rec { }; }; derivations = with lib; builtins.listToAttrs (lib.concatLists ( lib.mapRecordFlatten - ( n : attrs : let d = (toDerivation attrs); in [ (nv n d) (nv attrs.name d) ] ) pkgs ) ); + ( n : attrs : let d = (toDerivation attrs); in [ (nameValuePair n d) (nameValuePair attrs.name d) ] ) pkgs ) ); }.derivations; }); diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix index dade5b3e94bd..846788aca90f 100644 --- a/pkgs/development/misc/bleeding-edge-repos/default.nix +++ b/pkgs/development/misc/bleeding-edge-repos/default.nix @@ -23,7 +23,7 @@ args: then localTarGZ else fetchinfo; repos = - let kde4support = builtins.listToAttrs (map (n: lib.nv ("kdesupport_"+n) { type = "svn"; url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${n}"; groups="kdesupport"; }) + let kde4support = builtins.listToAttrs (map (n: lib.nameValuePair ("kdesupport_"+n) { type = "svn"; url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${n}"; groups="kdesupport"; }) [ "akode" "eigen" "gmm" "qca" "qimageblitz" "soprano" "strigi" "taglib" "automoc" "akonadi" "cpptoxml" "decibel" "emerge" "phonon" "tapioca_qt" "telepathy_qt"]); in # in trunk but not yet supported by nix: akonadi/ automoc/ cpptoxml/ decibel/ emerge/ kdewin-installer/ kdewin32/ phonon/ tapioca-qt/ telepathy-qt/ diff --git a/pkgs/misc/ghc68extraLibs/default.nix b/pkgs/misc/ghc68extraLibs/default.nix index b3191cd1fa9a..57226d8e996e 100644 --- a/pkgs/misc/ghc68extraLibs/default.nix +++ b/pkgs/misc/ghc68extraLibs/default.nix @@ -448,5 +448,5 @@ rec { pass = if attrs ? pass then attrs.pass else {}; }); derivations = with lib; builtins.listToAttrs (lib.concatLists ( lib.mapRecordFlatten - ( n : attrs : let d = (toDerivation attrs); in [ (nv n d) (nv attrs.name d) ] ) pkgs ) ); + ( n : attrs : let d = (toDerivation attrs); in [ (nameValuePair n d) (nameValuePair attrs.name d) ] ) pkgs ) ); }.derivations |