diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:45:56 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 15:23:13 +0200 |
commit | f361938b210e057906dcdd5471275ddf265e4a4e (patch) | |
tree | ea69e01503464f511e388d36fe69c3c689b42fbc /pkgs/top-level | |
parent | f2cb132c34d115761a19728a2a6a595f4fa08761 (diff) | |
parent | b233ecdca68e08940024da6e4e55e6ef2a20863f (diff) | |
download | nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.gz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.bz2 nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.lz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.xz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.zst nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.zip |
Merge staging into closure-size
This makes gcc5 the default builder, etc.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 51 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 10 |
3 files changed, 56 insertions, 25 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 678968fbcdaf..50bb9bab40c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -853,6 +853,8 @@ let gmic = callPackage ../tools/graphics/gmic { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; + mathics = pythonPackages.mathics; mcrl = callPackage ../tools/misc/mcrl { }; @@ -1368,7 +1370,7 @@ let emv = callPackage ../tools/misc/emv { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; @@ -3733,7 +3735,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc49; + gcc = gcc5; gcc_multi = if system == "x86_64-linux" then lowPrio ( @@ -4148,7 +4150,7 @@ let llvm_34 = llvmPackages_34.llvm; llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { }; - llvmPackages = recurseIntoAttrs llvmPackages_36; + llvmPackages = recurseIntoAttrs llvmPackages_37; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -4985,8 +4987,7 @@ let fetchurl = fetchurlBoot; }; - # Make perl522 the default once gnulib is updated to support it. - perl = perl520; + perl = perl522; php = php56; @@ -5842,7 +5843,7 @@ let aalib = callPackage ../development/libraries/aalib { }; - accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; }; + accelio = callPackage ../development/libraries/accelio { }; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -6350,7 +6351,8 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp = gmp5; + gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; + gmp = gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -7411,11 +7413,9 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libunwind = if stdenv.isDarwin - then libunwindNative + then darwin.libunwind 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; @@ -7562,7 +7562,6 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; - llvmPackages = llvmPackages_36; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( @@ -7790,14 +7789,6 @@ 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 { }; @@ -9083,6 +9074,7 @@ let openresty = callPackage ../servers/http/openresty { }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; + opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; openxpki = callPackage ../servers/openxpki { }; @@ -10026,6 +10018,10 @@ 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: @@ -10181,7 +10177,13 @@ let sysklogd = callPackage ../os-specific/linux/sysklogd { }; - syslinux = callPackage ../os-specific/linux/syslinux { }; + 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; + }; sysstat = callPackage ../os-specific/linux/sysstat { }; @@ -11796,6 +11798,8 @@ 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 { }; @@ -11816,6 +11820,9 @@ 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 { }; @@ -13944,6 +13951,7 @@ let libcanberra = libcanberra_kde; boost = boost155; kdelibs = kdeApps_15_08.kdelibs; + subversionClient = subversionClient.override { branch = "1.8"; }; } ../desktops/kde-4.14; @@ -14971,6 +14979,8 @@ let tvheadend = callPackage ../servers/tvheadend { }; + urbit = callPackage ../misc/urbit { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; @@ -15130,6 +15140,7 @@ 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 diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 2bf0a96a5aa1..ec9ac07fe9ae 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -679,6 +679,26 @@ let subPackages = [ "./" ]; # don't try to build test fixtures }; + git-lfs = buildFromGitHub { + rev = "v1.0.0"; + owner = "github"; + repo = "git-lfs"; + sha256 = "1zlg3rm5yxak6d88brffv1wpj0iq4qgzn6sgg8xn0pbnzxjd1284"; + + # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' + excludedPackages = [ "test" ]; + + preBuild = '' + pushd go/src/github.com/github/git-lfs + go generate ./commands + popd + ''; + + postInstall = '' + rm -v $bin/bin/{man,script} + ''; + }; + glide = buildFromGitHub { rev = "0.5.0"; owner = "Masterminds"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 19cbb5bb3e28..6b95fbb2c7fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -715,15 +715,15 @@ let self = _self // overrides; _self = with self; { }; Cairo = buildPerlPackage rec { - name = "Cairo-1.105"; + name = "Cairo-1.106"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0im025wy1346w7b7hi6im08bfn6x4ma0cxmjz6xnk8riizm1s84q"; + sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.cairo ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; - description = "Perl interface to the cairo 2d vector graphics library"; + description = "Perl interface to the cairo 2D vector graphics library"; maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -4843,10 +4843,10 @@ let self = _self // overrides; _self = with self; { }; Glib = buildPerlPackage rec { - name = "Glib-1.313"; + name = "Glib-1.314"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "162g342bhzy2ca4xwk63j10q9jycsps0s8l8y8pda70m7zcmr7xj"; + sha256 = "13lhyksm7fgj6rgrgs06kr0hinbyhiq3lfr6gd2qal1j2w0rwzml"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ]; meta = { |