diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acee935fcd45..91be55c0ee01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,7 +1278,7 @@ let logrotate = callPackage ../tools/system/logrotate { }; - logstalgica = callPackage ../tools/graphics/logstalgica {}; + logstalgia = callPackage ../tools/graphics/logstalgia {}; lout = callPackage ../tools/typesetting/lout { }; @@ -2908,7 +2908,7 @@ let lessc = callPackage ../development/compilers/lessc { }; - llvm = llvm_33; # deprecated, depend on llvm_* directly + llvm = llvm_33; llvm_34 = callPackage ../development/compilers/llvm { version = "3.4"; stdenv = if stdenv.isDarwin @@ -4364,6 +4364,8 @@ let '' # */ ; + glm = callPackage ../development/libraries/glm { }; + glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { @@ -6598,6 +6600,8 @@ let python = pythonFull; }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 59646db8c743..99cb3351515f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2273,6 +2273,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # pass it explicitly in rare circumstances. time = null; + timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {}; + + timezoneSeries = callPackage ../development/libraries/haskell/timezone-series {}; + timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls = callPackage ../development/libraries/haskell/tls {}; |