diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:41:09 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:41:09 -0700 |
commit | 2ef6508c7f187e1b8433f9936b98b79bee6ed31c (patch) | |
tree | 80b19d8098b5a1d93c8bca057438b5d0ed35f704 /pkgs/top-level | |
parent | ed71860928c2c645d388ef55b51623c42b948596 (diff) | |
parent | 423613129505299ee0779863cd759c0afb31ce24 (diff) | |
download | nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.tar nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.tar.gz nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.tar.bz2 nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.tar.lz nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.tar.xz nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.tar.zst nixlib-2ef6508c7f187e1b8433f9936b98b79bee6ed31c.zip |
Merge branch 'master.upstream' into staging.post-15.06
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 10 |
3 files changed, 43 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfc7d8b5d43d..fc17b1322889 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 { }; @@ -7404,11 +7406,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; @@ -9067,6 +9067,7 @@ let openresty = callPackage ../servers/http/openresty { }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; + opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; openxpki = callPackage ../servers/openxpki { }; @@ -10012,6 +10013,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: @@ -11787,6 +11792,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 { }; @@ -11807,6 +11814,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 { }; @@ -13935,6 +13945,7 @@ let libcanberra = libcanberra_kde; boost = boost155; kdelibs = kdeApps_15_08.kdelibs; + subversionClient = subversionClient.override { branch = "1.8"; }; } ../desktops/kde-4.14; @@ -14962,6 +14973,8 @@ let tvheadend = callPackage ../servers/tvheadend { }; + urbit = callPackage ../misc/urbit { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; @@ -15121,6 +15134,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 ead04c0f088d..1057be798df0 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 = { |