diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-ng.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d25c7bd60c..45a4abd383c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1712,6 +1712,8 @@ let xz = callPackage ../tools/compression/xz { }; + lz4 = callPackage ../tools/compression/lz4 { }; + lzop = callPackage ../tools/compression/lzop { }; macchanger = callPackage ../os-specific/linux/macchanger { }; @@ -2522,6 +2524,8 @@ let stress = callPackage ../tools/system/stress { }; + stress-ng = callPackage ../tools/system/stress-ng { }; + storeBackup = callPackage ../tools/backup/store-backup { }; stow = callPackage ../tools/misc/stow { }; @@ -3411,7 +3415,6 @@ let haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling; haskellPackages_ghc784_profiling = recurseIntoAttrs haskell.packages_ghc784.profiling; haskellPackages_ghc784 = recurseIntoAttrs haskell.packages_ghc784.highPrio; - haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haskellPackages_ghcjs = haskell.packages_ghcjs; haskellPackages = haskellPackages_ghc784; @@ -13044,6 +13047,8 @@ let thinkfan = callPackage ../tools/system/thinkfan { }; + tup = callPackage ../development/tools/build-managers/tup { }; + vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; giflib = giflib_4_1; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index 098273bb9585..ca9982c65ddd 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -9,6 +9,7 @@ rec { ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { gmp = pkgs.gmp4; }; ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { gmp = pkgs.gmp4; }; + ghc783Binary = callPackage ../development/compilers/ghc/7.8.3-binary.nix { gmp = pkgs.gmp4; }; ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7aec36480d00..175cac838584 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -446,6 +446,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in circlePacking = callPackage ../development/libraries/haskell/circle-packing {}; + clashLib = callPackage ../development/libraries/haskell/clash-lib {}; + + clashPrelude = callPackage ../development/libraries/haskell/clash-prelude {}; + classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {}; classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; @@ -526,6 +530,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in concurrentExtra = callPackage ../development/libraries/haskell/concurrent-extra {}; + concurrentSupply = callPackage ../development/libraries/haskell/concurrent-supply {}; + converge = callPackage ../development/libraries/haskell/converge {}; cookie = callPackage ../development/libraries/haskell/cookie {}; @@ -3104,6 +3110,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in arbtt = callPackage ../applications/misc/arbtt {}; + clashGhc = callPackage ../development/compilers/clash-ghc {}; + idris_plain = callPackage ../development/compilers/idris {}; idris = callPackage ../development/compilers/idris/wrapper.nix {}; |