diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2623ffa6ac5..c7008bd86c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -853,8 +853,6 @@ let gmic = callPackage ../tools/graphics/gmic { }; - heatseeker = callPackage ../tools/misc/heatseeker { }; - mathics = pythonPackages.mathics; mcrl = callPackage ../tools/misc/mcrl { }; @@ -1370,7 +1368,7 @@ let emv = callPackage ../tools/misc/emv { }; - enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; @@ -3734,7 +3732,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc5; + gcc = gcc49; gcc_multi = if system == "x86_64-linux" then lowPrio ( @@ -4986,7 +4984,8 @@ let fetchurl = fetchurlBoot; }; - perl = perl522; + # Make perl522 the default once gnulib is updated to support it. + perl = perl520; php = php56; @@ -5842,7 +5841,7 @@ let aalib = callPackage ../development/libraries/aalib { }; - accelio = callPackage ../development/libraries/accelio { }; + accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; }; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -6350,8 +6349,7 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = gmp6; + gmp = gmp5; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -7405,9 +7403,11 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libunwind = if stdenv.isDarwin - then darwin.libunwind + then libunwindNative else callPackage ../development/libraries/libunwind { }; + libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; + libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { automake = automake113x; # fails with 14 inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; @@ -7781,6 +7781,14 @@ let }; }; + openssl_1_0_2 = callPackage ../development/libraries/openssl/1.0.2.x.nix { + fetchurl = fetchurlBoot; + cryptodevHeaders = linuxPackages.cryptodev.override { + fetchurl = fetchurlBoot; + onlyHeaders = true; + }; + }; + openwsman = callPackage ../development/libraries/openwsman {}; ortp = callPackage ../development/libraries/ortp { }; @@ -9068,7 +9076,6 @@ let openresty = callPackage ../servers/http/openresty { }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; - opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; openxpki = callPackage ../servers/openxpki { }; @@ -10014,10 +10021,6 @@ let mingetty = callPackage ../os-specific/linux/mingetty { }; - miraclecast = callPackage ../os-specific/linux/miraclecast { - systemd = systemd.override { enableKDbus = true; }; - }; - module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; aggregateModules = modules: @@ -10173,13 +10176,7 @@ let sysklogd = callPackage ../os-specific/linux/sysklogd { }; - syslinux = callPackage ../os-specific/linux/syslinux { - # Using GCC5 with 6.03 creates a broken isolinux.bin - # Make sure to test booting the livecd on a bios system - # if changing this override. - # nixos.tests.bootBiosCdrom is useful for this. - stdenv = overrideCC stdenv gcc48; - }; + syslinux = callPackage ../os-specific/linux/syslinux { }; sysstat = callPackage ../os-specific/linux/sysstat { }; @@ -11793,8 +11790,6 @@ let iptraf = callPackage ../applications/networking/iptraf { }; - iptraf-ng = callPackage ../applications/networking/iptraf-ng { }; - irssi = callPackage ../applications/networking/irc/irssi { }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; @@ -11815,9 +11810,6 @@ let jackmeter = callPackage ../applications/audio/jackmeter { }; - jackmix = callPackage ../applications/audio/jackmix { }; - jackmix_jack1 = jackmix.override { jack = jack1; }; - jalv = callPackage ../applications/audio/jalv { }; jedit = callPackage ../applications/editors/jedit { }; @@ -13946,7 +13938,6 @@ let libcanberra = libcanberra_kde; boost = boost155; kdelibs = kdeApps_15_08.kdelibs; - subversionClient = subversionClient.override { branch = "1.8"; }; } ../desktops/kde-4.14; @@ -14974,8 +14965,6 @@ let tvheadend = callPackage ../servers/tvheadend { }; - urbit = callPackage ../misc/urbit { }; - utf8proc = callPackage ../development/libraries/utf8proc { }; vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; @@ -15135,7 +15124,6 @@ aliases = with self; rec { clangAnalyzer = clang-analyzer; # added 2015-02-20 cool-old-term = cool-retro-term; # added 2015-01-31 cv = progress; # added 2015-09-06 - enblendenfuse = enblend-enfuse; # 2015-09-30 exfat-utils = exfat; # 2015-09-11 firefoxWrapper = firefox-wrapper; fuse_exfat = exfat; # 2015-09-11 |