From 322a608a5e71dfcaf74cb66dd0cb2689947b68c0 Mon Sep 17 00:00:00 2001 From: Max Hofer Date: Tue, 1 Mar 2022 14:52:41 +0100 Subject: [PATCH 01/48] mutt-ics: add new package --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/networking/mutt-ics/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/mutt-ics/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a3f2d6bd6d9..9ac776e3d77 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7952,6 +7952,12 @@ githubId = 20536514; name = "Magdalena Haselsteiner"; }; + mh182 = { + email = "mh182@chello.at"; + github = "mh182"; + githubId = 9980864; + name = "Max Hofer"; + }; mic92 = { email = "joerg@thalheim.io"; matrix = "@mic92:nixos.dev"; diff --git a/pkgs/tools/networking/mutt-ics/default.nix b/pkgs/tools/networking/mutt-ics/default.nix new file mode 100644 index 00000000000..4193690dc3d --- /dev/null +++ b/pkgs/tools/networking/mutt-ics/default.nix @@ -0,0 +1,21 @@ +{ lib, python3 }: + +with python3.pkgs; buildPythonApplication rec { + pname = "mutt-ics"; + version = "0.9.2"; + + src = fetchPypi { + inherit version; + pname = "mutt_ics"; + sha256 = "d44d4bec4e71c7f14df01b90fdb9563cdc784ece4250abfea5b0b675cfe85a50"; + }; + + propagatedBuildInputs = [ icalendar ]; + + meta = with lib; { + homepage = "https://github.com/dmedvinsky/mutt-ics"; + description = "A tool to show calendar event details in Mutt"; + license = licenses.mit; + maintainers = with maintainers; [ mh182 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c243f738b8..d4d177256c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27618,6 +27618,8 @@ with pkgs; }; mutt-wizard = callPackage ../tools/misc/mutt-wizard { }; + mutt-ics = callPackage ../tools/networking/mutt-ics { }; + mwic = callPackage ../applications/misc/mwic { pythonPackages = python3Packages; }; From 72c95f2878c59ca359670376e393044238ef6258 Mon Sep 17 00:00:00 2001 From: shayne <79330+shayne@users.noreply.github.com> Date: Tue, 1 Mar 2022 09:25:32 -0500 Subject: [PATCH 02/48] php.extensions.datadog_trace: init at 0.70.0 --- .../php-packages/datadog_trace/default.nix | 22 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/php-packages/datadog_trace/default.nix diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix new file mode 100644 index 00000000000..9b91d85fefe --- /dev/null +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -0,0 +1,22 @@ +{ buildPecl, curl, fetchFromGitHub, lib, pcre2 }: + +buildPecl rec { + pname = "ddtrace"; + version = "0.70.0"; + + src = fetchFromGitHub { + owner = "DataDog"; + repo = "dd-trace-php"; + rev = "${version}"; + sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY="; + }; + + buildInputs = [ curl pcre2 ]; + + meta = with lib; { + description = "Datadog Tracing PHP Client"; + homepage = "https://github.com/DataDog/dd-trace-php"; + license = licenses.apsl20; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 81628686a31..c783ae806fa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -179,6 +179,8 @@ lib.makeScope pkgs.newScope (self: with self; { couchbase = callPackage ../development/php-packages/couchbase { }; + datadog_trace = callPackage ../development/php-packages/datadog_trace { }; + ds = callPackage ../development/php-packages/ds { }; event = callPackage ../development/php-packages/event { }; From a46b49291d7977894e21fce9aa10a9a84bd93013 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 09:39:42 +0000 Subject: [PATCH 03/48] callaudiod: 0.1.3 -> 0.1.4 --- pkgs/applications/audio/callaudiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 74f4b2de49e..562a53fe592 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-WZ23jacCsZiNeMJfnYMaGdHXY9OCIBbeU9dWGDroaHE="; + sha256 = "sha256-71+9ALz55aqxXRBRwOcs9fwiQK31pJ9E72pGRmt0OkE="; }; strictDeps = true; From 0e3e49fc674f96c5b71951b68a2dba5999326b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Mar 2022 06:14:33 +0000 Subject: [PATCH 04/48] python310Packages.wasabi: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/wasabi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index fca3f5480dc..880f144db6e 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "152245d892030a3a7b511038e9472acff6d0e237cfe4123fef0d147f2d3274fc"; + sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8="; }; checkInputs = [ pytestCheckHook ]; From 64c5c832ce760a7fd32a5b66fca1dbed3c2991d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 02:06:34 +0000 Subject: [PATCH 05/48] languagetool: 5.6 -> 5.7 --- pkgs/tools/text/languagetool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 96dc84e94db..cae8fd20190 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.6"; + version = "5.7"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-HsRAu8exGXCGF0P7wZaDtuAKRDmNjMF9P2hFliZ1RXo="; + sha256 = "sha256-UR8OodT2H+YKmal+9kYsiwqM0dZhUHaUGEWZMzT+3dA="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; From 89adbcc9b3a6b377e2dd4ecddcd5f80cbdb9d7b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 12:51:28 +0000 Subject: [PATCH 06/48] elementary-xfce-icon-theme: 0.15.2 -> 0.16 --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 384086204c1..ab1b6824f6d 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.15.2"; + version = "0.16"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "sha256-E8f6UU/4Y9Nfk7LjDcdyV+TdeVj/zl3oFCyEu3Gz27w="; + sha256 = "sha256-p6HQhYf+rw3obrc6e5lYqC02i4dK+5eXGwnTJj0+D+k="; }; nativeBuildInputs = [ From 8771b59a5fbf0190cb9afe9d06198b6687630b16 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:20:40 +0800 Subject: [PATCH 07/48] apt: 2.3.15 -> 2.4.4 --- pkgs/tools/package-management/apt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 511643e38af..550f010d754 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.3.15"; + version = "2.4.4"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-JWIAfREJk91+eobdgeplDmEhAXm1nqxytu3/Y2TAu6Y="; + hash = "sha256-1tg9Ei3dfMg7LC+DmlWUDBOrk+XPYCSgENamtBENzw4="; }; nativeBuildInputs = [ From a440e3ec9148634d381d00a07dc4fcb48aaf3acd Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Tue, 5 Apr 2022 02:59:29 +0200 Subject: [PATCH 08/48] curlie: 1.6.7 -> 1.6.9 --- pkgs/tools/networking/curlie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 2e6683ef4ea..dee4b8998be 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "curlie"; - version = "1.6.7"; + version = "1.6.9"; - src= fetchFromGitHub { + src = fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uWLJWhsqJaLji2JSuVX8Vu929AdozhtAPwsqXdpEt84="; + hash = "sha256-3EKxuEpFm+lp2myMfymYYY9boSXGOF2iAdjtGKnjJK0="; }; vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; From 3449b89a6b5b2dfde7f9e5d6649cd8e552632889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 21:08:02 +0000 Subject: [PATCH 09/48] xfce.thunar: 4.16.10 -> 4.16.11 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 3319141a8be..dd8e8f98094 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.10"; + version = "4.16.11"; - sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64="; + sha256 = "sha256-xan0HuHYLVArx3dGzzxsCjQ8eWsXNk0LtZGAejA2iGI="; nativeBuildInputs = [ docbook_xsl From 1de1469af87df0792a499dbbbafb2ad922271311 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 Apr 2022 23:21:37 +0200 Subject: [PATCH 10/48] mypaint: Fix build --- pkgs/applications/graphics/mypaint/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 7b83bdec8c6..b93b4794db8 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , gtk3 , gettext , json_c @@ -31,6 +32,15 @@ in buildPythonApplication rec { fetchSubmodules = true; }; + patches = [ + # Fix build due to setuptools issue. + # https://github.com/mypaint/mypaint/pull/1183 + (fetchpatch { + url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch"; + sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + }) + ]; + nativeBuildInputs = [ gettext pkg-config From d7a6ec66b092131ccda42d236f1eb052954f39a1 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 7 Apr 2022 00:27:30 +0200 Subject: [PATCH 11/48] plex: 1.25.8.5663-e071c3d62 -> 1.25.9.5721-965587f64 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 861d66b3d04..520a7317c4a 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.25.8.5663-e071c3d62"; + version = "1.25.9.5721-965587f64"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - hash = "sha256-w9k8phyiA/sK+zRlK8PAciebt5UJvmVFA+cfx4r78Gs="; + hash = "sha256-qD4VZ0ksR+VyBVVjeSCC2EG+uUHh5RE2fihHrIJUItY="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - hash = "sha256-baOofe+7PZfLhwIXrB1ibKkkEJRVivgGHDN4phlg57Q="; + hash = "sha256-NPfpQ8JwXDaq8xpvSabyqdDqMWjoqbeoJdu41nhdsI0="; }; outputs = [ "out" "basedb" ]; From 56a43116e5414980be66d15d70002f7c5b337c5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 07:41:00 +0000 Subject: [PATCH 12/48] arc-theme: 20220223 -> 20220405 --- pkgs/data/themes/arc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 11e76c20276..ef05338cf5a 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20220223"; + version = "20220405"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "sha256-qsZdXDNxT1/gIlkUsC1cfVrULApC+dHreBXXjVTJQiA="; + sha256 = "sha256-CBj/SpBWH5xdNCQSJquqIntcmfARI7Cud76Tp8txXL4="; }; nativeBuildInputs = [ From 7979a1b2941aea41bc01aec100d908639e279145 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 7 Apr 2022 08:44:04 +0000 Subject: [PATCH 13/48] spidermonkey_91: 91.7.0 -> 91.8.0 --- pkgs/development/interpreters/spidermonkey/91.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index fede01c0ada..c1e647deb70 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.7.0"; + version = "91.8.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; + sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3"; }; outputs = [ "out" "dev" ]; From d632f6599a883439479746db10bc2cb105671912 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 7 Apr 2022 14:39:23 +0100 Subject: [PATCH 14/48] syft: 0.43.0 -> 0.43.2 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 7f2705b923f..bb14b1c97f1 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.43.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gUdlVwXqi58X6O1arfniNsKKNR+bU1qwzVvY0PAzwfk="; + sha256 = "sha256-vGzS5Tpg+3f+ydsNbYza4FnCLBv6hMT3RGdlHrKjtfE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-nIVVwFISDkbO+USpJsHMrYDGQbf4jSGkRLS3Oq9HaBA="; + vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI="; nativeBuildInputs = [ installShellFiles ]; From 2a4778fae3dee52f02ef23e359013208ad99ca07 Mon Sep 17 00:00:00 2001 From: Raymen Scholten Date: Thu, 7 Apr 2022 16:06:37 +0200 Subject: [PATCH 15/48] stellar-core: 17.0.0 -> 18.5.0 --- pkgs/applications/blockchains/stellar-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 6ecc4e241cb..b689ddd4f4d 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "17.0.0"; + version = "18.5.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "1ngl8yjqb8xzhdwzlxzzxf14q2hgwy2ysb17sn5380rrn0jswin1"; + sha256 = "sha256-wEi22R4zb8d5CJV5eWb776Yob8B6Ok4FrbYI0SGM0H8="; fetchSubmodules = true; }; From 4417580bbf0de5a8915b070bdc895feb0e3edecd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 15:06:59 +0000 Subject: [PATCH 16/48] python310Packages.myjwt: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/myjwt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 0fecd439e3f..ca3e4fa1cb4 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "myjwt"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; - rev = version; - sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A="; + rev = "refs/tags/${version}"; + sha256 = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc="; }; propagatedBuildInputs = [ From 64f3350532071a9866d586ae369f76d988e8a111 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 11:56:46 -0300 Subject: [PATCH 17/48] cod: fix tests Co-authored-by: @jnetod @thiagokokada --- pkgs/tools/misc/cod/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 741487c6687..3c76e68b894 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, python3 }: buildGoModule rec { pname = "cod"; @@ -15,7 +15,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; - doCheck = false; + checkInputs = [ python3 ]; + + preCheck = '' + pushd test/binaries/ + for f in *.py; do + patchShebangs ''$f + done + popd + export COD_TEST_BINARY="''${NIX_BUILD_TOP}/go/bin/cod" + ''; meta = with lib; { description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output"; From e54fe8f21743808ae71cd52f8cd471019b4b3046 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Apr 2022 19:34:28 +0200 Subject: [PATCH 18/48] python3Packages.myjwt: disable on older Python releases --- pkgs/development/python-modules/myjwt/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index ca3e4fa1cb4..3c21c2c8106 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -10,6 +10,7 @@ , pyperclip , pytest-mock , pytestCheckHook +, pythonOlder , questionary , requests , requests-mock @@ -18,6 +19,9 @@ buildPythonPackage rec { pname = "myjwt"; version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mBouamama"; @@ -48,7 +52,9 @@ buildPythonPackage rec { sed -i -e "s/==[0-9.]*//" requirements.txt ''; - pythonImportsCheck = [ "myjwt" ]; + pythonImportsCheck = [ + "myjwt" + ]; meta = with lib; { description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; From 238f61a2d42a056486206c5d7e48314b78c614df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Apr 2022 16:23:01 +0200 Subject: [PATCH 19/48] python3Packages.elkm1-lib: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/elkm1-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 6b877a58dd0..4543d009849 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g="; + hash = "sha256-JZohQ0xLFfLVMGlw89uC9OQF6SMddcCOsotshavynCk="; }; nativeBuildInputs = [ From c2f27faa94f96738b9b4de3e926acfc8cf738e17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 18:26:08 +0000 Subject: [PATCH 20/48] exoscale-cli: 1.52.0 -> 1.52.1 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index f1a420b0c10..e5282bf96da 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-uaJt1QS4nDVliIFo11OhQYvOxJMeda0QGuaGZCPRoWk="; + sha256 = "sha256-CSltvSdKLAH711ubT6ROgkmq2EcFJplPmavsJa9xupM="; }; goPackagePath = "github.com/exoscale/cli"; From dfbd945f5c6c3bea9fd8bb9d40ac522046d7804f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 18:52:35 +0000 Subject: [PATCH 21/48] python310Packages.pre-commit-hooks: 4.1.0 -> 4.2.0 --- .../development/python-modules/pre-commit-hooks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index eae35b5bac6..db598b368c5 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pre-commit"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-nxJp7LkCUkJj77RCeWedBusue3x0lZYatSidbueZqfo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jSu4LutEgpeAbCgSHgk6VXQKLZo00T3TrQVZxsNU1co="; }; propagatedBuildInputs = [ From 28d8eab486b4c3d9f45586613db4ec5b3792a460 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 7 Apr 2022 12:10:24 +0530 Subject: [PATCH 22/48] talosctl: 0.14.3 -> 1.0.1 --- .../networking/cluster/talosctl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 374d9c972c7..7e12f18a78c 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "0.14.3"; - sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU="; - vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk="; - pkgsVersion = "v0.9.0-6-gbfcc795"; - extrasVersion = "v0.7.0-2-gb4c9d21"; + version = "1.0.1"; + sha256 = "sha256-IqFnVOnmYqf2K3TX+gwFPmBBksYz+56Oy/t8xWhi7fc="; + vendorSha256 = "sha256-GKdAMmU4HiOFYR0SFeFvwFGTXc2lmzO/fAlR1vCDfX4="; + pkgsVersion = "v1.0.0-6-g7c293d5"; + extrasVersion = "v1.0.0"; in buildGoModule rec { pname = "talosctl"; From 5f2673066f5256d0cb1d8271f3cd0a2ed10fe0ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 21:08:50 +0000 Subject: [PATCH 23/48] python310Packages.pyplaato: 0.0.16 -> 0.0.17 --- pkgs/development/python-modules/pyplaato/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyplaato/default.nix b/pkgs/development/python-modules/pyplaato/default.nix index 46168b87116..363c9da0eb9 100644 --- a/pkgs/development/python-modules/pyplaato/default.nix +++ b/pkgs/development/python-modules/pyplaato/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyplaato"; - version = "0.0.16"; + version = "0.0.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0hbdwgkQhcjD9YbpG+bczAAi9u1QfrJdMn1g14EBPac="; + sha256 = "sha256-fd7gHDah5yoqpH5d3bwEDsIfeflXzXevJLMD7lvz180="; }; propagatedBuildInputs = [ aiohttp python-dateutil ]; From dd2a308c4331580635b3500dbc4c2a1b834f3712 Mon Sep 17 00:00:00 2001 From: Raymen Scholten Date: Thu, 7 Apr 2022 23:33:31 +0200 Subject: [PATCH 24/48] stellar-core: add missing compile dependency enable parallel build --- pkgs/applications/blockchains/stellar-core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index b689ddd4f4d..10cc5622566 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git -, bison, flex, postgresql, ripgrep }: +, bison, flex, postgresql, ripgrep, libunwind }: stdenv.mkDerivation rec { pname = "stellar-core"; @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ]; + nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep libunwind ]; propagatedBuildInputs = [ bison flex postgresql ]; + enableParallelBuilding = true; + preConfigure = '' # Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on # having the .git directory present, so directly provide the version From db20d4e7f6acb0e9f4b16e7eda090747fd881795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 22:33:43 +0000 Subject: [PATCH 25/48] python310Packages.python-smarttub: 0.0.30 -> 0.0.31 --- pkgs/development/python-modules/python-smarttub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index b41ddf01a8e..6770b589ce7 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.30"; + version = "0.0.31"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mdz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-tyE50HzwnrxXGWJ0+YRxCmSxtqrPnYmJzBH2ZDFJDZ4="; }; propagatedBuildInputs = [ From eed1123ed1d174cb57cbcf2e6485b22d9e514ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 7 Apr 2022 13:06:51 +0200 Subject: [PATCH 26/48] scala-cli: 0.1.2 -> 0.1.3 --- .../tools/build-managers/scala-cli/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index c045944b773..81859bcb799 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,22 +1,23 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.1.2"; + version = "0.1.3"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q"; + sha256 = "UlDF2Eaaet62zZV0z6XOZvg/YeB//AXPDni8h3Wc6rw="; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj"; + sha256 = "086fi7ma4j9xy6gs0k7i06ql8ranjkjlrir2860q74kinfisk79a"; }; }; in stdenv.mkDerivation { pname = "scala-cli"; inherit version; - nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optional stdenv.isLinux autoPatchelfHook; buildInputs = [ coreutils zlib stdenv.cc.cc ]; src = let @@ -42,9 +43,9 @@ stdenv.mkDerivation { # We need to call autopatchelf before generating completions dontAutoPatchelf = true; - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' autoPatchelf $out - + '' + '' # hack to ensure the completion function looks right # as $0 is used to generate the compdef directive PATH="$out/bin:$PATH" From 5c320f8385232b1617a93486ff978f15ae7a1b0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 00:44:11 +0000 Subject: [PATCH 27/48] sqlfluff: 0.11.2 -> 0.12.0 --- pkgs/development/tools/database/sqlfluff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index cc6757e239a..82a588e3020 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - hash = "sha256-iEjfp6QXMIk/ehq0Ypa8JXv3/u40w39NHz7HhC1KBms="; + rev = "refs/tags/${version}"; + hash = "sha256-WL9bp77Q1cQakxaptw6ZHCq2+IAscMIDKkbQAHSCo1s="; }; propagatedBuildInputs = with python3.pkgs; [ From 4bb889376f540d0ca203726539546272f3d60e16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 01:09:19 +0000 Subject: [PATCH 28/48] iwd: 1.25 -> 1.26 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 19f4301ff53..bc5811942a5 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.25"; + version = "1.26"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-3IiRuILU2FKzXAQ0Q79DX2+nlNMcHNanS8m9GqjBBnU="; + sha256 = "sha256-+BciYfb9++u9Ux4AdvPFFIFVq8j+TVoTLKqxzmn5p3o="; }; outputs = [ "out" "man" "doc" ] From b3af29aa16c88d12bc0f6bfc8bda7600fbd1df7a Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Tue, 5 Apr 2022 03:13:58 +0200 Subject: [PATCH 29/48] curlie: set and test version --- pkgs/tools/networking/curlie/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index dee4b8998be..42660dbf5cc 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, curlie, testVersion }: buildGoModule rec { pname = "curlie"; @@ -15,6 +15,13 @@ buildGoModule rec { doCheck = false; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + passthru.tests.version = testVersion { + package = curlie; + command = "curlie version"; + }; + meta = with lib; { description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; homepage = "https://curlie.io/"; From e75fcaf708acf8b1aac72939e1a0e8f8d3e0c298 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 01:52:16 +0000 Subject: [PATCH 30/48] python310Packages.slicerator: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/slicerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 191159a648e..2fc0cb41d1f 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "slicerator"; src = fetchPypi { inherit pname version; - sha256 = "18e60393e6765ca96986f801bbae62a617a1eba6ed57784e61b165ffc7dc1848"; + sha256 = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY="; }; propagatedBuildInputs = [ six ]; From f596fc3904df0a99e487ab5986d5ab3ba827bd7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 03:36:41 +0000 Subject: [PATCH 31/48] python310Packages.furo: 2022.3.4 -> 2022.4.7 --- pkgs/development/python-modules/furo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 615bf3ebe9c..60fbc917f7d 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.3.4"; + version = "2022.4.7"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; + sha256 = "sha256-fz49L7l3SDWQ+Oyyws1RG9gmYbecGO+yTelVi8nN8tc="; }; propagatedBuildInputs = [ From e6698f624b35e65554c877c2dc848312bc248386 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 03:42:35 +0000 Subject: [PATCH 32/48] python310Packages.hahomematic: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/hahomematic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 512f92deb1b..e946e59fea3 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielperna84"; repo = pname; - rev = version; - sha256 = "sha256-8iLQpNax0xgjf+vUo6OcXMF1aZuaRFZBos8EC1gJEPA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-mqB6Sal+gt2i9h9HHZNVJ/HXPrF7Fe4MC7EKpJR3JMY="; }; propagatedBuildInputs = [ From 2a2a0c7df3ae3c0841e2dd707e9d84f7ec8203be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 03:46:55 +0000 Subject: [PATCH 33/48] python310Packages.trimesh: 3.10.7 -> 3.10.8 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 54e2da8e4ed..0810acd1ea4 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.7"; + version = "3.10.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OYor+DQJkkQx8C5E0pmeGaymiYEyKkuKBLp12jkrhS8="; + sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A="; }; propagatedBuildInputs = [ numpy ]; From 71fb9043326c146523480cf82a692170551fd8f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 06:36:40 +0000 Subject: [PATCH 34/48] python310Packages.scmrepo: 0.0.17 -> 0.0.18 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 5d4a4841162..93854478853 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.17"; + version = "0.0.18"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OMmVEBbb3BQcxpAg6+goGITu8iuHzg+ZzVs+8UdRFrg="; + hash = "sha256-eMtYVdKLiIaagDB1OEdYge6+McchOZPBcuIKGMzyvQQ="; }; propagatedBuildInputs = [ From 23e9e781e292a246c4f884d58661136eab726c45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 23:37:40 +0000 Subject: [PATCH 35/48] build(deps): bump cachix/install-nix-action from 16 to 17 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 16 to 17. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v16...v17) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nixos-manual.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 41f751fd061..9a196923cf4 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -16,7 +16,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v17 - uses: cachix/cachix-action@v10 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index de49e55ef2a..5b57614e110 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v17 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 61a8a217651..64829a19136 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v17 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 70d9aab6982..2aebeeeea2a 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v17 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index bd70f228d46..a77b9026042 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v17 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 0c775cb6e40..13b08bed2bb 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v17 - name: setup id: setup run: | From fe871db0886079d3561975ab8941935543102ead Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 8 Apr 2022 15:08:22 +1000 Subject: [PATCH 36/48] ffmpeg_5: 5.0 -> 5.0.1 https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/9687cae2b468e09e35df4cea92cc2e6a0e6c93b3:/Changelog#l4 --- ...missing-samples-dependency-to-fate-s.patch | 27 ------------------- pkgs/development/libraries/ffmpeg/5.nix | 6 ++--- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch diff --git a/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch b/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch deleted file mode 100644 index ac016069357..00000000000 --- a/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001 -From: James Almer -Date: Sun, 16 Jan 2022 00:32:52 -0300 -Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest - -Signed-off-by: James Almer -(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345) ---- - tests/fate/ffmpeg.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak -index 0b00bb5b23..b80467d02e 100644 ---- a/tests/fate/ffmpeg.mak -+++ b/tests/fate/ffmpeg.mak -@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \ - -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \ - -f ac3 -flags +bitexact -c ac3_fixed - --FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ -+FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ - SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \ - ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \ - AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ --- -2.33.1 - diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index 7b79ddff77e..b5dff5a282e 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -5,10 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "5.0"; + version = "5.0.1"; branch = version; - sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0"; + sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; - - patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ]; } // args) From be759b46f524cfc41e15b9cbedd12493ed16ea3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 08:07:36 +0000 Subject: [PATCH 37/48] python310Packages.databricks-connect: 9.1.12 -> 9.1.13 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 5442ba7e8cf..b86dbb79810 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.12"; + version = "9.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o3r2qZbSAAzyxfPdf9JNDhd/WKRhDdJFfnjCI8eTEE0="; + sha256 = "sha256-TpE15UOwbuAvp+ffC9JUnR8yQb0DWvBMkSieMhQGjao="; }; sourceRoot = "."; From 97836a11309a2a1d590a179dd85aa86a3bce19d9 Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Sat, 2 Apr 2022 13:52:34 +0200 Subject: [PATCH 38/48] obsidian: Fix meta 1. Common meta was accidentally not passed to mkDerivation. 2. Add aarch64-linux to meta.platforms. I've tested it on asahi nixos and it seems to run fine. 3. Move some stuff around to avoid recursive attribute sets to avoid infinite recursion when updating meta. --- pkgs/applications/misc/obsidian/default.nix | 40 ++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index ce95cf8f306..d34770051d0 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,6 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; version = "0.14.2"; + appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; @@ -27,24 +28,24 @@ let sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; }; - linux = stdenv.mkDerivation rec { - icon = fetchurl { - url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; - sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; - }; + icon = fetchurl { + url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; + sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; + }; - desktopItem = makeDesktopItem { - name = "obsidian"; - desktopName = "Obsidian"; - comment = "Knowledge base"; - icon = "obsidian"; - exec = "obsidian %u"; - categories = [ "Office" ]; - mimeTypes = [ "x-scheme-handler/obsidian" ]; - }; + desktopItem = makeDesktopItem { + name = "obsidian"; + desktopName = "Obsidian"; + comment = "Knowledge base"; + icon = "obsidian"; + exec = "obsidian %u"; + categories = [ "Office" ]; + mimeTypes = [ "x-scheme-handler/obsidian" ]; + }; - inherit pname version src; - meta.platforms = [ "x86_64-linux" ]; + linux = stdenv.mkDerivation { + inherit pname version src desktopItem icon; + meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; installPhase = '' runHook preInstall @@ -71,10 +72,9 @@ let ''; }; - darwin = stdenv.mkDerivation rec { - appname = "Obsidian"; - inherit pname version src; - meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + darwin = stdenv.mkDerivation { + inherit pname version src appname; + meta = meta // { platforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; sourceRoot = "${appname}.app"; nativeBuildInputs = [ makeWrapper undmg unzip ]; installPhase = '' From c7390885a9235f8de575ed150eb8a93fa7040b18 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Tue, 5 Apr 2022 18:46:14 +0200 Subject: [PATCH 39/48] asterisk: update all packages --- .../from_md/release-notes/rl-2205.section.xml | 9 +++++++++ .../manual/release-notes/rl-2205.section.md | 2 ++ pkgs/servers/asterisk/default.nix | 9 ++++----- pkgs/servers/asterisk/versions.json | 20 ++++++++----------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 830730caef8..4453c907f67 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1465,6 +1465,15 @@ takes a list of strings instead of a string. + + + The asterisk and + asterisk-stable packages were switched from + asterisk_18 to the newly-packaged + asterisk_19. Asterisk 13 and 17 have been + removed as they have reached their end of life. + + The services.unifi.openPorts option default diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 333c2355232..abc16b8d66e 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -517,6 +517,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string. +- The `asterisk` and `asterisk-stable` packages were switched from `asterisk_18` to the newly-packaged `asterisk_19`. Asterisk 13 and 17 have been removed as they have reached their end of life. + - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt. diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index dddc7f42d88..ab309612788 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -100,17 +100,16 @@ let }) (lib.importJSON ./versions.json); in { - # Supported releases (as of 2020-10-26). + # Supported releases (as of 2022-04-05). # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/ # # Series Type Rel. Date Sec. Fixes EOL - # 13.x LTS 2014-10-24 2020-10-24 2021-10-24 # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 - # 17.x Standard 2019-10-28 2020-10-28 2021-10-28 # 18.x LTS 2020-10-20 2024-10-20 2025-10-20 + # 19.x Standard 2021-11-02 2022-11-02 2023-11-02 asterisk-lts = versions.asterisk_18; - asterisk-stable = versions.asterisk_18; - asterisk = versions.asterisk_18; + asterisk-stable = versions.asterisk_19; + asterisk = versions.asterisk_19; } // versions diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 93d2539993d..f11f5547c3e 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,18 +1,14 @@ { - "asterisk_13": { - "sha256": "478040705f5819259bb1d22cb4e27970092a5bfdb691d27d321c26235eea4bb3", - "version": "13.38.3" - }, "asterisk_16": { - "sha256": "c34fc38287cea533c0d0a34959112119e47d12d8ea6ac11bdddf9265afda6d11", - "version": "16.19.1" - }, - "asterisk_17": { - "sha256": "cc0d6b9ef1512d4e279b80ca8bf78032d69fe6e92492c95c22c44023d6c111fa", - "version": "17.9.4" + "sha256": "379c5529b9957c28734192999543486a0b0b24f6671b2e02e77cc809774e7ba9", + "version": "16.25.1" }, "asterisk_18": { - "sha256": "e7d78716a0deeadf24b7d537cd24c11c2d9a096265eefc9470565c4da0fc54c7", - "version": "18.5.1" + "sha256": "9db0e94e005a91a5433fc11173247065a5c40c9a7ca946577908f65d130b888e", + "version": "18.11.1" + }, + "asterisk_19": { + "sha256": "3e1fa31ef1de7813365dd8b98ef93744ff87902255472814d0232b955c794706", + "version": "19.3.1" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 18e92057304..bb2239dc09e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -81,7 +81,9 @@ mapAliases ({ arora = throw "arora has been removed"; # Added 2020-09-09 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 + asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 + asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 798747dbb8f..68b86f870d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21204,7 +21204,7 @@ with pkgs; inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_13 asterisk_16 asterisk_17 asterisk_18; + asterisk_16 asterisk_18 asterisk_19; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; From 4ed91442a1d81cf051bb76440a0daf10aad42bfc Mon Sep 17 00:00:00 2001 From: Raymen Scholten Date: Fri, 8 Apr 2022 10:18:54 +0200 Subject: [PATCH 40/48] Move libunwind to buildInputs --- pkgs/applications/blockchains/stellar-core/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 10cc5622566..f89ad0eb780 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep libunwind ]; + nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ]; + + buildInputs = [ libunwind ]; propagatedBuildInputs = [ bison flex postgresql ]; From db726c35225dbcfda496e9ea314e26052a7f075e Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 16:20:44 -0300 Subject: [PATCH 41/48] cassowary: enable tests --- pkgs/tools/networking/cassowary/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 6280b923ec0..4e84b858538 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M="; - doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { From 687834f44d67a50945872b77772cd8adc0f66972 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Sat, 26 Mar 2022 15:00:36 +0100 Subject: [PATCH 42/48] openconnect: 8.10 -> 8.20, unstable-2021-05-05 -> 2022-03-14, cleanup --- pkgs/tools/networking/openconnect/common.nix | 43 +++++++++++ pkgs/tools/networking/openconnect/default.nix | 75 ++++++------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 18 +---- 4 files changed, 71 insertions(+), 67 deletions(-) create mode 100644 pkgs/tools/networking/openconnect/common.nix diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix new file mode 100644 index 00000000000..63a0ecc93eb --- /dev/null +++ b/pkgs/tools/networking/openconnect/common.nix @@ -0,0 +1,43 @@ +{ version +, src +}: + +{ lib +, stdenv +, pkg-config +, gnutls +, openssl +, useOpenSSL ? false +, gmp +, libxml2 +, stoken +, zlib +, vpnc-scripts +, PCSC +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "openconnect"; + inherit version src; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--with-vpnc-script=${vpnc-scripts}/bin/vpnc-script" + "--disable-nls" + "--without-openssl-version-check" + ]; + + buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] + ++ lib.optional stdenv.isDarwin PCSC; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + meta = with lib; { + description = "VPN Client for Cisco's AnyConnect SSL VPN"; + homepage = "https://www.infradead.org/openconnect/"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ pradeepchhetri tricktron alyaeanyx ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 5dea456d00b..b561d8cf43d 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,58 +1,31 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, openssl ? null -, gnutls ? null -, p11-kit -, gmp -, libxml2 -, stoken -, zlib -, vpnc-scripts -, PCSC -, head ? false - , fetchFromGitLab - , autoreconfHook -}: +{ callPackage, fetchFromGitLab, fetchurl, darwin }: +let + common = opts: callPackage (import ./common.nix opts) { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; +in rec { + openconnect = common rec { + version = "8.20"; + src = fetchurl { + url = "ftp://ftp.infradead.org/pub/openconnect/openconnect-${version}.tar.gz"; + sha256 = "sha256-wUUjhMb3lrruRdTpGa4b/CgdbIiGLh9kaizFE/xE5Ys="; + }; + }; -assert (openssl != null) == (gnutls == null); - -stdenv.mkDerivation rec { - pname = "openconnect${lib.optionalString head "-head"}"; - version = if head then "2021-05-05" else "8.10"; - - src = - if head then fetchFromGitLab { + openconnect_unstable = common { + version = "unstable-2022-03-14"; + src = fetchFromGitLab { owner = "openconnect"; repo = "openconnect"; - rev = "684f6db1aef78e61e01f511c728bf658c30b9114"; - sha256 = "0waclawcymgd8sq9xbkn2q8mnqp4pd0gpyv5wrnb7i0nsv860wz8"; - } - else fetchurl { - url = "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"; - sha256 = "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih"; + rev = "a27a46f1362978db9723c8730f2533516b4b31b1"; + sha256 = "sha256-Kz98GHCyEcx7vUF+AXMLR7886+iKGKNwx1iRaYcH8ps="; }; + }; - outputs = [ "out" "dev" ]; - - configureFlags = [ - "--with-vpnc-script=${vpnc-scripts}/bin/vpnc-script" - "--disable-nls" - "--without-openssl-version-check" - ]; - - buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] - ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux p11-kit; - nativeBuildInputs = [ pkg-config ] - ++ lib.optional head autoreconfHook; - - meta = with lib; { - description = "VPN Client for Cisco's AnyConnect SSL VPN"; - homepage = "https://www.infradead.org/openconnect/"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ pradeepchhetri tricktron ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + openconnect_openssl = openconnect.override { + useOpenSSL = true; }; } + + + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb2239dc09e..f3a3ed3404d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -833,6 +833,8 @@ mapAliases ({ openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 + openconnect_head = openconnect_unstable; # Added 2022-03-29 + openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68b86f870d2..2fe83fce1b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10993,23 +10993,9 @@ with pkgs; witness = callPackage ../tools/security/witness { }; - openconnect = openconnect_gnutls; + openconnectPackages = callPackage ../tools/networking/openconnect { }; - openconnect_openssl = callPackage ../tools/networking/openconnect { - inherit (darwin.apple_sdk.frameworks) PCSC; - gnutls = null; - }; - - openconnect_gnutls = callPackage ../tools/networking/openconnect { - inherit (darwin.apple_sdk.frameworks) PCSC; - openssl = null; - }; - - openconnect_head = callPackage ../tools/networking/openconnect { - inherit (darwin.apple_sdk.frameworks) PCSC; - head = true; - openssl = null; - }; + inherit (openconnectPackages) openconnect openconnect_unstable openconnect_openssl; globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; From d77b153fe921e94e4adddc684b60a6dd7a8d1838 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Apr 2022 11:55:29 +0200 Subject: [PATCH 43/48] python3Packages.wasabi: disable on older Python releases - add pythonImportsCheck --- pkgs/development/python-modules/wasabi/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 880f144db6e..16c89ae63a0 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -2,23 +2,34 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "wasabi"; version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "wasabi" + ]; meta = with lib; { description = "A lightweight console printing and formatting toolkit"; homepage = "https://github.com/ines/wasabi"; changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From c099ec6affa6b5e1456e37dba8735b37f60da5c6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 30 Mar 2022 18:53:36 +0000 Subject: [PATCH 44/48] nixos/klogd: remove This module only has an effect for ancient kernel versions we don't support. --- .../from_md/release-notes/rl-2205.section.xml | 6 +++ .../manual/release-notes/rl-2205.section.md | 3 ++ nixos/modules/services/logging/klogd.nix | 41 +++---------------- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 4453c907f67..cee9095d3a9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -432,6 +432,12 @@ new versions will release. + + + security.klogd was removed. Logging of + kernel messages is handled by systemd since Linux 3.5. + + services.kubernetes.addons.dashboard was diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index abc16b8d66e..8796afebc8b 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -141,6 +141,9 @@ In addition to numerous new and upgraded packages, this release has the followin org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and `pkgs.emacsPackages.nongnuPackages` where the new versions will release. +- `security.klogd` was removed. Logging of kernel messages is handled + by systemd since Linux 3.5. + - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. diff --git a/nixos/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix index 8d371c161eb..1de0e58abbb 100644 --- a/nixos/modules/services/logging/klogd.nix +++ b/nixos/modules/services/logging/klogd.nix @@ -1,38 +1,9 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, ... }: { - ###### interface - - options = { - - services.klogd.enable = mkOption { - type = types.bool; - default = versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5"; - defaultText = literalExpression ''versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5"''; - description = '' - Whether to enable klogd, the kernel log message processing - daemon. Since systemd handles logging of kernel messages on - Linux 3.5 and later, this is only useful if you're running an - older kernel. - ''; - }; - - }; - - - ###### implementation - - config = mkIf config.services.klogd.enable { - systemd.services.klogd = { - description = "Kernel Log Daemon"; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.sysklogd ]; - unitConfig.ConditionVirtualization = "!systemd-nspawn"; - script = - "klogd -c 1 -2 -n " + - "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map"; - }; - }; + imports = [ + (lib.mkRemovedOptionModule [ "security" "klogd" "enable" ] '' + Logging of kernel messages is now handled by systemd. + '') + ]; } From ae8e8aaee7f17df2b3ca552ec4dc2a339248858c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 30 Mar 2022 18:57:15 +0000 Subject: [PATCH 45/48] treewide: remove obsolete kernel version checks We no longer support any Linux kernel older than 4.9. --- .../hardware/video/webcam/facetimehd.nix | 5 ---- pkgs/os-specific/linux/anbox/kmod.nix | 2 +- pkgs/os-specific/linux/digimend/default.nix | 2 -- pkgs/os-specific/linux/ena/default.nix | 2 +- pkgs/os-specific/linux/facetimehd/default.nix | 28 ++++--------------- pkgs/os-specific/linux/kernel/gpio-utils.nix | 2 -- pkgs/os-specific/linux/kernel/perf.nix | 2 -- pkgs/os-specific/linux/ply/default.nix | 1 - pkgs/os-specific/linux/sch_cake/default.nix | 2 -- pkgs/os-specific/linux/wireguard/default.nix | 2 -- pkgs/os-specific/linux/zfs/default.nix | 4 +-- pkgs/servers/openafs/1.8/module.nix | 2 +- pkgs/servers/openafs/1.9/module.nix | 2 +- pkgs/top-level/linux-kernels.nix | 2 +- 14 files changed, 12 insertions(+), 46 deletions(-) diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index d311f600c31..b13f103350e 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -16,11 +16,6 @@ in config = mkIf cfg.enable { - assertions = singleton { - assertion = versionAtLeast kernelPackages.kernel.version "3.19"; - message = "facetimehd is not supported for kernels older than 3.19"; - }; - boot.kernelModules = [ "facetimehd" ]; boot.blacklistedKernelModules = [ "bdc_pci" ]; diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 9ce65cd8726..553712d21a7 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5"; + broken = kernel.kernelAtLeast "5.5"; maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index e26509d3a7c..b0ae7cc8508 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: -assert lib.versionAtLeast kernel.version "3.5"; - stdenv.mkDerivation rec { pname = "digimend"; version = "unstable-2019-06-18"; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 5873a2fe2c1..9f2f8682078 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; - broken = kernel.kernelOlder "4.5" || kernel.kernelAtLeast "5.15"; + broken = kernel.kernelAtLeast "5.15"; }; } diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 163001638cd..27bbfcc6767 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, kernel }: -# facetimehd is not supported for kernels older than 3.19"; -assert lib.versionAtLeast kernel.version "3.19"; +stdenv.mkDerivation rec { + name = "facetimehd-${version}-${kernel.version}"; + version = "unstable-2020-04-16"; -let # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ # 2. Test the module and firmware change via: @@ -14,29 +14,11 @@ let # e. see if the module loads back (apps using the camera won't # recover and will have to be restarted) and the camera # still works. - srcParams = if (lib.versionAtLeast kernel.version "4.8") then - { # Use mainline branch - version = "unstable-2020-04-16"; - rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; - sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx"; - } - else - { # Use master branch (broken on 4.8) - version = "unstable-2016-05-02"; - rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c"; - sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp"; - } - ; -in - -stdenv.mkDerivation rec { - name = "facetimehd-${version}-${kernel.version}"; - version = srcParams.version; - src = fetchFromGitHub { owner = "patjak"; repo = "bcwc_pcie"; - inherit (srcParams) rev sha256; + rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; + sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix index 9c7386f61c1..40e282bbf54 100644 --- a/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -2,8 +2,6 @@ with lib; -assert versionAtLeast linux.version "4.6"; - stdenv.mkDerivation { pname = "gpio-utils"; version = linux.version; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 6d1763a0d0f..0183e9ffa3f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -9,8 +9,6 @@ with lib; -assert versionAtLeast kernel.version "3.12"; - stdenv.mkDerivation { pname = "perf-linux"; version = kernel.version; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 916aa39eee2..dbd8925a5cb 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2Only ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; - broken = lib.versionOlder kernel.version "4.0"; }; } diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index facf690a9bd..a959fac5dca 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, kernel }: -assert lib.versionAtLeast kernel.version "4.4"; - stdenv.mkDerivation { pname = "sch_cake"; version = "unstable-2017-07-16"; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index f10a4471072..a47fb30c1b3 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: -# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements -assert lib.versionAtLeast kernel.version "3.10"; # wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html assert lib.versionOlder kernel.version "5.6"; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6747d511694..5a5fd2d19a8 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -216,7 +216,7 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; + kernelCompatible = kernel.kernelOlder "5.18"; latestCompatibleLinuxPackages = linuxPackages_5_17; # this package should point to the latest release. @@ -227,7 +227,7 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; + kernelCompatible = kernel.kernelOlder "5.18"; latestCompatibleLinuxPackages = linuxPackages_5_17; # this package should point to a version / git revision compatible with the latest kernel release diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 53834e5ccc1..81ff0d6b7ad 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = kernel.kernelOlder "3.18" || kernel.kernelAtLeast "5.17" || kernel.isHardened; + broken = kernel.kernelAtLeast "5.17" || kernel.isHardened; }; } diff --git a/pkgs/servers/openafs/1.9/module.nix b/pkgs/servers/openafs/1.9/module.nix index 9799454223b..ec1b8e1d67e 100644 --- a/pkgs/servers/openafs/1.9/module.nix +++ b/pkgs/servers/openafs/1.9/module.nix @@ -59,6 +59,6 @@ in stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; - broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened; + broken = kernel.kernelAtLeast "5.15" || kernel.isHardened; }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ca80ea02ffc..e3f5695fac5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -404,7 +404,7 @@ in { oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; From 24b77b240d65e9150983a7853fde194f4e02ca5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Apr 2022 12:13:26 +0200 Subject: [PATCH 46/48] python3Packages.pyplaato: disable on older Python releases --- .../python-modules/pyplaato/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyplaato/default.nix b/pkgs/development/python-modules/pyplaato/default.nix index 363c9da0eb9..1870647a341 100644 --- a/pkgs/development/python-modules/pyplaato/default.nix +++ b/pkgs/development/python-modules/pyplaato/default.nix @@ -3,22 +3,32 @@ , fetchPypi , aiohttp , python-dateutil +, pythonOlder }: buildPythonPackage rec { pname = "pyplaato"; version = "0.0.17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fd7gHDah5yoqpH5d3bwEDsIfeflXzXevJLMD7lvz180="; + hash = "sha256-fd7gHDah5yoqpH5d3bwEDsIfeflXzXevJLMD7lvz180="; }; - propagatedBuildInputs = [ aiohttp python-dateutil ]; + propagatedBuildInputs = [ + aiohttp + python-dateutil + ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "pyplaato" ]; + + pythonImportsCheck = [ + "pyplaato" + ]; meta = with lib; { description = "Python API client for fetching Plaato data"; From 527c39464e9becbcd303c688d4dd0b5fbcc5d094 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Apr 2022 12:21:32 +0200 Subject: [PATCH 47/48] python3Packages.slicerator: disable on older Python releases --- .../python-modules/slicerator/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 2fc0cb41d1f..a1240f47c4e 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -2,20 +2,21 @@ , buildPythonPackage , fetchPypi , python -, six +, pythonOlder }: buildPythonPackage rec { - version = "1.1.0"; pname = "slicerator"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY="; + hash = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY="; }; - propagatedBuildInputs = [ six ]; - checkPhase = '' ${python.interpreter} run_tests.py ''; @@ -24,9 +25,9 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/soft-matter/slicerator"; description = "A lazy-loading, fancy-sliceable iterable"; + homepage = "https://github.com/soft-matter/slicerator"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 22660f2e236ba50bfb3917bceef76c96d1b7a388 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 8 Apr 2022 12:10:44 +0200 Subject: [PATCH 48/48] libvirt: patch more binary paths in systemd units /bin/kill is referred in many more unit files than just libvirtd.service. --- pkgs/development/libraries/libvirt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index cda7c091908..42ccf8fddcf 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -323,7 +323,9 @@ stdenv.mkDerivation rec { gettext() { "${gettext}/bin/gettext" "$@"; } ' '' + optionalString isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + for f in $out/lib/systemd/system/*.service ; do + substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill + done rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ --prefix PATH : /run/libvirt/nix-emulators:${binPath}