diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
commit | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch) | |
tree | f45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs/applications | |
parent | 8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff) | |
parent | ac4c567c3603c5106862f144c21037f6ad76c0ad (diff) | |
download | nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.gz nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.bz2 nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.lz nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.xz nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.zst nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.zip |
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs/applications')
13 files changed, 110 insertions, 124 deletions
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 59012432caf..37717babce4 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.23.8"; + name = "mpg123-1.25.4"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy"; + sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 266e221649e..ad0f7ee14c5 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,8 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.57.474.gca9c9538-30"; + # Be careful not to pick the testing version. + version = "1.0.49.125.g72ee7853-111"; deps = [ alsaLib @@ -53,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437"; + sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 3dda61d95ae..a00e0ec8a48 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -17,16 +17,16 @@ with rustPlatform; buildRustPackage rec { - name = "alacritty-unstable-2017-07-08"; + name = "alacritty-unstable-2017-07-25"; src = fetchFromGitHub { owner = "jwilm"; repo = "alacritty"; - rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414"; - sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp"; + rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f"; + sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl"; }; - depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj"; + depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx"; buildInputs = [ cmake diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix new file mode 100644 index 00000000000..68b49492791 --- /dev/null +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub +, armadillo +, boost +, cmake +, glog +, gmock +, openssl +, google-gflags +, gnuradio +, orc +, pkgconfig +, pythonPackages +, uhd +}: + +stdenv.mkDerivation rec { + name = "gnss-sdr-${version}"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "gnss-sdr"; + repo = "gnss-sdr"; + rev = "v${version}"; + sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975"; + }; + + buildInputs = [ + armadillo + boost.dev + cmake + glog + gmock + openssl.dev + google-gflags + gnuradio + orc + pkgconfig + pythonPackages.Mako + + # UHD support is optional, but gnuradio is built with it, so there's + # nothing to be gained by leaving it out. + uhd + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DGFlags_ROOT_DIR=${google-gflags}/lib" + "-DGLOG_INCLUDE_DIR=${glog}/include" + + # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as + # armadillo is built using both, so skip checking for them. + "-DBLAS=YES" + "-DLAPACK=YES" + + # Similarly, it doesn't actually use gfortran despite checking for + # its presence. + "-DGFORTRAN=YES" + ]; + + meta = with stdenv.lib; { + description = "An open source Global Navigation Satellite Systems software-defined receiver"; + homepage = http://gnss-sdr.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index ace89cd8a21..0911fbace44 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; - version = "1.5.3"; + version = "1.5.4"; - src = fetchurl { - # gpgbabel.org makes it hard to get the source tarball automatically, so - # get it from elsewhere. - url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; - sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1"; + src = fetchFromGitHub { + owner = "gpsbabel"; + repo = "gpsbabel"; + rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi"; }; patches = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qt4 which ] + buildInputs = [ zlib qtbase which ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -46,7 +46,9 @@ stdenv.mkDerivation rec { # The raymarine and gtm tests fail on i686 despite -ffloat-store. + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572. - + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test"; + + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test" + # The arc-project test fails on aarch64. + + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test"; meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index b2d70b1f767..5016dc8fca3 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.10.0"; + version = "0.12.0"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc"; + sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y"; }; postInstall = '' diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 696681dce27..1b87008bac7 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -119,14 +119,14 @@ let }; gitSource = rec { - version = "2017-04-16"; + version = "2017-05-25"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf"; - sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh"; + rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3"; + sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f"; }; }; in { diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 26efbc5fe72..4d96339149a 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, vim }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }: stdenv.mkDerivation rec { name = "cryptominisat-${version}"; version = "5.0.1"; src = fetchFromGitHub { - owner = "msoos"; - repo = "cryptominisat"; - rev = version; + owner = "msoos"; + repo = "cryptominisat"; + rev = version; sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb"; }; - # vim for xxd binary - buildInputs = [ python vim ]; + buildInputs = [ python xxd ]; nativeBuildInputs = [ cmake ]; patches = [(fetchpatch rec { @@ -23,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced SAT Solver"; + homepage = https://github.com/msoos/cryptominisat; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; - license = licenses.mit; - homepage = https://github.com/msoos/cryptominisat; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 23a3ab7fa5e..c7f7a4b02e4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1msdwqp20pwaxv1a6maqb7wmaq00m8jpdga7fmbjcnpvkcdz49l7"; + sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6675068bda9..a67663d56df 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,10 +18,10 @@ with stdenv.lib; let python = python2; buildType = "release"; - extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf"; - extpackRev = "115126"; - main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899"; - version = "5.1.22"; + extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5"; + extpackRev = "117012"; + main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf"; + version = "5.1.24"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -88,7 +88,7 @@ in stdenv.mkDerivation { ''; patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ./linux-4.12.patch ]; + ++ [ ./qtx11extras.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 8865022c23e..e19cb748607 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380"; + sha256 = "0hxxv2707fb6x34m5cmjhj73sxwgmy2dgir7mbbdh9wivw07b9q1"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -62,9 +62,6 @@ stdenv.mkDerivation { for i in * do cd $i - # Files within the guest additions ISO are using DOS line endings - sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \ - | patch -d vboxguest -p4 find . -type f | xargs sed 's/depmod -a/true/' -i make cd .. diff --git a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch b/pkgs/applications/virtualization/virtualbox/linux-4.12.patch deleted file mode 100644 index 7157365466f..00000000000 --- a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch +++ /dev/null @@ -1,80 +0,0 @@ -commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb -Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> -Date: Wed May 17 09:42:23 2017 +0000 - - Runtime/r0drv: Linux 4.12 5-level page table adaptions - - - git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f - -diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -index 28dc33f963..41ed058860 100644 ---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) - union - { - pgd_t Global; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ p4d_t Four; -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - pud_t Upper; - #endif -@@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) - u.Global = *pgd_offset(current->active_mm, ulAddr); - if (RT_UNLIKELY(pgd_none(u.Global))) - return NULL; -- --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ u.Four = *p4d_offset(&u.Global, ulAddr); -+ if (RT_UNLIKELY(p4d_none(u.Four))) -+ return NULL; -+ if (p4d_large(u.Four)) -+ { -+ pPage = p4d_page(u.Four); -+ AssertReturn(pPage, NULL); -+ pfn = page_to_pfn(pPage); /* doing the safe way... */ -+ AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31); -+ pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1); -+ return pfn_to_page(pfn); -+ } -+ u.Upper = *pud_offset(&u.Four, ulAddr); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - u.Upper = *pud_offset(&u.Global, ulAddr); -+#endif - if (RT_UNLIKELY(pud_none(u.Upper))) - return NULL; --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) - if (pud_large(u.Upper)) - { - pPage = pud_page(u.Upper); -@@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) - pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1); - return pfn_to_page(pfn); - } --# endif -- -+#endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - u.Middle = *pmd_offset(&u.Upper, ulAddr); - #else /* < 2.6.11 */ - u.Middle = *pmd_offset(&u.Global, ulAddr); -diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -index 5afdee9e71..20aab0817f 100644 ---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -@@ -159,6 +159,11 @@ - # include <asm/tlbflush.h> - #endif - -+/* for set_pages_x() */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+# include <asm/set_memory.h> -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) - # include <asm/smap.h> - #else diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 40050a69025..85136cb9f97 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1594"; + version = "1600"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "1608ws3867xipcbdl2gw6ybcxzk14vq24sr62m9l65m4g4m3wbd2"; + sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; |