diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312959fdb247..f2c8b83ada53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,6 +429,8 @@ let actdiag = pythonPackages.actdiag; + adom = callPackage ../games/adom { }; + aefs = callPackage ../tools/filesystems/aefs { }; aegisub = callPackage ../applications/video/aegisub { @@ -1377,7 +1379,7 @@ let kippo = callPackage ../servers/kippo { }; klavaro = callPackage ../games/klavaro {}; - + kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; minidlna = callPackage ../tools/networking/minidlna { @@ -1781,7 +1783,7 @@ let }; p0f = callPackage ../tools/security/p0f { }; - + pngout = callPackage ../tools/graphics/pngout { }; hurdPartedCross = @@ -1971,6 +1973,8 @@ let rdmd = callPackage ../development/compilers/rdmd { }; + rhash = callPackage ../tools/security/rhash { }; + riemann_c_client = callPackage ../tools/misc/riemann-c-client { }; ripmime = callPackage ../tools/networking/ripmime {}; @@ -2620,7 +2624,11 @@ let compcert = callPackage ../development/compilers/compcert {}; cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {}); - cryptol2 = haskellPackages_ghc763.cryptol; # doesn't compile with the lastest 7.8.3 release + cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix { + Cabal = Cabal_1_18_1_3; + cabalInstall = cabalInstall_1_18_0_3; + process = process_1_2_0_0; + }; cython = pythonPackages.cython; cython3 = python3Packages.cython; @@ -3120,6 +3128,8 @@ let }); llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; + manticore = callPackage ../development/compilers/manticore { }; + mentorToolchains = recurseIntoAttrs ( callPackage_i686 ../development/compilers/mentor {} ); @@ -5866,6 +5876,10 @@ let openspades = callPackage ../games/openspades {}; + libressl = callPackage ../development/libraries/libressl { }; + + boringssl = callPackage ../development/libraries/boringssl { }; + openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; cryptodevHeaders = linuxPackages.cryptodev.override { @@ -6399,7 +6413,7 @@ let xbase = callPackage ../development/libraries/xbase { }; xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; - + xdo = callPackage ../tools/misc/xdo { }; xineLib = callPackage ../development/libraries/xine-lib { @@ -6853,6 +6867,8 @@ let nsq = callPackage ../servers/nsq { }; + openresty = callPackage ../servers/http/openresty { }; + opensmtpd = callPackage ../servers/mail/opensmtpd { }; petidomo = callPackage ../servers/mail/petidomo { }; @@ -7218,6 +7234,8 @@ let fbterm = callPackage ../os-specific/linux/fbterm { }; + firejail = callPackage ../os-specific/linux/firejail {}; + fuse = callPackage ../os-specific/linux/fuse { }; fxload = callPackage ../os-specific/linux/fxload { }; @@ -8330,11 +8348,8 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = haskellPackages_ghc763.darcs.override { - # A variant of the Darcs derivation that containts only the executable and - # thus has no dependencies on other Haskell packages. We have to use the older - # GHC 7.6.3 package set because darcs won't compile with 7.8.x. - cabal = haskellPackages_ghc763.cabal.override { + darcs = with haskellPackages_ghc763; callPackage ../applications/version-management/darcs { + cabal = cabal.override { extension = self : super : { isLibrary = false; configureFlags = "-f-library " + super.configureFlags or ""; @@ -9338,7 +9353,7 @@ let }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; - + sxhkd = callPackage ../applications/window-managers/sxhkd { }; msmtp = callPackage ../applications/networking/msmtp { }; @@ -9642,9 +9657,7 @@ let # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended" slic3r = callPackage ../applications/misc/slic3r { - inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp - BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi - MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus; + perlPackages = perl514Packages; perl = perl514; }; @@ -9827,10 +9840,7 @@ let twmn = callPackage ../applications/misc/twmn { }; - twinkle = callPackage ../applications/networking/instant-messengers/twinkle { - ccrtp = ccrtp_1_8; - libzrtpcpp = libzrtpcpp_1_6; - }; + twinkle = callPackage ../applications/networking/instant-messengers/twinkle { }; umurmur = callPackage ../applications/networking/umurmur { }; @@ -9846,7 +9856,7 @@ let uzbl = callPackage ../applications/networking/browsers/uzbl { webkit = webkitgtk2; }; - + uTox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { }; @@ -9990,7 +10000,7 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" - , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: + , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; @@ -10614,6 +10624,8 @@ let calligra = callPackage ../applications/office/calligra { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; + digikam = if builtins.compareVersions "4.9" kde4.release == 1 then callPackage ../applications/graphics/digikam/2.nix { } else |