From 5b5d2540a80358d162d1bd53ff80f212a51b2996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sun, 10 Oct 2021 21:19:58 +0100 Subject: [PATCH 01/19] geoclue: fix getting a location if the computer has no wifi --- pkgs/development/libraries/geoclue/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 360094ea7655..410c0afd8a65 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -39,6 +39,14 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix for falling back to GeoIP when WiFi devices are not found + # https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494 + # NOTE: this should be removed when the next version is released + (fetchpatch { + url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch"; + sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII="; + }) + # Make the Mozilla API key configurable # https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported) (fetchpatch { From 39ff40c96efaa58f02ff55ef31aecc1718fd9e2e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 10:09:56 +0000 Subject: [PATCH 02/19] python38Packages.iminuit: 2.8.3 -> 2.8.4 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 306d242d68a3..3faf61d169be 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.8.3"; + version = "2.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8e22d81a53ce3316f0253bf0b7831bd72ac1122ca78896c2ee2e585178c5c9ae"; + sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0"; }; nativeBuildInputs = [ cmake ]; From 1909566084283ec7a032da0523382b8b4ee08c58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 10:57:56 +0000 Subject: [PATCH 03/19] python38Packages.pybullet: 3.1.9 -> 3.2.0 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 3a5d68f37e4a..961ca5badbee 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.9"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6fb4d48d5ba9c09cdd1ed732e8a1d48b41bca379e072268af3831774d8391300"; + sha256 = "df02fb0ab74a6e7c4e1d7a3e2ffd7e4760a30cdeccb9fa6dd19f334122ec00f2"; }; buildInputs = [ From 06de86a2cd99bcea2691c6d5983fb9dd5cbd8d17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 17:57:37 +0000 Subject: [PATCH 04/19] python38Packages.sopel: 7.1.4 -> 7.1.5 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index ec4947ebfc45..09becb972360 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.4"; + version = "7.1.5"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "d778ec2b92866eddf97d0809968bc5f9887cb5a000a518a4b67d8eb999cb775c"; + sha256 = "9511dce6d23abdaa47d39d8e222c6b49206bf92e19f4acaf4966b2d402bb6541"; }; propagatedBuildInputs = [ From 2ca301ab2abaa8497111885e0d0a3ef4b4c89c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Pla=CC=81s=CC=8Cil?= Date: Wed, 13 Oct 2021 11:26:06 +0800 Subject: [PATCH 05/19] vifm: 0.11 -> 0.12 --- pkgs/applications/misc/vifm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 531c108cdbf9..2765cd5ad7aa 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -10,11 +10,11 @@ let isFullPackage = mediaSupport; in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.11"; + version = "0.12"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; + sha256 = "1h5j4y704nciyzg3aaav8sl3r5h9mpwq8f28cj65nnxk6a7n3a9k"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; From be9b2e545d1be7dd7578ce65ffc3a484d00d0dd5 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 13 Oct 2021 16:25:01 +0100 Subject: [PATCH 06/19] dockle: 0.4.2 -> 0.4.3 --- pkgs/development/tools/dockle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 9d6510c89d8d..b647505fe4bf 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM="; + sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY="; }; vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; From 4b692c74acee25a9f1ad65664874f36173af07a5 Mon Sep 17 00:00:00 2001 From: nzbr Date: Tue, 12 Oct 2021 22:32:27 +0200 Subject: [PATCH 07/19] maintainers: add nzbr --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8174b36839d4..6733f2c0af54 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8326,6 +8326,17 @@ githubId = 127548; name = "Judson Lester"; }; + nzbr = { + email = "nixos@nzbr.de"; + github = "nzbr"; + githubId = 7851175; + name = "nzbr"; + matrix = "@nzbr:nzbr.de"; + keys = [{ + longkeyid = "rsa2048/0x6C78B50B97A42F8A"; + fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; + }]; + }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; github = "nzhang-zh"; From bc21b6e58bde64093b332fbf52e53de68b8a27be Mon Sep 17 00:00:00 2001 From: nzbr Date: Tue, 12 Oct 2021 22:46:10 +0200 Subject: [PATCH 08/19] xstow: init at 1.0.2 --- pkgs/tools/misc/xstow/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/xstow/default.nix diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix new file mode 100644 index 000000000000..a605dcf911b2 --- /dev/null +++ b/pkgs/tools/misc/xstow/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ncurses }: +stdenv.mkDerivation rec { + pname = "xstow"; + version = "1.0.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef"; + }; + + buildInputs = [ + ncurses + ]; + + meta = with lib; { + description = "A replacement of GNU Stow written in C++"; + homepage = "http://xstow.sourceforge.net"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ nzbr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3197712d39a..4a437c9cd9c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9550,6 +9550,7 @@ with pkgs; storeBackup = callPackage ../tools/backup/store-backup { }; stow = callPackage ../tools/misc/stow { }; + xstow = callPackage ../tools/misc/xstow { }; stun = callPackage ../tools/networking/stun { }; From 49430336270fe0c5487165152632ac226092187e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 22:24:43 +0000 Subject: [PATCH 09/19] python38Packages.versioneer: 0.20 -> 0.21 --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 5336420c79af..868ad5fed966 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.20"; + version = "0.21"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ljk2AOwnF7efWcmE942TX3bkbEyu+HWoe4tO1gLy/2U="; + sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20"; }; # Couldn't get tests to work because, for instance, they used virtualenv and From 5c22f8b2667b209b542462f4b2c9acb5ff052194 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Oct 2021 03:32:57 +0000 Subject: [PATCH 10/19] python38Packages.emoji: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 883ff8bcb61f..f7cdca223078 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41"; + sha256 = "0x18l8jgbki9yqx994w97dagfaqrbxi3sy2l2101is1dfjr0kib6"; }; checkInputs = [ From 23dcb15889a1edf2790d7bc472109a3368aee29f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Oct 2021 05:33:12 +0000 Subject: [PATCH 11/19] python38Packages.google-cloud-container: 2.9.0 -> 2.10.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 39358062fc04..c388429e56a7 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "2454e8dd93093fe6f6ec8e6771f8a7dab19f1d02c629dbbe8972e84b5d9c01e0"; + sha256 = "3804e37865b4d63ac39eac3f8f184225db16bbc69f201b4d54abe6b68f170e60"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; From b91ec507be2a79ffddbb9c08ee06a718ab05ecfc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 14 Oct 2021 06:20:23 +0000 Subject: [PATCH 12/19] packetdrill: pull upstream fix for fno-common toolchains (#141574) * packetdrill: pull upstream fix for fno-common toolchains Example toolchain is clang-12. The patch fixes the following build failure: $ nix-build -E 'with import ./. {}; packetdrill.override { stdenv = clang12Stdenv; }' ... ld: libpacketdrill-lib.a(tcp_options_to_string.c.o):(.bss+0x0): multiple definition of `tcp_option'; libpacketdrill-lib.a(run.c.o):(.bss+0x18): first defined here --- pkgs/tools/networking/packetdrill/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 861e9c0383bb..b06e4558fbbf 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex, cmake, libpcap }: stdenv.mkDerivation rec { pname = "packetdrill"; version = "unstable-2020-08-22"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { rev = "68a34fa73cf221e5f52d6fa4f203bcd93062be1b"; sha256 = "0djkwb6l2959f44d98vwb092rghf0qmii8391vrpxqb99j6pv4h6"; }; + patches = [ + # Upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/google/packetdrill/commit/c08292838de81a71ee477d5bf9d95b1130a1292b.patch"; + sha256 = "1irbar1zkydmgqb12r3xd80dwj2jfxnxayxpb4nmbma8xm7knb10"; + stripLen = 3; + }) + ]; + setSourceRoot = '' export sourceRoot=$(realpath */gtests/net/packetdrill) ''; From cafe9f88fc388a18e5437ffe01c359ab9467f21f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 Oct 2021 09:45:23 +0200 Subject: [PATCH 13/19] =?UTF-8?q?leo2:=201.6.2=20=E2=86=92=201.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix build with recent C++ compilers Use a more recent OCaml (4.05) --- .../science/logic/leo2/default.nix | 23 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index fc2c1e5cba4c..cbc85c5544cc 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, eprover, ocaml, camlp4, perl, zlib }: stdenv.mkDerivation rec { pname = "leo2"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; - sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; + sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ eprover ocaml perl zlib ]; + buildInputs = [ eprover ocaml camlp4 perl zlib ]; - sourceRoot = "leo2/src"; + patches = [ (fetchpatch { + url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch"; + stripLen = 1; + extraPrefix = "lib/"; + sha256 = "sha256:01ln7hi6nvvkqkhn9hciqizizz5qspvqffgksvgmzn9x7kdd9pnh"; + }) + ]; - preConfigure = "patchShebangs configure"; + preConfigure = '' + cd src + patchShebangs configure + substituteInPlace Makefile.pre \ + --replace '+camlp4' "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + ''; buildFlags = [ "opt" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 193be59de3df..cfe2b9f38915 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31153,7 +31153,7 @@ with pkgs; mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 - { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; + { inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; }; leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; From 51f32e34abeaaafe72d4afcc4b23b0544a4bf828 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 14 Oct 2021 00:51:30 -0700 Subject: [PATCH 14/19] linuxKernel.kernels.linux_xanmod: 5.14.9 -> 5.14.12 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 793579fd2c45..08ed46bb0d43 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.9"; + version = "5.14.12"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-CMCZjuK9ofRup05l7HNg87jHTg4jOGrkmtvoxuNGwXE="; + sha256 = "sha256-JVTi319BLHM4CgF7KaN3C/92N4uwh59po1AcOinNpww="; }; structuredExtraConfig = with lib.kernel; { From 476635afe170dcfe49f3de533c4b05bb6fb094a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Oct 2021 10:59:33 +0200 Subject: [PATCH 15/19] Drop myself from meta.maintainers for most packages. I'd like to reduce the number of Github notifications and review requests I receive. --- pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/applications/graphics/sane/backends/default.nix | 1 - pkgs/applications/graphics/sane/frontends.nix | 1 - pkgs/applications/graphics/sane/xsane.nix | 1 - pkgs/applications/misc/fetchmail/default.nix | 1 - pkgs/applications/misc/grip/default.nix | 2 +- pkgs/applications/misc/ikiwiki/default.nix | 1 - pkgs/applications/networking/sync/rsync/default.nix | 2 +- pkgs/applications/office/antiword/default.nix | 1 - pkgs/applications/office/gnucash/default.nix | 2 +- pkgs/applications/science/astronomy/celestia/default.nix | 1 - pkgs/applications/science/astronomy/stellarium/default.nix | 2 +- pkgs/applications/science/electronics/tkgate/1.x.nix | 1 - pkgs/applications/science/math/R/default.nix | 2 +- pkgs/applications/science/math/eukleides/default.nix | 1 - pkgs/applications/science/math/maxima/default.nix | 1 - pkgs/applications/science/math/wxmaxima/default.nix | 1 - .../version-management/git-and-tools/git/default.nix | 2 +- pkgs/applications/video/obs-studio/plugins/obs-ndi.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 -- pkgs/development/compilers/gprolog/default.nix | 1 - pkgs/development/compilers/yap/default.nix | 1 - pkgs/development/libraries/adns/default.nix | 1 - pkgs/development/libraries/boost/generic.nix | 1 - pkgs/development/libraries/buddy/default.nix | 1 - pkgs/development/libraries/gmp/5.1.x.nix | 1 - pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/openssl/default.nix | 1 - pkgs/development/libraries/tecla/default.nix | 1 - pkgs/development/python-modules/bugzilla/default.nix | 2 +- pkgs/development/python-modules/django-mailman3/default.nix | 2 +- pkgs/development/python-modules/mailman-hyperkitty/default.nix | 2 +- pkgs/development/python-modules/mailmanclient/default.nix | 2 +- pkgs/development/tools/misc/fsatrace/default.nix | 1 - pkgs/games/stockfish/default.nix | 2 +- pkgs/misc/cups/drivers/splix/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 1 - pkgs/servers/mail/dovecot/default.nix | 2 +- pkgs/servers/mail/mailman/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/servers/mail/mailman/postorius.nix | 2 +- pkgs/servers/mail/mailman/web.nix | 2 +- pkgs/servers/mail/spamassassin/default.nix | 2 +- pkgs/shells/bash/4.4.nix | 1 - pkgs/shells/bash/5.1.nix | 2 +- pkgs/shells/bash/bash-completion/default.nix | 2 +- pkgs/tools/admin/analog/default.nix | 1 - pkgs/tools/backup/duplicity/default.nix | 1 - pkgs/tools/graphics/asymptote/default.nix | 2 +- pkgs/tools/graphics/mscgen/default.nix | 1 - pkgs/tools/misc/screen/default.nix | 2 +- pkgs/tools/networking/nbd/default.nix | 1 - pkgs/tools/networking/pdsh/default.nix | 1 - pkgs/tools/security/gnupg/22.nix | 2 +- pkgs/tools/system/smartmontools/default.nix | 2 +- pkgs/tools/system/tree/default.nix | 1 - 60 files changed, 31 insertions(+), 61 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index bcd55258a49d..db043140e77a 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -198,7 +198,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ]; + maintainers = with maintainers; [ lovek323 jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 27eb174cdf0c..93a7d75ce45a 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation { ''; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index c0945242096f..d34ab9856fca 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "Scanner Access Now Easy"; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 1deaab4dfe53..e394acf2b061 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [peti]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index db807ffe1cf3..f16e2a87a684 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { IPSEC. ''; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index c182db8fdd3a..557cd45c42c9 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "http://nostatic.org/grip"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ marcweber peti ]; + maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 135132bd4316..8b72647574e6 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -74,6 +74,5 @@ stdenv.mkDerivation rec { homepage = "http://ikiwiki.info/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 88304e56a40a..dc3e8b25e70a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { meta = base.meta // { description = "A fast incremental file transfer utility"; - maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; }; } diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 67a37b2d5113..f0aa32355450 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { description = "Convert MS Word documents to plain text or PostScript"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.peti ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d4dad44d7da8..5bd8450a0b99 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnucash.org/"; - maintainers = [ lib.maintainers.peti lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.domenkozar ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 37f04e0ba5a0..6b76c2de4b05 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { description = "Real-time 3D simulation of space"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 02ef96e2e123..898885047a05 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -37,6 +37,6 @@ mkDerivation rec { homepage = "http://stellarium.org/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ peti ma27 ]; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 5a46e8f63840..6a3999585534 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.peti ]; hydraPlatforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 263130c281b9..c26964bb3144 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = with maintainers; [ peti ] ++ teams.sage.members; + maintainers = with maintainers; teams.sage.members; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 6b6bfd7d6e5f..0c3ef25909bb 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -63,6 +63,5 @@ lib.fix (eukleides: stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 2b82a8f81705..3f295b416fb0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -113,6 +113,5 @@ stdenv.mkDerivation ({ ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 2205e96383a4..57e4a6f1d336 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; platforms = platforms.linux; - maintainers = [ maintainers.peti ]; }; } 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 a5a20b3aa971..6bdefb8cb38d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -367,6 +367,6 @@ stdenv.mkDerivation { ''; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ primeos peti wmertens globin ]; + maintainers = with lib.maintainers; [ primeos wmertens globin ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix index 1e2abb45a5b3..76d4ec85a014 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; - maintainers = with maintainers; [ peti jshcmpbll ]; + maintainers = with maintainers; [ jshcmpbll ]; license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e1c441e7afe0..c192c603c883 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -314,7 +314,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 3b92ecddc08a..70278c237d4c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -330,7 +330,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index e0ef8e317899..1809d7ae42ef 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -344,8 +344,6 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 16a7552dd4e3..6868ca9f8d8f 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index da10125c2433..4428d4dbba65 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "A ISO-compatible high-performance Prolog compiler"; license = lib.licenses.artistic2; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.linux; broken = !stdenv.is64bit; # the linux 32 bit build fails. }; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index db5284e91278..5f29e0411284 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 2d8d13482eac..fdc8f7c21f18 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -137,7 +137,6 @@ stdenv.mkDerivation { badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; - maintainers = with maintainers; [ peti ]; }; preConfigure = optionalString useMpi '' diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index d6ab4fe0dfe5..47b61fe03510 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = lib.platforms.unix; # Once had cygwin problems - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 73061a3d2efd..ea6a7ee42310 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -75,7 +75,6 @@ let self = stdenv.mkDerivation rec { platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; - maintainers = [ maintainers.peti ]; }; }; in self diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 177c15670526..6228b6aaab9e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -82,7 +82,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.peti maintainers.vrthra ]; + maintainers = [ maintainers.vrthra ]; }; }; in self diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2d3f1c313caa..2688dde9ed50 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -170,7 +170,6 @@ let description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; platforms = platforms.all; - maintainers = [ maintainers.peti ]; } // extraMeta; }; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index a0a1ac0360e8..9682ac1637a3 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 365f36542985..03a1610ac7e4 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ pierron peti ]; + maintainers = with maintainers; [ pierron ]; }; } diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 4f4304fd1d6c..00eea271b493 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index d5bf64573363..3bf996fa714a 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 55b3b7bc14fe..7aafe6e61e81 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "REST client for driving Mailman 3"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ peti globin qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index 132ddf2eacfd..4d3661b6c201 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; - maintainers = [ maintainers.peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 5aa2408afd12..05caaaed63e7 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro peti siraben ]; + maintainers = with maintainers; [ luispedro siraben ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index cfe53e48d679..f43f3fc4f3a6 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation rec { homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau peti ]; + maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 6fd7eb42c994..753a361fc18b 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Domain name server"; license = licenses.mpl20; - maintainers = with maintainers; [ peti globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.unix; outputsToInstall = [ "out" "dnsutils" "host" ]; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 6e6eca69da3c..3b8a4acbfc94 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://httpd.apache.org/"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ lovek323 peti ]; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 39f21b189378..86c9ad6c00dc 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.peti ]; broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6f5d065e488c..8fd6dc447a06 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; - maintainers = with maintainers; [ peti fpletz globin ajs124 ]; + maintainers = with maintainers; [ fpletz globin ajs124 ]; platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 3ef9cafebaf0..1213347a0ac7 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ peti qyliss ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 33d31fb8e722..1c20e33bd0c2 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ peti globin qyliss ]; + maintainers = with lib.maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 222a21bcb7f1..d807f7f797c0 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 434f5b3191ed..10adb49be84f 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { meta = with lib; { description = "Django project for Mailman 3 web interface"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ peti qyliss m1cr0man ]; + maintainers = with maintainers; [ qyliss m1cr0man ]; }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 348a2088f2c2..ca86b4b525f2 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -38,6 +38,6 @@ perlPackages.buildPerlPackage rec { description = "Open-Source Spam Filter"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ peti qknight qyliss ]; + maintainers = with lib.maintainers; [ qknight qyliss ]; }; } diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index b3259466ddb1..84cbba8eac4a 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -132,7 +132,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = [ maintainers.peti ]; }; passthru = { diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index ddf2edfd1db6..efa90b0499eb 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = with maintainers; [ peti dtzWill ]; + maintainers = with maintainers; [ dtzWill ]; }; passthru = { diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 0ebcaa9e8645..6571d572a429 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.peti maintainers.xfix ]; + maintainers = [ maintainers.xfix ]; }; } diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index f3318eb55077..54d863bb958f 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://www.c-amie.co.uk/software/analog/"; license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.all; }; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index bd8af80193f6..cbbd86e01675 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -140,7 +140,6 @@ pythonPackages.buildPythonApplication rec { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "https://www.nongnu.org/duplicity"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 30a3b9cc98f9..657d215147ce 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin maintainers.peti ]; + maintainers = [ maintainers.raskin ]; broken = stdenv.isDarwin; # https://github.com/vectorgraphics/asymptote/issues/69 platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 6749a193c00e..7eb1d6cce818 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 70a959578555..d1e02e8b9a36 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - maintainers = with maintainers; [ peti vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 3f3a9b2b7235..95c2f970999a 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index d7ac9ad54e6f..531dfeeb4c45 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 25dc64e6184a..83b04a9fe790 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ peti fpletz vrthra ]; + maintainers = with maintainers; [ fpletz vrthra ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 1658b4ea4df8..e72d7ff5e1c2 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Tools for monitoring the health of hard drives"; homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti Frostman ]; + maintainers = with maintainers; [ Frostman ]; platforms = with platforms; linux ++ darwin; mainProgram = "smartctl"; }; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index ab76de74762c..acf0813b3ac2 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.all; - maintainers = [lib.maintainers.peti]; }; } From ae7ce180dd8bd30721d19dd1c2e6af00fce0d9ec Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Wed, 13 Oct 2021 12:57:34 +0200 Subject: [PATCH 16/19] nixos/prometheus: fix node exporter systemd collector The systemd collector needs AF_UNIX to talk to /var/run/dbus/system_bus_socket, which was broken with 9fea6d4c8551b7c8783f23e011a2ba113c95d0dd. This commit allows AF_UNIX when needed. --- nixos/modules/services/monitoring/prometheus/exporters/node.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index ed594460d95c..bc89799006eb 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -35,6 +35,8 @@ in ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} ''; + # The systemd collector needs AF_UNIX + RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX"; }; }; } From 72fbd63c5c14e29b36e3161b086a653dd9a87158 Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Wed, 13 Oct 2021 15:37:02 +0200 Subject: [PATCH 17/19] nixos/prometheus: fix node exporter timex collector The timex collector (enabled by default) needs the adjtimex syscall, which was disabled by 9fea6d4c8551b7c8783f23e011a2ba113c95d0dd. So allow it unless the timex collector is disabled. --- nixos/modules/services/monitoring/prometheus/exporters.nix | 2 +- nixos/modules/services/monitoring/prometheus/exporters/node.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index b40d6b3ca004..62e90232e114 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -192,7 +192,7 @@ let serviceConfig.MemoryDenyWriteExecute = true; serviceConfig.NoNewPrivileges = true; serviceConfig.PrivateDevices = true; - serviceConfig.ProtectClock = true; + serviceConfig.ProtectClock = mkDefault true; serviceConfig.ProtectControlGroups = true; serviceConfig.ProtectHome = true; serviceConfig.ProtectHostname = true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index bc89799006eb..baac21b050f5 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -37,6 +37,8 @@ in ''; # The systemd collector needs AF_UNIX RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX"; + # The timex collector needs to access clock APIs + ProtectClock = lib.any (x: x == "timex") cfg.disabledCollectors; }; }; } From 300226261fe5bcabb070a68c1a837e6938566370 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 13 Oct 2021 19:27:42 +0200 Subject: [PATCH 18/19] nixos/unifi: fix unifi ExecStop= being incompatible with systemd unifi does not shut down properly when stopped via systemd (it always exits with SIGTERM exit status) because systemd wants stop commands to not exit before the main command is gone and unifi does not comply. the easiest way around this is to have systemd send an ignored signal after the stop command has exited. unifi may still throw exceptions during shutdown, but it *does* exit cleanly as far as systemd is concerned now. --- nixos/modules/services/networking/unifi.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 708ea28a9440..530614ad9374 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -172,9 +172,15 @@ in ExecStart = "${(removeSuffix "\n" cmd)} start"; ExecStop = "${(removeSuffix "\n" cmd)} stop"; Restart = "on-failure"; + TimeoutSec = "5min"; User = "unifi"; UMask = "0077"; WorkingDirectory = "${stateDir}"; + # the stop command exits while the main process is still running, and unifi + # wants to manage its own child processes. this means we have to set KillSignal + # to something the main process ignores, otherwise every stop will have unifi.service + # fail with SIGTERM status. + KillSignal = "SIGCONT"; # Hardening AmbientCapabilities = ""; From e7331d2e855145c651f9c2370e6732e5e443a27b Mon Sep 17 00:00:00 2001 From: Lara Date: Thu, 14 Oct 2021 10:32:36 +0000 Subject: [PATCH 19/19] gitlab: 14.3.2 -> 14.3.3 --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../applications/version-management/gitlab/default.nix | 5 ----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 6578d5e2a0fc..ff1689f28f8f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.3.2", - "repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr", + "version": "14.3.3", + "repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.3.2-ee", + "rev": "v14.3.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.3.2", + "GITALY_SERVER_VERSION": "14.3.3", "GITLAB_PAGES_VERSION": "1.44.0", "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.3.2" + "GITLAB_WORKHORSE_VERSION": "14.3.3" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 26d8cb1732fd..88c92df71e34 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -80,11 +80,6 @@ let # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock - # fixup_yarn_lock currently doesn't correctly fix the dagre-d3 - # url, so we have to do it manually - ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \ - '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b8d8c4dfb890..26deabcc230d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.3.2"; + version = "14.3.3"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo="; + sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 84b0b2580e62..3e3bc25162b2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.3.2"; + version = "14.3.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index dd2970c3ed28..51ccc8a03cc2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1650,4 +1650,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.24 + 2.2.20