diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-29 08:35:47 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-29 08:35:47 +0200 |
commit | 2874eebfd27731a8ceef3856be35338affd32eaa (patch) | |
tree | 674cb8c6addbdc3f8e2290ebdc34c5b3fa714c1b /pkgs/applications | |
parent | 1014c7cb423c5866c06bf671dab5eed667ba245b (diff) | |
parent | f14021febf9c856e07a561124a1d67b90b5bf057 (diff) | |
download | nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.gz nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.bz2 nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.lz nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.xz nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.zst nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications')
38 files changed, 168 insertions, 106 deletions
diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index dd45746c8df5..0aa087e20afc 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "lnd"; - version = "0.9.0-beta"; + version = "0.9.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; + sha256 = "0gm33z89fiqv231ks2mkpsblskcsijipq8fcmip6m6jy8g06b1gb"; }; - modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; + modSha256 = "1khxplvyaqgaddrx1nna1fw0nb1xz9bmqpxpfifif4f5nmx90gbr"; + + subPackages = ["cmd/lncli" "cmd/lnd"]; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 48a6d81b6ba1..cfd3998ee368 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -5,7 +5,7 @@ , qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq -, hidapi, libusb, protobuf, randomx +, hidapi, libusb-compat-0_1, protobuf, randomx }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq - cppzmq hidapi libusb protobuf randomx + cppzmq hidapi libusb-compat-0_1 protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2a04beb93796..d1abd3956570 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi -, pythonProtobuf, randomx, rapidjson, libusb +, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 , CoreData, IOKit, PCSC }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi randomx rapidjson - pythonProtobuf libusb + pythonProtobuf libusb-compat-0_1 ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 22e8a2ca5360..2ada41ac98a1 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }: +{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with stdenv.lib; '' @@ -30,13 +30,13 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} - RPATH=${libusb.out}/lib + RPATH=${libusb-compat-0_1.out}/lib for a in usr/lib64/sane/*.so*; do if ! test -L $a; then patchelf --set-rpath $RPATH $a diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 188431bda6c6..885dff311b8f 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ sane-backends libX11 gtk2 ] - ++ stdenv.lib.optional (libusb != null) libusb; + ++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; nativeBuildInputs = [ pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 22a8f4dc3bda..04d19dee8a8e 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng -, libusb ? null +, libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb != null then [libusb] else []) + ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ stdenv.lib.optional gimpSupport gimp; meta = { diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index f01a57a55d4d..e0d0273efde1 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -14,6 +14,16 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; + # InitialPreference values are too high and end up making kate & + # kwrite defaults for anything considered text/plain. Resetting to + # 1, which is the default. + postPatch = '' + substituteInPlace kate/data/org.kde.kate.desktop \ + --replace InitialPreference=9 InitialPreference=1 + substituteInPlace kwrite/data/org.kde.kwrite.desktop \ + --replace InitialPreference=8 InitialPreference=1 + ''; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index e6442fea2f9d..62ed3db063ea 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -12,9 +12,17 @@ mkDerivation { kdelibs4support kcmutils khtml kdesu qtwebkit qtwebengine qtx11extras qtscript qtwayland ]; + + # InitialPreference values are too high and any text/html ends up + # opening konqueror, even if firefox or chromium are also available. + # Resetting to 1, which is the default. + postPatch = '' + substituteInPlace kfmclient_html.desktop \ + --replace InitialPreference=9 InitialPreference=1 + ''; + meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; }; } - diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index f07df73a2556..3bcdb9ca8424 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -18,6 +18,15 @@ mkDerivation { kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; + + # InitialPreference values are too high and end up making okular + # default for anything considered text/plain. Resetting to 1, which + # is the default. + postPatch = '' + substituteInPlace generators/txt/okularApplication_txt.desktop \ + --replace InitialPreference=3 InitialPreference=1 + ''; + meta = with lib; { homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index a6ae45306552..95159d1927ab 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libtool , qrencode , udev -, libusb +, libusb-compat-0_1 , makeWrapper , pkgconfig , qtbase @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb + libusb-compat-0_1 qrencode qtbase diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index ba6868b62f6f..95cbdd9c19b5 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }: +{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -7,7 +7,7 @@ stdenv.mkDerivation { }; sourceRoot = "GarminPlugin-0.3.26/src"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ]; + buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 3dffc5c77c2a..761d05e5f9f8 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb +, qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb + qtconnectivity qtcharts libusb-compat-0_1 ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -39,9 +39,9 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local # Use qtwebengine instead of qtwebkit diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 84246f4ba124..4505432b236d 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -92,7 +92,7 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index ce80ae14f233..8f188818d4f7 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi +{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ - "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" + "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 87a6bdf5e53d..5a1e5ba65ded 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "perkeep-${version}"; - version = "unstable-2019-07-29"; + version = "unstable-2020-03-23"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; - sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; + rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; + sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; }; goPackagePath = "perkeep.org"; diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 213780842143..8705abd92596 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libusb }: +{ stdenv, fetchurl, cmake, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "garmindev"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index c0b844d121af..77a24413bdd6 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev -, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d262fb74c4b5..e189351022b9 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake -, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib +, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -83,7 +83,7 @@ in stdenv.mkDerivation { buildInputs = [ libdc googlemaps - curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip + curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit ]; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 12780ca73a1a..e557c5081c81 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr"; + sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; }; - modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4"; + modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 829ea1000f06..da668b9589af 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.11.0"; + version = "0.11.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0jg7h52wlgd2aslx13fs97j3b8g5xfgil3p2jsc4j95l7lmqn7bv"; + sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc"; }; # ui: diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 67845c066958..b547434d8da1 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang, installShellFiles +, coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -9,12 +9,12 @@ with lib; let - version = "3.11.0"; + version = "4.1.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "0cbc58b"; + gitCommit = "b4261e0"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go k8sversion = "v1.11.1"; k8sgitcommit = "b1b2997"; @@ -28,29 +28,17 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06q4v2a1mm6c659ab0rzkqz6b66vx4avqfg0s9xckwhq420lzgka"; + sha256 = "16bc6ljm418kxz92gz8ldm82491mvlqamrvigyr6ff72rf7ml7ba"; }; goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ]; + buildInputs = [ kerberos ncurses ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; buildPhase = '' @@ -58,6 +46,7 @@ in buildGoPackage rec { # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_TREE_STATE=clean" >> os-version-defs echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2c781d7dd49e..4a751bac4ac7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib @@ -121,6 +121,9 @@ in stdenv.mkDerivation rec { autoPatchelf --no-recurse -- $out/lib/Signal/ ''; + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + passthru.tests.application-launch = nixosTests.signal-desktop; + meta = { description = "Private, simple, and secure messenger"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index ef06f26522d6..84f334be06fb 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.385850.0413"; + version = "5.0.398100.0427"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "049kxgkyaxknxpk0hf1a7bxn0c08dk250z3q2ba9pc1xkrn5kdnw"; + sha256 = "0b9jdicr783wagp2j79106bbk68974j3v8zg8nvky5fydl6ngjvi"; }; }; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 02a2c63b4397..4c67105dafc2 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook +{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20"; + sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; nativeBuildInputs = [pkgconfig autoreconfHook]; - buildInputs = [openssl libX11] - ++ stdenv.lib.optional enableCredssp libgssglue; + buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] + ++ stdenv.lib.optional enableCredssp krb5; configureFlags = [ "--with-ipv6" diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 7cb64f92f3f4..6d0a19334dec 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -13,7 +13,7 @@ libav, libiio, libopus, libpulseaudio, -libusb, +libusb-compat-0_1, limesuite, mkDerivation, ocl-icd, @@ -51,7 +51,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2' cm256cc serialdv ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 36df6ad19d31..676f7d3c839e 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb, pkgconfig +, libusb-compat-0_1, pkgconfig , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -25,7 +25,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ libusb ncurses ] + buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 971399c4a229..05187440899b 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let version = "2.1"; @@ -23,7 +23,7 @@ in mkDerivation { faad2 fftwSinglePrec lame - libusb + libusb-compat-0_1 mpg123 qtbase qtcharts diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 2ae5e0eeddcd..64124594e1e2 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; + sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index f91e5be51700..b41135229dd7 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -4,7 +4,7 @@ , SDL2 , libGL , libarchive -, libusb +, libusb-compat-0_1 , qtbase , qmake , git @@ -33,7 +33,7 @@ mkDerivation rec { SDL2 libGL libarchive - libusb + libusb-compat-0_1 qtbase libpng_apng ]; diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index 9a29fde0a438..74a53902ee09 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -10,7 +10,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; fahclient = stdenv.mkDerivation rec { inherit version; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb"; - hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY="; + sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index e8eba4c2ab2f..72217689ff18 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg="; + sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 03fa54cd7338..a35df650300b 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk="; + sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index aea298b65485..86572e73c756 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ignition + , libtar, glxinfo, libusb-compat-0_1, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { tinyxml-2 libtar glxinfo - libusb + libusb-compat-0_1 libxslt ignition.math2 sdformat diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index c83705ac4160..e4da20c84879 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -25,7 +25,7 @@ , rtmpSupport ? true, rtmpdump ? null , sambaSupport ? true, samba ? null , udevSupport ? true, udev ? null -, usbSupport ? false, libusb ? null +, usbSupport ? false, libusb-compat-0_1 ? null , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null @@ -39,7 +39,7 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; assert sambaSupport -> samba != null; assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable +assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; @@ -189,7 +189,7 @@ in stdenv.mkDerivation { ++ lib.optional rtmpSupport rtmpdump ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb + ++ lib.optional usbSupport libusb-compat-0_1 ++ lib.optional vdpauSupport libvdpau ++ lib.optionals useWayland [ wayland diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 4a6d2a05a670..98af60c49379 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,6 +1,26 @@ -{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 -, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre -, qwt, extra-cmake-modules }: +{ stdenv +, mkDerivation +, fetchurl +, qtbase +, qtmultimedia +, qtquickcontrols +, qtimageformats +, qtxmlpatterns +, ffmpeg +, guvcview +, cmake +, ninja +, libxml2 +, gettext +, pkgconfig +, libgphoto2 +, gphoto2 +, v4l-utils +, libv4l +, pcre +, qwt +, extra-cmake-modules +}: mkDerivation rec { pname = "qstopmotion"; @@ -11,11 +31,31 @@ mkDerivation rec { sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; - buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview - qwt qtquickcontrols qtimageformats qtxmlpatterns ]; + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtimageformats + qtxmlpatterns + v4l-utils + libv4l + pcre + ffmpeg + guvcview + qwt + ]; - nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja - gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ + pkgconfig + cmake + extra-cmake-modules + ninja + gettext + libgphoto2 + gphoto2 + libxml2 + libv4l + ]; patchPhase = '' substituteInPlace CMakeLists.txt \ @@ -36,6 +76,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; + broken = stdenv.isAarch64; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index dacc404b3a8c..2fd3a0b39dd6 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -16,11 +16,9 @@ , which }: -let - buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; -in buildGoPackage rec { +buildGoPackage rec { project = "cri-o"; - version = "1.17.3"; + version = "1.18.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -29,7 +27,7 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6"; + sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; nativeBuildInputs = [ git pkgconfig which ]; @@ -37,13 +35,11 @@ in buildGoPackage rec { libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' pushd go/src/${goPackagePath} - make BUILDTAGS='${buildTags}' \ - bin/crio \ - bin/crio-status \ - bin/pinns + make binaries BUILDTAGS="$BUILDTAGS" ''; installPhase = '' install -Dm755 bin/crio $out/bin/crio${flavor} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index b8f8459796ac..feed5cadce3f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "19y48lpf7pvw5f5pzpknn92rq9xwbrpvi8mj7mc4dby6skqadrk4"; + sha256 = "0dr5vd52fnjwx3zn2nj2nlvkbvh5bg579nf3qw8swrn8i1jwxd6j"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index df7b81a43c8a..7b7929d9f1d6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,6 +3,9 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch +# If open-watcom-bin is not passed, VirtualBox will fall back to use +# the shipped alternative sources (assembly). +, open-watcom-bin ? null , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size , pythonBindings ? false, python3 ? null @@ -148,6 +151,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ + ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk |