From 0e3d110b2c2dbed0254eecacb9dc9c74298eafd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 23 Feb 2021 16:32:35 +0100 Subject: [PATCH 01/24] pythonPackages.jq: disable tests, add pythonImportsCheck --- pkgs/development/python-modules/jq/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 3d4097b0718..271f15c5900 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -8,10 +8,15 @@ buildPythonPackage rec { inherit pname version; sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e"; }; + patches = [ ./jq-py-setup.patch ]; buildInputs = [ jq ]; + # no tests executed + doCheck = false; + pythonImportsCheck = [ "jq" ]; + meta = { description = "Python bindings for jq, the flexible JSON processor"; homepage = "https://github.com/mwilliamson/jq.py"; From 9c4b55a2cf4704828844418389f4059ca48e793f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Feb 2021 15:57:25 +0100 Subject: [PATCH 02/24] ledger-live-desktop: remove unused inputs --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d130b3d0454..3d72a91551f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; From 8b34b766f2d3cf339afd072e59f3e4d6fc58ccd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Feb 2021 15:57:42 +0100 Subject: [PATCH 03/24] ripcord: remove unused inputs, format --- .../instant-messengers/ripcord/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index e5221d861d3..6d6e70ff26a 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools, - qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats, - autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper, - twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }: +{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools +, qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats +, autoPatchelfHook, desktop-file-utils, imagemagick +, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }: mkDerivation rec { pname = "ripcord"; @@ -19,9 +19,9 @@ mkDerivation rec { }; nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; - buildInputs = [ libsodium libopus libGL alsaLib ] ++ - [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ - (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); + buildInputs = [ libsodium libopus libGL alsaLib ] + ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] + ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); fontsConf = makeFontsConf { fontDirectories = [ twemoji-color-font ]; @@ -60,10 +60,8 @@ mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; - # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ infinisil ]; platforms = [ "x86_64-linux" ]; }; From 167da2103034c6a7d3895b851b0a432df2e464f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Feb 2021 15:58:33 +0100 Subject: [PATCH 04/24] standardnotes: remove unused inputs --- pkgs/applications/editors/standardnotes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e66febbf7fc..0d50c24d397 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils -, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }: +, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let version = "3.5.18"; From c1a03f005a6a6038ce72e077829bc7d30e418722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Feb 2021 15:58:42 +0100 Subject: [PATCH 05/24] timeular: remove unused inputs, format --- pkgs/applications/office/timeular/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 6c1068d4584..5bbfca23d6d 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -1,8 +1,7 @@ -{ - lib, - fetchurl, - appimageTools, - libsecret +{ lib +, fetchurl +, appimageTools +, libsecret }: let @@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec { Assign an activity to each side and flip to start tracking your time. The desktop app tell you where every minute of your day is spent. ''; - homepage = https://timeular.com; + homepage = "https://timeular.com"; license = licenses.unfree; maintainers = with maintainers; [ ktor ]; platforms = [ "x86_64-linux" ]; From 1497f9151dc721f47ca071098e9a9989735f9913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Feb 2021 15:58:49 +0100 Subject: [PATCH 06/24] singularity: remove unused inputs --- pkgs/applications/virtualization/singularity/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 3bc2df19d1d..a51a58d21ee 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -5,7 +5,6 @@ , openssl , libuuid , coreutils -, go , which , makeWrapper , cryptsetup From aa99645813b2a234c1e31988da92214c2b90f730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Feb 2021 18:43:06 +0100 Subject: [PATCH 07/24] pythonPackages.gviz-api: clean up --- pkgs/development/python-modules/gviz-api/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index fabc2d147fc..92f33abb594 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -8,8 +8,7 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version; - format = "wheel"; + inherit pname version format; sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; }; From d1a76640f67e1f81d87dd3d90911880090059cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 10:47:02 +0100 Subject: [PATCH 08/24] clipit: remove unused inputs --- pkgs/applications/misc/clipit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 630ee3c3683..fafcf3d5440 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, lib, stdenv +{ fetchFromGitHub, lib, stdenv , autoreconfHook, intltool, pkg-config , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: From 88231ba0586eed7d16788be75137538bbf088d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 10:47:10 +0100 Subject: [PATCH 09/24] modem-manager-gui: remove unused inputs --- pkgs/applications/networking/modem-manager-gui/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index da36589aeec..2723f342043 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -10,7 +10,6 @@ , itstool , libayatana-appindicator-gtk3 , perlPackages -, glibcLocales , meson , ninja }: From 3fd94db5f1f274a6aa0b1960b0f7aa2a8f24eb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 10:47:25 +0100 Subject: [PATCH 10/24] xfce4-taskmanager: remove unused inputs --- pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 9a923025c94..fd59b173a73 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: +{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: mkXfceDerivation { category = "apps"; From f170f851591dcc2264b4a40240f849bd2f8b8c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 10:47:33 +0100 Subject: [PATCH 11/24] libayatana-appindicator: remove stale substituteInPlace --- .../libraries/libayatana-appindicator/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index ef9823130f4..186e8c42f4b 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk"; }; - prePatch = '' - substituteInPlace configure.ac \ - --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0" - ''; - nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ]; buildInputs = From 622b7e87319721707775c1da8fc652545ec52e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 12:27:46 +0100 Subject: [PATCH 12/24] megasync: remove unused inputs --- pkgs/applications/misc/megasync/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index c302a4b4a07..1c87747eaca 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -6,7 +6,6 @@ , curl , doxygen , fetchFromGitHub -, fetchpatch , ffmpeg_3 , libmediainfo , libraw From 2f6eae817858830cd79dba7213c9dce2fdab71eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 12:27:56 +0100 Subject: [PATCH 13/24] crypto++: remove unused inputs --- pkgs/development/libraries/crypto++/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 0402af92b3b..8e5c687c445 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nasm, which +{ lib, stdenv, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic }: From e7dd8edf7ea285e5100aa1f88bbc512491dd2e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 12:28:01 +0100 Subject: [PATCH 14/24] amule: remove unused inputs, cleanup --- pkgs/tools/networking/p2p/amule/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 4ab93b7574a..78a07031e02 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -2,11 +2,8 @@ , enableDaemon ? false # build amule daemon , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui -, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }: - -assert httpServer -> libpng != null; -assert client -> libX11 != null; +, fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng +, autoreconfHook, pkg-config, makeWrapper, libX11 }: stdenv.mkDerivation rec { pname = "amule"; From 4509c025e16dd64b4ee0ae7ad5e15f22d02b894c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 15:06:45 +0100 Subject: [PATCH 15/24] pythonPackages.powerline: remove unused inputs --- pkgs/development/python-modules/powerline/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 1ad17d0459d..63f5feada59 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, python , buildPythonPackage , socat , psutil From 7ccf4d1259c8b8a759510eed57b32cfe6f8d0408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 15:19:05 +0100 Subject: [PATCH 16/24] pantheon.elementary-session-settings: remove unused input --- .../pantheon/desktop/elementary-session-settings/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index e45d25cfa34..38fcb8d40b4 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, substituteAll , desktop-file-utils , pkg-config , writeScript From bf0a2f91b8bb14c0fa37866ff64bbb0fa0dfcbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:01:39 +0100 Subject: [PATCH 17/24] pythonPackages.httpbin: remove unused input --- pkgs/development/python-modules/httpbin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 2e711141fcb..ace9a7041e3 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , flask , flask-limiter , markupsafe From e103713cde38ab74c0efb551ba907ffd17661159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:01:49 +0100 Subject: [PATCH 18/24] pythonPackages.johnnycanencrypt: remove unused input --- pkgs/development/python-modules/johnnycanencrypt/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index a0c82902d3e..460b0cddf61 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -5,7 +5,6 @@ , rustPlatform , llvmPackages , pkg-config -, maturin , pcsclite , nettle , requests From 13a571d6cb2e6d0bd219c75fba1955ad3d580494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:01:54 +0100 Subject: [PATCH 19/24] pythonPackages.knack: remove unused input --- pkgs/development/python-modules/knack/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index c08bdab4cf3..4bead996198 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -4,7 +4,6 @@ , argcomplete , colorama , jmespath -, knack , pygments , pyyaml , six From fb131414379773568b5cee97153f68b5f8990947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:01:59 +0100 Subject: [PATCH 20/24] pythonPackages.papis: remove unused input --- pkgs/development/python-modules/papis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index b05a525d91a..3e7c6ae0011 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pythonOlder, pytestcov +, python-doi, isPy3k, pytestcov #, optional, dependencies , whoosh, pytest , stdenv From 64dbd56960139570f03ffdfd89fb68bd25990a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:02:03 +0100 Subject: [PATCH 21/24] pythonPackages.pytest-vcr: remove unused input --- pkgs/development/python-modules/pytest-vcr/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix index 9373c597b36..119f3021b41 100644 --- a/pkgs/development/python-modules/pytest-vcr/default.nix +++ b/pkgs/development/python-modules/pytest-vcr/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pytest , vcrpy }: From 4bc50d5539c48a69c2d359db19f6757e806c2ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:02:08 +0100 Subject: [PATCH 22/24] amule: mark broken --- pkgs/tools/networking/p2p/amule/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 78a07031e02..075d60038d8 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -75,5 +75,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom ]; platforms = platforms.unix; + # Could not find crypto++ installation or sources. + broken = true; }; } From 2d243e170d72e8735d46bd88af711169a38fc9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:16:34 +0100 Subject: [PATCH 23/24] pythonPackages.requests: mark broken for python27 --- pkgs/development/python-modules/requests/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 169583586a1..20ba44ee2a8 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -8,6 +8,7 @@ , pytest-xdist , pytestCheckHook , urllib3 +, isPy27 }: buildPythonPackage rec { @@ -55,5 +56,7 @@ buildPythonPackage rec { homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + # AttributeError: 'KeywordMapping' object has no attribute 'get' + broken = isPy27; }; } From 4ad340f37c1c4d632b0638a631d4e23a91f257e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Mar 2021 18:32:39 +0100 Subject: [PATCH 24/24] Revert "qemu: guard desktop file removal" This reverts commit e74ae54da58655d9a348e4324dcffaa7d831dbe3. rm -f ignores if the file exists or not. --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index dd1a2da0171..b4b16e21689 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { postFixup = '' # the .desktop is both invalid and pointless - test -e $out/share/applications/qemu.desktop && rm -f $out/share/applications/qemu.desktop + rm -f $out/share/applications/qemu.desktop # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin