From 247b45f37565b3dc16ea28e4843d2d231e9e93f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Feb 2021 23:34:56 +0100 Subject: [PATCH 01/34] pythonPackages.lightparam: remove unused inputs --- pkgs/development/python-modules/lightparam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index 0c3eb5292a88..936cc9a06269 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , ipython , ipywidgets , numpy From bedf01bbf7524a6deaa1b0b655288f633b8d88d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Feb 2021 23:35:19 +0100 Subject: [PATCH 02/34] pythonPackages.nbdime: remove unused inputs --- pkgs/development/python-modules/nbdime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 1c1e52b5a79d..66e1edd93908 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, callPackage, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , hypothesis , setuptools_scm , six From 2ad5e412c5425c3054ed8405e33b5fa5ca9b7c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Feb 2021 23:35:23 +0100 Subject: [PATCH 03/34] pythonPackages.nbsphinx: remove unused inputs --- pkgs/development/python-modules/nbsphinx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 979b357607e5..2622b815f1ee 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -7,7 +7,6 @@ , nbformat , sphinx , traitlets -, python , isPy3k }: From 876de488cd175e5ab276be2c160cf76e39aeb792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Feb 2021 23:35:29 +0100 Subject: [PATCH 04/34] pythonPackages.notebook: remove unused inputs --- pkgs/development/python-modules/notebook/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index bab3aa590ec6..926dd3698c62 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -12,7 +12,6 @@ , tornado , ipython_genutils , traitlets -, jupyter , jupyter_core , jupyter_client , nbformat From ca1b6de5273bd0623ec7138e0fb5cd0f26310cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Feb 2021 23:35:33 +0100 Subject: [PATCH 05/34] pythonPackages.onnx: remove unused inputs --- pkgs/development/python-modules/onnx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 278d7c1df046..95e67c58d55e 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , buildPythonPackage , fetchPypi , pythonOlder From e44ab858d7dfdcb37f6ec9426afd143eed6392cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Feb 2021 23:35:36 +0100 Subject: [PATCH 06/34] pythonPackages.robotframework-tools: remove unused inputs --- pkgs/development/python-modules/robotframework-tools/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 5e8ca33fffba..77a7fe13df99 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , robotframework , moretools , pathpy From 07bf41c1714566355a4c7d450bfe0a2e0ea7debb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 00:28:56 +0100 Subject: [PATCH 07/34] iosevka: remove unused inputs --- pkgs/data/fonts/iosevka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index cbdd309db5e5..04e5b48bd0bd 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal +{ stdenv, lib, nodejs, nodePackages, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer From 27fc0ff73d9cb49901351744f69779607d279551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 00:29:01 +0100 Subject: [PATCH 08/34] pythonPackages.ndjson: remove unused inputs --- pkgs/development/python-modules/ndjson/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index 175b04d31074..715a1989b455 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8 +{ lib, buildPythonPackage, fetchPypi, watchdog, flake8 , pytest, pytestrunner, coverage, sphinx, twine }: buildPythonPackage rec { From 754a8db42ddb4bf469bf1ff69250c8fd61ae9c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 02:21:38 +0100 Subject: [PATCH 09/34] nixos/printing: remove google cloud print --- nixos/modules/services/printing/cupsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index e67badfcd29e..b19cd0732526 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -270,7 +270,7 @@ in drivers = mkOption { type = types.listOf types.path; default = []; - example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]"; + example = literalExample "with pkgs; [ gutenprint hplip splix ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. If this list contains From 8c63323b4118087295b97f9ff37112796ba7bba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 12:53:18 +0100 Subject: [PATCH 10/34] g2o: mark broken on darwin --- pkgs/development/libraries/g2o/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 675d994cf0e6..fc6c135deb57 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -41,5 +41,7 @@ mkDerivation rec { license = with licenses; [ bsd3 lgpl3 gpl3 ]; maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; + # fatal error: 'qglviewer.h' file not found + broken = stdenv.isDarwin; }; } From d125820ba08517250377d10f9741bfe7e99711c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 12:53:31 +0100 Subject: [PATCH 11/34] pythonPackages.androidtv: remove unused input --- pkgs/development/python-modules/androidtv/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index ec00c31147b0..aae46e4e3225 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -7,7 +7,6 @@ , mock , pure-python-adb , pytestCheckHook -, python }: buildPythonPackage rec { From 251eb0889e915efdf3ad0bb353e1bd5d9ae978bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:57:42 +0100 Subject: [PATCH 12/34] far2l: remove unused input --- pkgs/applications/misc/far2l/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index b414cbdd0ed4..87eaed975352 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash +{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick , libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: From 1e866acd6bac953884dd860e62e2967be070e038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:57:59 +0100 Subject: [PATCH 13/34] feedreader: remove unused input --- pkgs/applications/networking/feedreaders/feedreader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index d550a1265470..c9339601a4b3 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts -, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: From e13d3b844899de26743d48d74e0fefa032acdb23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:04 +0100 Subject: [PATCH 14/34] tribler: remove unused input --- pkgs/applications/networking/p2p/tribler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 36b7451e441b..6e2533621e6c 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper -, enablePlayer ? true, libvlc ? null, qt5, lib }: +{ stdenv, fetchurl, python3Packages, makeWrapper +, enablePlayer ? true, libvlc, qt5, lib }: stdenv.mkDerivation rec { pname = "tribler"; From c6c8b5fb535cfdfe731e796496dda89fe90f0f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:08 +0100 Subject: [PATCH 15/34] iso-flags: remove unused input --- pkgs/data/icons/iso-flags/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/data/icons/iso-flags/default.nix index 4252853b898c..57cc1752f187 100644 --- a/pkgs/data/icons/iso-flags/default.nix +++ b/pkgs/data/icons/iso-flags/default.nix @@ -1,9 +1,7 @@ { lib, stdenv , fetchFromGitHub , perl -, perlPackages , inkscape -, pngcrush , librsvg , targets ? [ "all" ] }: From 164d19b24d2332b748aab209fa980fea2a820332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:12 +0100 Subject: [PATCH 16/34] cinnamon-screensaver: remove unused input --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 80a026e88361..0e8f6dbf8c3d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -11,18 +11,10 @@ , intltool , libxslt , gtk3 -, libnotify -, libxkbfile -, cinnamon-menus , libgnomekbd -, libxklavier -, networkmanager -, libwacom , gnome3 , libtool , wrapGAppsHook -, tzdata -, glibc , gobject-introspection , python3 , pam From 6065b9e159650120c0579346cb893d3fdec3bf7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:19 +0100 Subject: [PATCH 17/34] gnome3.gnome-contacts: remove unused input --- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 3a7e21c65f54..ef5e564beb95 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,7 +2,6 @@ , gettext , fetchurl , evolution-data-server -, fetchpatch , pkg-config , libxslt , docbook_xsl From d30234aa05446276f7b3359c2038a3dcf6963690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:24 +0100 Subject: [PATCH 18/34] gnome3.gnome-control-center: remove unused input --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5a78f412dc7a..98d87dc09c85 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -22,7 +22,6 @@ , gnome-color-manager , gnome-desktop , gnome-online-accounts -, gnome-session , gnome-settings-daemon , gnome3 , grilo From 71948d2142327c2d5f842869fb5f0ab6cf08e625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:29 +0100 Subject: [PATCH 19/34] gnome3.gnome-initial-setup: remove unused input --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 002ae9197b74..d2909c449d4a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -30,7 +30,6 @@ , systemd , libnma , tzdata -, yelp , libgnomekbd , gsettings-desktop-schemas , gnome-tour From 37d406b98a979613dbd75d1705ed8e5bf5d95ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:34 +0100 Subject: [PATCH 20/34] gnome3.gnome-applets: remove unused input --- pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 1f9b1ba871dd..1947179028bf 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -16,7 +16,6 @@ , adwaita-icon-theme , libgweather , gucharmap -, tracker , polkit , gnome3 }: From 1db2eb8991f0283ba3aefc40949d085600a9d45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:38 +0100 Subject: [PATCH 21/34] 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 27a379f4738d..e45d25cfa342 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -11,7 +11,6 @@ , wingpanel , orca , onboard -, at-spi2-core , elementary-default-settings , elementary-settings-daemon , runtimeShell From 87ea32d17a70dda85361c50dc47e8ab1522720cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:42 +0100 Subject: [PATCH 22/34] pythonPackages.lammps-cython: remove unused input --- pkgs/development/python-modules/lammps-cython/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix index 609d7a410c17..cf6bdc38ffaa 100644 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ b/pkgs/development/python-modules/lammps-cython/default.nix @@ -47,5 +47,7 @@ buildPythonPackage rec { homepage = "https://gitlab.com/costrouc/lammps-cython"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; + # fails import check + broken = true; }; } From 437de7953ad67583829c85a01dd2ac363a33f3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:47 +0100 Subject: [PATCH 23/34] pythonPackages.moderngl_window: remove unused input --- pkgs/development/python-modules/moderngl_window/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index b4aee8c61cf7..7f6d9893c969 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -7,7 +7,6 @@ , pyglet , pillow , pyrr -, pytest }: buildPythonPackage rec { From ec71872ea11d8d750fec37a7474ab48f51431b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:51 +0100 Subject: [PATCH 24/34] pythonPackages.phonemizer: remove unused input --- pkgs/development/python-modules/phonemizer/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 2d6531794313..80bc0737cac2 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -2,14 +2,11 @@ , substituteAll , buildPythonApplication , fetchPypi -, python3Packages -, pkgs , joblib , segments , attrs , espeak-ng , pytestCheckHook -, pytestrunner , pytestcov }: From a9e1063a43f49b73821c8a88991bc695b6b1ca23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 16:58:55 +0100 Subject: [PATCH 25/34] smbnetfs: remove stale substituteInPlace --- pkgs/tools/filesystems/smbnetfs/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 05d7189fbaac..98f8861699f4 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ fuse samba glib attr libsecret ]; - postPatch = '' - substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h" - ''; - meta = with lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; From 2cd8ce7796c0eec5891bf57c1511a3f1a970cb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 17:18:22 +0100 Subject: [PATCH 26/34] hydra: remove unused inputs --- pkgs/development/tools/misc/hydra/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index cf56e6c1a9c9..c253bda36b8f 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,7 +1,7 @@ -{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json +, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] From c8dfbb6e754d9a6f9d16d576f066cbdc2ff6da7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 22:24:57 +0100 Subject: [PATCH 27/34] aerc: remove unused inputs --- pkgs/applications/networking/mailreaders/aerc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index b43e6bb093c4..3124239b0d9a 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, fetchurl -, go, ncurses, notmuch, scdoc -, python3, perl, w3m, dante -, fetchFromGitHub +, ncurses, notmuch, scdoc +, python3, w3m, dante }: buildGoModule rec { From 2cc1639a5e83b693c92f4e68f443b5b05330e9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 22:25:07 +0100 Subject: [PATCH 28/34] neomutt: remove unused input --- .../applications/networking/mailreaders/neomutt/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index c0ebb3d8078f..0c02f512dad9 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib -, glibcLocales -, fetchpatch +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { From 3de228aefd20a7dee1b7a2eab0e3d2b080419b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 22:25:20 +0100 Subject: [PATCH 29/34] git: remove unused input --- .../version-management/git-and-tools/git/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 90f6ba5ac5ac..3cb214bd8b02 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,4 @@ { fetchurl, lib, stdenv, buildPackages -, fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 From e5c9b6de1a61822f32463f1ff7dca0a3e50a77ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 22:25:34 +0100 Subject: [PATCH 30/34] bat-extras: remove unused input --- pkgs/tools/misc/bat-extras/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 7d3f1dc0a36c..323099f02c67 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils , less From 237b543c535b9bbb4a3dfac16576c124b9127a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 22:25:45 +0100 Subject: [PATCH 31/34] ripgrep: remove unused input --- pkgs/tools/text/ripgrep/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 1d9f4aa4bdbe..2105398c9c09 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, nixosTests , fetchFromGitHub , rustPlatform , asciidoctor From c75d7d2f8c46a6fcd4629d2831cca6d6b612c2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Feb 2021 22:25:57 +0100 Subject: [PATCH 32/34] nixos/grub: fix editor check --- nixos/modules/system/boot/loader/grub/install-grub.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 59f5638044fe..6e354f013fa2 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -356,11 +356,11 @@ else { if ($suffix eq ".jpg") { $suffix = ".jpeg"; } - if ($backgroundColor) { - $conf .= " - background_color '$backgroundColor' - "; - } + if ($backgroundColor) { + $conf .= " + background_color '$backgroundColor' + "; + } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " insmod " . substr($suffix, 1) . " From ab76f0885b4de54cac605bd681ffe4aebede822d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 10:37:45 +0100 Subject: [PATCH 33/34] pythonPackages.graphene: remove unused input --- pkgs/development/python-modules/graphene/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index bf7d08cdce36..2839fc337cd8 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , aniso8601 -, iso8601 , graphql-core , graphql-relay , promise From aee42549dddeb2474a2286fbcbbb2bd2239530fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 10:38:08 +0100 Subject: [PATCH 34/34] pythonPackages.qiskit-aer: remove unused inputs --- pkgs/development/python-modules/qiskit-aer/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 062aeeb97ff3..bb04309d1a58 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -6,7 +6,6 @@ , blas , catch2 , cmake -, conan , cython , fmt , muparserx