diff options
Diffstat (limited to 'pkgs/applications')
6 files changed, 48 insertions, 37 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 4acc7cf37583..8e18d531605c 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -9,11 +9,11 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.2"; + version = "2.10.4"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w"; + sha256 = "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z"; }; nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 44531a672b32..97b60080365f 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; }; - buildInputs = [ jre8 makeWrapper ]; + buildInputs = [ jre10 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - makeWrapper ${jre8}/bin/java $out/bin/josm \ + makeWrapper ${jre10}/bin/java $out/bin/josm \ --add-flags "-jar $out/share/java/josm.jar" mkdir -p $out/share/applications diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c2f27a0f7fc3..4e0f362360df 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,11 +12,11 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.7.225"; + version = "1.10.100"; src = fetchzip { - url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip"; + sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; stripRoot = false; }; @@ -27,15 +27,13 @@ let }; in python3Packages.buildPythonApplication rec { - name = "qutebrowser-${version}${versionPostfix}"; - namePrefix = ""; - version = "1.3.3"; - versionPostfix = ""; + pname = "qutebrowser"; + version = "1.4.0"; # the release tarballs are different from the git checkout! src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "169xgwizw9kpdg0xll5jrxkb1k107cl4j1zx3jhmpsfbgykcnxpz"; }; # Needs tox diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index dd1ce2264d5f..ac00fb7bbd35 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -3,8 +3,7 @@ , libGL, xcbutilkeysyms, xdg_utils, libtool }: let - - version = "4.30.4.1672"; + version = "4.30.5.1676"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -39,22 +38,13 @@ let systemd libGL ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx"; - } - else - throw "HipChat is not supported on ${stdenv.system}"; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "hipchat-${version}"; - inherit src; + src = fetchurl { + url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; + sha256 = "1fmvarq7zf1cnah2d1l7rxhbiw3dmjcxsldys5is63y204hdh04y"; + }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 91ea7e500144..222021bb1c9f 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cln, gmp, swig, pkgconfig , readline, libantlr3c, boost, jdk, autoreconfHook -, python2, antlr3_4 +, python3, antlr3_4 }: stdenv.mkDerivation rec { name = "cvc4-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; - sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; + sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ]; + buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://cvc4.cs.nyu.edu/web/; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl thoughtpolice ]; + maintainers = with maintainers; [ vbgl thoughtpolice gebner ]; }; } diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 12b2a36c6eae..e05839b2a143 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, zlib, git }: +{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }: stdenv.mkDerivation rec { version = "4.2.2"; @@ -16,7 +16,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ git ]; buildInputs = [ z3 zlib ]; - makeFlags = [ "vampire_z3_rel" ]; + makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ]; + + patches = [ + # https://github.com/vprover/vampire/pull/54 + (fetchpatch { + name = "fix-apple-cygwin-defines.patch"; + url = https://github.com/vprover/vampire/pull/54.patch; + sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; + }) + # https://github.com/vprover/vampire/pull/55 + (fetchpatch { + name = "fix-wait-any.patch"; + url = https://github.com/vprover/vampire/pull/55.patch; + sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; + }) + # https://github.com/vprover/vampire/pull/56 + (fetchpatch { + name = "fenv.patch"; + url = https://github.com/vprover/vampire/pull/56.patch; + sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; + }) + ]; + + enableParallelBuilding = true; fixupPhase = '' rm -rf z3 |