From b850e9f64b91a54b2153b94e3a366e7edfc07db3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 1 Apr 2019 11:09:17 -0500 Subject: [PATCH 01/25] sstp: 1.0.11 -> 1.0.12 --- pkgs/tools/networking/sstp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index e8db3a071843..7bbc872c98e1 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, ppp, libevent, openssl }: +{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: stdenv.mkDerivation rec { name = "sstp-client-${version}"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz"; - sha256 = "087vp3n7nv001fsgbmkjpgl3a2vhbix22cflrqi5bv9h8181p18v"; + sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8"; }; patchPhase = @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl ppp ]; meta = { From 671c673a90945a7c29a7a2fd56394b50d656ac8e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 4 Apr 2019 11:47:55 -0400 Subject: [PATCH 02/25] pythonPackages.awkward: 0.8.7 -> 0.8.14, enable more tests --- pkgs/development/python-modules/awkward/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 8906b72dcca0..60b21322b870 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , numpy +, pandas +, pyarrow , pytestrunner , pytest , h5py @@ -9,15 +11,15 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.8.7"; + version = "0.8.14"; src = fetchPypi { inherit pname version; - sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp"; + sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18"; }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest h5py ]; + checkInputs = [ pandas pyarrow pytest h5py ]; propagatedBuildInputs = [ numpy ]; checkPhase = '' From fdcce208abf319801777efa711b5b8e2e1b2e91a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 10 Apr 2019 14:39:07 +0200 Subject: [PATCH 03/25] dune: 1.8.2 -> 1.9.0 --- pkgs/development/tools/ocaml/dune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 80aeb17bef31..9ea595da3344 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a"; + sha256 = "18j5afg54bww9az05wc7m5ixzvvq38wfnwq6ni09pi2n848m21ca"; }; buildInputs = [ ocaml findlib ]; From 64283f8add21ee06086fd650cfa3b081b4ab8353 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Apr 2019 21:30:18 +0800 Subject: [PATCH 04/25] puddletag: fix homepage --- pkgs/applications/audio/puddletag/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 915d7fcbd98b..3a6cd298557f 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -28,8 +28,8 @@ python2Packages.buildPythonApplication rec { dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { - homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; + homepage = https://docs.puddletag.net; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; From 102d67b6f4c93b18a477742cc69af210116a2b66 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Apr 2019 21:30:26 +0800 Subject: [PATCH 05/25] krename: fix homepage and *minor* style changes --- pkgs/applications/misc/krename/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 52233ad2f2f4..8b6b7741c7df 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -17,15 +17,17 @@ in mkDerivation rec { sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; }; - meta = with lib; { - homepage = http://www.krename.net; - description = "A powerful batch renamer for KDE"; - license = licenses.gpl2; - inherit (kconfig.meta) platforms; - maintainers = with maintainers; [ peterhoeg ]; - }; - buildInputs = [ taglib exiv2 podofo ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; + + meta = with lib; { + description = "A powerful batch renamer for KDE"; + homepage = https://kde.org/applications/utilities/krename/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + inherit (kconfig.meta) platforms; + }; } From e7f6bfea32fde2ea53a2974972d67f162c34dc27 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Apr 2019 21:30:33 +0800 Subject: [PATCH 06/25] anydesk: fix homepage --- pkgs/applications/networking/remote/anydesk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index d9dd2fc9127a..a9b358fc7937 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit description; - homepage = http://www.anydesk.com; + homepage = https://www.anydesk.com; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; From c7b743d9ed340c46c03b824663bc61c8becc3633 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Apr 2019 21:30:39 +0800 Subject: [PATCH 07/25] pythonPackages.broadlink: fix homepage --- pkgs/development/python-modules/broadlink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index d1ecddded776..4633cb1ecfbf 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for controlling Broadlink IR controllers"; - homepage = http://github.com/mjg59/python-broadlink; + homepage = https://github.com/mjg59/python-broadlink; license = licenses.mit; }; } From 0854ae65717eaa3b16102cb94ba9ee85610a3c25 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 10 Apr 2019 14:16:23 -0400 Subject: [PATCH 08/25] pythonPackages.datrie: fix build --- pkgs/development/python-modules/datrie/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index eb654c650778..7cb30937e0db 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch , cython, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { @@ -10,6 +10,14 @@ buildPythonPackage rec { sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; }; + patches = [ + # fix tests against recent hypothesis + (fetchpatch { + url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff"; + sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy"; + }) + ]; + nativeBuildInputs = [ cython ]; buildInputs = [ pytest pytestrunner hypothesis ]; From c321b64b3fcbc34b0037a57ce693d43fe0dfc388 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 10 Apr 2019 14:18:26 -0400 Subject: [PATCH 09/25] snakemake: 5.2.2 -> 5.4.4 --- pkgs/applications/science/misc/snakemake/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 6f04d436877f..751f3c3aebe3 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,13 +5,14 @@ python.buildPythonPackage rec { pname = "snakemake"; - version = "5.2.2"; + version = "5.4.4"; propagatedBuildInputs = with python; [ appdirs ConfigArgParse datrie docutils + GitPython jsonschema pyyaml ratelimiter @@ -21,7 +22,7 @@ python.buildPythonPackage rec { src = python.fetchPypi { inherit pname version; - sha256 = "adffe7e24b4a613a9e8bf0a2a320b3cea236d86afb9132bb0bbbc08b8e35a3a3"; + sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json From 44225ebaf64cdb6104df8057dbeaf3866574f21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Pla=CC=81s=CC=8Cil?= Date: Thu, 11 Apr 2019 11:13:23 +0800 Subject: [PATCH 10/25] WIP: keepassxc: 2.3.4 -> 2.4.0 running test doesn't work currently because of finding qt plugins --- pkgs/applications/misc/keepassx/community.nix | 12 ++- pkgs/applications/misc/keepassx/darwin.patch | 77 ++++++++++--------- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b6258491a8c3..321fd7390598 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -15,6 +15,8 @@ , libXi , qtx11extras , qtmacextras +, qtsvg +, qrencode , withKeePassBrowser ? true , withKeePassSSHAgent ? true @@ -26,13 +28,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3"; + sha256 = "1k8s56003gym2dv6c54gxwzs20i7lf6w5g5qnr449jfmf6wvbivr"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -50,7 +52,6 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - ./qt511.patch ]; cmakeFlags = [ @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { "-DWITH_GUI_TESTS=ON" "-DWITH_XC_AUTOTYPE=ON" "-DWITH_XC_YUBIKEY=ON" + "-DWITH_XC_KEESHARE=ON" ] ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON") @@ -67,8 +69,8 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' export LC_ALL="en_US.UTF-8" - make test ARGS+="-E testgui --output-on-failure" ''; + # make test ARGS+="-E testgui --output-on-failure" nativeBuildInputs = [ cmake makeWrapper qttools ]; @@ -85,8 +87,10 @@ stdenv.mkDerivation rec { libyubikey qtbase qtx11extras + qtsvg yubikey-personalization zlib + qrencode ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; postInstall = optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch index 1edf0a573a31..d7ffb7dbba1f 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -1,52 +1,53 @@ -Remove the use of macdeployqt to avoid copying dependencies and -reduce installation size from 90 MB to 9 MB. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 658548f7..f8f10bdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -250,8 +250,8 @@ else() - set(PROGNAME keepassxc) - endif() - --if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local") -- set(CMAKE_INSTALL_PREFIX "/Applications") -+if(APPLE AND WITH_APP_BUNDLE) -+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") - set(CMAKE_INSTALL_MANDIR "/usr/local/share/man") - endif() - -@@ -262,7 +262,7 @@ if(MINGW) - set(PLUGIN_INSTALL_DIR ".") - set(DATA_INSTALL_DIR "share") +@@ -288,6 +288,7 @@ if(MINGW) + set(PLUGIN_INSTALL_DIR ".") + set(DATA_INSTALL_DIR "share") elseif(APPLE AND WITH_APP_BUNDLE) -- set(CLI_INSTALL_DIR "/usr/local/bin") -+ set(CLI_INSTALL_DIR "../bin") - set(PROXY_INSTALL_DIR "/usr/local/bin") - set(BIN_INSTALL_DIR ".") - set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns") ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man") + set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") + set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") +@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON) + + if(APPLE) + set(CMAKE_MACOSX_RPATH TRUE) +- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH) +- if(NOT MACDEPLOYQT_EXE) +- message(FATAL_ERROR "macdeployqt is required to build in macOS") +- else() +- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}") +- endif() + endif() + + # Debian sets the the build type to None for package builds. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 69526967..38f7c5d4 100644 +index 110dc606..f9b58818 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE) - set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") - include(CPack) +@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE) + set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") + include(CPack) -- add_custom_command(TARGET ${PROGNAME} -- POST_BUILD -- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src -- COMMENT "Deploying app bundle") +- add_custom_command(TARGET ${PROGNAME} +- POST_BUILD +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src +- COMMENT "Deploying app bundle") endif() install(TARGETS ${PROGNAME} diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt -index 08c53278..b833b692 100644 +index f1c5387f..abf70b48 100644 --- a/src/autotype/mac/CMakeLists.txt +++ b/src/autotype/mac/CMakeLists.txt -@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE) - add_custom_command(TARGET keepassx-autotype-cocoa - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} -- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src - COMMENT "Deploying autotype plugin") +@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE) + add_custom_command(TARGET keepassx-autotype-cocoa + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src + COMMENT "Deploying autotype plugin") else() From 96fec4214d83f2e5e0e6d0657b4704935b2a2cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Pla=CC=81s=CC=8Cil?= Date: Thu, 11 Apr 2019 13:56:35 +0800 Subject: [PATCH 11/25] fix test running --- pkgs/applications/misc/keepassx/community.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 321fd7390598..7d53dbb3f1f1 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -69,8 +69,9 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' export LC_ALL="en_US.UTF-8" + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + make test ARGS+="-E testgui --output-on-failure" ''; - # make test ARGS+="-E testgui --output-on-failure" nativeBuildInputs = [ cmake makeWrapper qttools ]; From 11d491dce56b964dffd0175f891299bee646501d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Sat, 6 Apr 2019 07:39:33 +0300 Subject: [PATCH 12/25] pipenv: Ignore Python site-packages pipenv nix wrapper contains a PYTHONPATH which has some dependencies for pipenv installed. pipenv by default uses site-packages when resolving packages, which means that any package that is included in the nix wrapper is satisfied when running `pipenv install`. But when the actual virtualenv created by pipenv is activated, it doesn't contain those packages anymore and fails to import them. pipenv has a flag PIP_IGNORE_INSTALLED which can be used to ignore site-packages. Which fixes the problem of having different resolved packages when running pipenv and when running the virtualenv. --- pkgs/development/tools/pipenv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 3deb7b9643c2..8083151ef81f 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -24,6 +24,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set PYTHONPATH \"$PYTHONPATH\"" + "--set PIP_IGNORE_INSTALLED 1" ]; meta = with stdenv.lib; { From 77ce9098c0cadc85b7c3cc6ff90f823135c40aac Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Thu, 11 Apr 2019 15:36:21 +0800 Subject: [PATCH 13/25] keepassxc: run test with offscreen qt plugin Co-Authored-By: Quiark --- pkgs/applications/misc/keepassx/community.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 7d53dbb3f1f1..1dbc4f640887 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' export LC_ALL="en_US.UTF-8" - export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen make test ARGS+="-E testgui --output-on-failure" ''; From d85c466936e505a0925ad8e6dc3c4117e3dc9f29 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 03:36:15 -0400 Subject: [PATCH 14/25] plasma5.xdg-desktop-portal-kde: fix build Was missing KIO --- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index ae1ee50a1211..1e04eb1e2b00 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -2,14 +2,14 @@ mkDerivation, extra-cmake-modules, gettext, kdoctools, python, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - cups, pcre, pipewire + cups, pcre, pipewire, kio }: mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups pcre pipewire + cups pcre pipewire kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; } From f6dcb5f70b87adcf23943cffcb8fee9071c253c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Apr 2019 09:38:50 +0200 Subject: [PATCH 15/25] hiredis-vip: init at 0.3.0 --- .../libraries/hiredis-vip/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/hiredis-vip/default.nix diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/development/libraries/hiredis-vip/default.nix new file mode 100644 index 000000000000..59e168115a86 --- /dev/null +++ b/pkgs/development/libraries/hiredis-vip/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "hiredis-vip"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "vipshop"; + repo = "hiredis-vip"; + rev = version; + sha256 = "1z9zry635pxqv6d2cgk3dghb5qfpg9m7dz34ld4djw9b53hjr2z2"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A C client library for the Redis database"; + homepage = https://github.com/vipshop/hiredis-vip; + license = lib.licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 991671b5c928..f892404b0307 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10535,6 +10535,8 @@ in hiredis = callPackage ../development/libraries/hiredis { }; + hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; + hivex = callPackage ../development/libraries/hivex { }; hound = callPackage ../development/tools/misc/hound { }; From 8f371c82bdc670648791d25b0d1c129b4f4e7887 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 04:37:22 -0400 Subject: [PATCH 16/25] lollypop: 1.0.3 -> 1.0.5 https://gitlab.gnome.org/World/lollypop/tags/1.0.4 https://gitlab.gnome.org/World/lollypop/tags/1.0.5 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3b850a27327b..565c0b315226 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.3"; + version = "1.0.5"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1gjxcwl467h7011j9v4zy1j0fjlz480ibvk4akr6xwjg894jykbx"; + sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry"; }; nativeBuildInputs = [ From 6542a4cb8e0a2262cbdf5a1a8b28baf89831baf8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 04:45:33 -0400 Subject: [PATCH 17/25] python37Packages.ldap3: 2.5.2 -> 2.6 --- .../development/python-modules/ldap3/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 6fe52f885743..fc5b0b2fe045 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,20 +1,12 @@ { stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }: buildPythonPackage rec { - version = "2.5.2"; pname = "ldap3"; + version = "2.6"; -## This should work, but 2.5.2 has a weird tarball with empty source files -## where upstream repository has non-empty ones -# src = fetchPypi { -# inherit pname version; -# sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz"; -# }; - src = fetchFromGitHub { - owner = "cannatag"; - repo = pname; - rev = "v${version}"; - sha256 = "0p5l4bhy6j2nvvlxz5zvznbaqb72x791v9la2jr2wpwr60mzz9hw"; + src = fetchPypi { + inherit pname version; + sha256 = "1f0v82584b7gkzrnnnl4fc88w4i73x7cxqbzy0r0bknm33yfwcq5"; }; propagatedBuildInputs = [ pyasn1 ]; From 5d8144579701803bb107af824c37cc7807ec13c6 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Thu, 11 Apr 2019 16:07:07 +0700 Subject: [PATCH 18/25] python3Packages.nixpkgs: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/nixpkgs/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 3a3f03c87ba3..bfd2476c8ca9 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -9,23 +9,14 @@ buildPythonPackage rec { pname = "nixpkgs"; - version = "0.2.2"; + version = "0.2.3"; disabled = ! pythonAtLeast "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj"; + sha256 = "12ycbv31g4qv14aq6hfb85hhx026lgvzqfsrkpzb64na0c1yjcvn"; }; - patches = [ - # Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7 - # is merged and in a release - (fetchpatch { - url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch"; - sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b"; - }) - ]; - buildInputs = [ pbr ]; propagatedBuildInputs = [ pythonix ]; From a4c15f1b35016e2ee74f2477ccca350bc7407475 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 11 Apr 2019 19:55:08 +0900 Subject: [PATCH 19/25] python3Packages.papis: provide as a library too (#59070) * python3Packages.papis: provides as a library too The project is turning into a dependency for several scripts and possibly UIs (see the different repositories at https://github.com/papis/) so it makes sense to have it as a library. * moved papis to python-modules * add myself as maintainer --- .../python-modules}/papis/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) rename pkgs/{tools/misc => development/python-modules}/papis/default.nix (68%) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/development/python-modules/papis/default.nix similarity index 68% rename from pkgs/tools/misc/papis/default.nix rename to pkgs/development/python-modules/papis/default.nix index f1589fc8c3b0..d9be946900cb 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -1,8 +1,13 @@ -{ lib, fetchFromGitHub, fetchpatch -, python3, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils +, requests, filetype, pyparsing, configparser, arxiv2bib +, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser +, pylibgen, click, python-slugify, habanero, isbnlib +, prompt_toolkit, pygments +#, optional, dependencies +, jinja2, whoosh, pytest }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "papis"; version = "0.8.2"; @@ -14,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser pylibgen click python-slugify habanero isbnlib @@ -23,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { jinja2 whoosh ]; - checkInputs = (with python3.pkgs; [ + checkInputs = ([ pytest ]) ++ [ xdg_utils @@ -39,6 +44,6 @@ python3.pkgs.buildPythonApplication rec { description = "Powerful command-line document and bibliography manager"; homepage = http://papis.readthedocs.io/en/latest/; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.nico202 ]; + maintainers = with lib.maintainers; [ nico202 teto ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f892404b0307..61cd74b52710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16070,7 +16070,7 @@ in papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; - papis = callPackage ../tools/misc/papis { }; + papis = with python3Packages; toPythonApplication papis; paps = callPackage ../tools/misc/paps { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26205eaec429..41eb849fd70a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2124,6 +2124,8 @@ in { paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + papis = callPackage ../development/python-modules/papis { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; pathspec = callPackage ../development/python-modules/pathspec { }; From 6b2bd330fa39376fe5143d8095b9a1b925255110 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Apr 2019 14:51:25 +0200 Subject: [PATCH 20/25] wordgrinder: Fix sha256 hash The hash used for fetchFromGitHub was on the archive itself, however fetchFromGitHub is actually a wrapper of fetchzip: hash mismatch in fixed-output derivation '...-source': wanted: sha256:1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf got: sha256:08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal When using nix-prefetch-url without the --unpack argument, I get: 1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf And with the --unpack argument: 08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal Just to be 100% sure the contents are the same, I also diffed the contents of the former tarball with the outputs of the unpacked dir and they're the same. I didn't actually test the package (which doesn't build right now anyway), but now at least the source checksum is fixed :-) Signed-off-by: aszlig Cc: @matthiasbeyer --- pkgs/applications/office/wordgrinder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 7b7b03aae5da..9518aaca878e 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "wordgrinder"; owner = "davidgiven"; rev = "${version}"; - sha256 = "1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf"; + sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal"; }; makeFlags = [ From 023b3a5730e8354b869d61c16c42fa729adc4125 Mon Sep 17 00:00:00 2001 From: Mikolaj Galkowski Date: Thu, 11 Apr 2019 16:10:18 +0200 Subject: [PATCH 21/25] maintainers: add tesq0 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index be1a9e1ae521..e19cde93ae43 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5461,4 +5461,9 @@ github = "freezeboy"; name = "freezeboy"; }; + tesq0 = { + email = "mikolaj.galkowski@gmail.com"; + github = "tesq0"; + name = "Mikolaj Galkowski"; + }; } From 0ef83bc0fde17659a1167f13bdd07bdb87006000 Mon Sep 17 00:00:00 2001 From: Mikolaj Galkowski Date: Thu, 11 Apr 2019 16:11:21 +0200 Subject: [PATCH 22/25] unity3d: add tesq0 to the maintainers --- pkgs/development/tools/unity3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index f962ef54b028..444155c00120 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -132,6 +132,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 tesq0 ]; }; } From 594964260b38e84e6b6b83848179f6baaa06b0ab Mon Sep 17 00:00:00 2001 From: Mikolaj Galkowski Date: Thu, 11 Apr 2019 16:14:23 +0200 Subject: [PATCH 23/25] unity3d: 2017.4.10f1 -> 2018.3.0f2 --- pkgs/development/tools/unity3d/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 444155c00120..126ece257801 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,9 +1,10 @@ { stdenv, lib, fetchurl, makeWrapper, file, getopt -, gtk2, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb +, gtk2, gtk3, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium +, libpqxx }: let @@ -13,20 +14,21 @@ let cairo dbus expat zlib libpng12 udev tbb libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb + libpqxx gtk3 ]; libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ]; binPath = lib.makeBinPath [ nodejs gnutar ]; - ver = "2017.4.10"; - build = "f1"; + ver = "2018.3.0"; + build = "f2"; in stdenv.mkDerivation rec { name = "unity-editor-${version}"; version = "${ver}x${build}"; src = fetchurl { - url = "https://beta.unity3d.com/download/14396d76537e/LinuxEditorInstaller/Unity.tar.xz"; - sha256 = "e1b4fe41c0ff793f7a9146c49a8eca8c71d30abdfa3e81922bd69699810b3f67"; + url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; + sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; }; nosuidLib = ./unity-nosuid.c; @@ -79,7 +81,8 @@ in stdenv.mkDerivation rec { fi } - upm_linux=$unitydir/Data/Resources/Upm/upm-linux + upm_linux=$unitydir/Data/Resources/PackageManager/Server/UnityPackageManager + orig_size=$(stat --printf=%s $upm_linux) From 02bb5e35eae8a9e124411270a6790a08f68e905b Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Thu, 11 Apr 2019 09:56:24 -0400 Subject: [PATCH 24/25] pythonPackages.azure-mgmt-storage: remove patch. as suggested in the comment. --- .../python-modules/azure-mgmt-storage/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 4dd4c692490e..12d10d8ac477 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -15,12 +15,6 @@ buildPythonPackage rec { sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py From b54bce24cf4da02d7ddd91a745573a1e096f89b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Apr 2019 17:43:55 +0200 Subject: [PATCH 25/25] home-assistant: 0.91.2 -> 0.91.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fe52c615ef97..d027cf185e60 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.91.2"; + version = "0.91.3"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9b3e70e683af..eacfa707ebdb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -111,7 +111,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.91.2"; + hassVersion = "0.91.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -126,7 +126,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "193lim90dgidkis7cryp9hm8744bwhahj9fqicmnhhxlkg0s8zy5"; + sha256 = "00zzb466xbyz8sxjszkjsgks4smj94qw40agwyfn75ciiib2p8fw"; }; propagatedBuildInputs = [