diff options
19 files changed, 51 insertions, 80 deletions
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index a413b7227326..e4a33edfb8b1 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0qwghs9q91ifywvrn8jgnnqzfrbbsi4lf92ikxq0dmdv734pdw0c"; + sha256 = "1m5shx4xnjrf5lfxivh3ns0a08wdrkhfyk6hbmkv65j9pwc1sr8n"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index c08bd52c989a..1273292430c4 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -4,14 +4,14 @@ , kio, kcrash , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler, curl, ilmbase -, qtmultimedia, qtx11extras +, qtmultimedia, qtx11extras, quazip , python3Packages }: let -major = "4.1"; -minor = "8"; +major = "4.2"; +minor = "0"; patch = null; in @@ -22,7 +22,7 @@ mkDerivation rec { src = fetchurl { url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4"; + sha256 = "1l5bhk4b2f3qdzg9jk2sxz2bq8cqs10nm3wgkrkbqs6vig75rsym"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; @@ -32,7 +32,7 @@ mkDerivation rec { ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio poppler curl ilmbase - qtmultimedia qtx11extras + qtmultimedia qtx11extras quazip python3Packages.pyqt5 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 05d047f72275..14a28fc55b7f 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation rec { - version = "3.10.2"; + name = "nomacs-${version}"; + version = "3.12"; + src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh"; + sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; }; - name = "nomacs-${version}"; - enableParallelBuilding = true; setSourceRoot = '' diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 9822a187b9e8..4a73e6b002ee 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "4.2"; + version = "4.2.2"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1ipvhd9wa4iq0763b9h4f3xa6x31bssi6m0595w97mdhh9n6bgxg"; + sha256 = "1wy5i1av1s98yr56ybiq66kv0vg48zci3fp91zfgj04nh2966w1w"; }; checkInputs = [ diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index f7cfee3e6516..a5ee6c8e4ae5 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme ]; + buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; meta = with stdenv.lib; { homepage = https://blog.sarine.nl/tag/gpxviewer/; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index ee99e21f6ec2..b52cff784e5f 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - ./quazip5.patch ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/keepassx/quazip5.patch b/pkgs/applications/misc/keepassx/quazip5.patch deleted file mode 100644 index ccea841cac7d..000000000000 --- a/pkgs/applications/misc/keepassx/quazip5.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake -index 8d309181..92aa892c 100644 ---- a/cmake/FindQuaZip.cmake -+++ b/cmake/FindQuaZip.cmake -@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - SET(QUAZIP_FOUND TRUE) - ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - IF(Qt5Core_FOUND) -- set(QUAZIP_LIB_VERSION_SUFFIX 5) - ENDIF() - IF(WIN32) - FIND_PATH(QUAZIP_LIBRARY_DIR -diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp -index 33f5ed1f..5fcd9202 100644 ---- a/src/keeshare/ShareObserver.cpp -+++ b/src/keeshare/ShareObserver.cpp -@@ -46,8 +46,8 @@ - #include <QStringBuilder> - - #if defined(WITH_XC_KEESHARE_SECURE) --#include <quazip5/quazip.h> --#include <quazip5/quazipfile.h> -+#include <quazip/quazip.h> -+#include <quazip/quazipfile.h> - #endif - - namespace diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index 68be8b738de6..e8e5c524a35c 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, perl }: -stdenv.mkDerivation { - name = "urxvt-tabbedex-2016-08-17"; +stdenv.mkDerivation rec { + name = "urxvt-tabbedex-${version}"; + version = "19.21"; src = fetchFromGitHub { owner = "mina86"; repo = "urxvt-tabbedex"; - rev = "089d0cb724eeb62fa8a5dfcb00ced7761e794149"; - sha256 = "0a5jrb7ryafj55fgi8fhpy3gmb1xh5j7pbn8p5j5k6s2fnh0g0hq"; + rev = "v${version}"; + sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index a4fb9b6c6d81..cf59b2c17613 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -6,9 +6,9 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.8"; - rev = "23d335f28e4055e67c3b22466ac7c4e41dc48344"; - sha256 = "10fa4qwfr3gfvxkzzjfs0w2fyij67cczklpj2x5hghcg08amkq37"; + version = "0.5.9"; + rev = "c68bc34e9466ef22326dd9072d557c56160e9092"; + sha256 = "1b611piwnwiwk4dcvn2qm4wjb9msa385lpx81y3k669ga3ip9rkc"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 2fa8b50f017e..029471fe7d98 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${version}"; - sha256 = "00lrj21k85sqyn4hv2rc5sny9vxghafjxyvs0dq4zp68461s3l7c"; + sha256 = "1w6d5a4akd868x89bgyvw3cnadfva7gnyvhmxx5ixxd580n5ba6v"; }; JANET_BUILD=''\"release\"''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 073f3dfdc30e..9a6b2f99f4ae 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -258,24 +258,24 @@ let in { php71 = generic { - version = "7.1.29"; - sha256 = "0dc3p3xq430vawcryw3xb4d1ckkz44rdnvfr833jsrl2zrzd2a45"; + version = "7.1.30"; + sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; }; php72 = generic { - version = "7.2.18"; - sha256 = "0wjb9j5slqjx1fn00ljwgy4vlxvz9a6s9677h5z20wqi5nqjf6ps"; + version = "7.2.19"; + sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.5"; - sha256 = "0pn3c9fj24v0r57d3cz67nisg6vjyw2yn5il7j1c6rw2z47bi023"; + version = "7.3.6"; + sha256 = "0xvgdxmhk0hsx8gh3ircm2s7pf59gm8i9a73204mr0sl05qchnhy"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index c81e97b970e5..67f5350d8fe6 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch2-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0h4yihf2avaw9awcigdqqlnfk5ak7scfv5lm0j8s6la4hyswc982"; + sha256="1i7nz29gcsy9cnljb0sb1fw8fg9p1gdh2pdhrgj3kcrsnxgbyhrq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index addf9a1dbd6c..cac861fe2248 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,21 +1,19 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: +{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; - version = "0.7.6"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; - rev = version; - sha256 = "1p6khy8fn9bwp14l6wd3sniwwm5v216l8xncfb7a6psjzvq5ypy6"; + rev = "v${version}"; + sha256 = "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s"; }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ] + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - qmakeFlags = [ "quazip" ] - ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 4a2920418f1c..589878d69f52 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.2"; + version = "0.11.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a6f4b47b37a21247535fc43411cb70a8c61ef0a5a2dfee668bd05611e2741fb8"; + sha256 = "c79a500e90d003073c8060d319dceb042caaba9472f13990c77ed37d04a82108"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np prusnak ]; + maintainers = with lib.maintainers; [ np prusnak mmahut ]; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index c6e23be8b89d..d7d25e696642 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2019.1"; in +let base = "batman-adv-2019.2"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1af5q4631b72q0gg0xmhxx2k3adky2ahk4dq97k0436a0rg617dr"; + sha256 = "1j5day3hia5nd21kb3msjblrybfr5sjnhrx7h5bb5ll8rykgdhvh"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 4205cab6da69..f524bee35210 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au-driver-5.2.20"; - rev = "2dad788f5d71d50df4f692b67a4428967ba3d42c"; - sha256 = "17pn73j2xqya0g8f86hn1jyf9x9wp52md05yrg1md58ixsbh1kz3"; + rev = "ac063a4b1a87855e10f6cd1f358aaccbeee9b9c1"; + sha256 = "1cmsv22q4k6p2wzm73k60kxbjhcgx4hqr0x3djvqrlv4rzz75l92"; }; nativeBuildInputs = [ bc ]; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 14d2b249fc08..69a10673d249 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2012-06-15"; + name = "xf86-video-nested-2017-06-12"; src = fetchgit { url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; - rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4"; - sha256 = "0r5k9rk8mq4j51a310qvvfmhhz8a0cmcwr8pl8mkwfsgcpwxbpfg"; + rev = "6a48b385c41ea89354d0b2ee7f4649a1d1d9ec70"; + sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; }; buildInputs = diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index ea9ccdc36e1b..196e15a01336 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.6.4"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "00jlmbg80xam3xg1vvrbi5wl6cwij5bz8w80d4k0bmmk4rrwq4rc"; + sha256 = "10djjpdv27kzjaa1saf1gq1g1yy4gj8qzjscyjh63r1kycflwnw5"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bb2810c65e0..e11d685ad191 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5737,7 +5737,7 @@ in screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { - qtbase = qt4; qmake = qmake4Hook; + qtbase = qt4; }; scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; |