From 2eabe75fff03f160e6ed9d240dca5ce36978efcd Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sun, 26 Mar 2023 16:06:08 +0200 Subject: [PATCH 01/12] fuc: init at 1.1.6 --- pkgs/tools/misc/fuc/add_missing_feature.patch | 11 ++++++ pkgs/tools/misc/fuc/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/tools/misc/fuc/add_missing_feature.patch create mode 100644 pkgs/tools/misc/fuc/default.nix diff --git a/pkgs/tools/misc/fuc/add_missing_feature.patch b/pkgs/tools/misc/fuc/add_missing_feature.patch new file mode 100644 index 000000000000..c765dde01428 --- /dev/null +++ b/pkgs/tools/misc/fuc/add_missing_feature.patch @@ -0,0 +1,11 @@ +diff --git a/cpz/src/main.rs b/cpz/src/main.rs +index 4e7ce8d..0d0922d 100644 +--- a/cpz/src/main.rs ++++ b/cpz/src/main.rs +@@ -1,5 +1,6 @@ + #![feature(once_cell)] + #![feature(let_chains)] ++#![feature(main_separator_str)] + + use std::{ + borrow::Cow, diff --git a/pkgs/tools/misc/fuc/default.nix b/pkgs/tools/misc/fuc/default.nix new file mode 100644 index 000000000000..00d95add4f39 --- /dev/null +++ b/pkgs/tools/misc/fuc/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, clippy +, rustfmt +}: + +rustPlatform.buildRustPackage rec { + pname = "fuc"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "SUPERCILEX"; + repo = "fuc"; + rev = version; + hash = "sha256-kbEIZljIWs/GYOQ/XCBgWsBcEwm05bf7bZmAwq+eWXo="; + }; + + patches = [ ./add_missing_feature.patch ]; + + cargoHash = "sha256-AD3LdBMmyf6xM7sWUDxYZs3NltnAkEfAdxYLAbnRM4M="; + + RUSTC_BOOTSTRAP = 1; + + cargoBuildFlags = [ "--workspace" "--bin cpz" "--bin rmz" ]; + + nativeCheckInputs = [ clippy rustfmt ]; + + meta = with lib; { + description = "Modern, performance focused unix commands"; + homepage = "https://github.com/SUPERCILEX/fuc"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4057e0ca1dd7..5e86b012ebc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2189,6 +2189,8 @@ with pkgs; fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; + fuc = callPackage ../tools/misc/fuc { }; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator { }; fw = callPackage ../tools/misc/fw { From 513118150221c92b4edbbfdc411ca42d88ecbc85 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 9 Jun 2023 20:51:18 +0300 Subject: [PATCH 02/12] digimend: 10 -> unstable-2023-05-03 --- pkgs/os-specific/linux/digimend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 8a4a852a4732..11756dcbe85c 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "digimend"; - version = "10"; + version = "unstable-2023-05-03"; src = fetchFromGitHub { owner = "digimend"; repo = "digimend-kernel-drivers"; - rev = "v${version}"; - sha256 = "0lifd6cx6aa6hcms4zn4hlla3alra08r0svj5x1l8nlsv0ydnl6i"; + rev = "eca6e1b701bffb80a293234a485ebf6b4bc85562"; + hash = "sha256-0mjIUgHvbNcVQVzU3xzaloe5R41a4eknDhdhruJH+6c="; }; postPatch = '' From 060b83c001e7f0f5362bfdddb93eb32d8b8b4022 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Jun 2023 11:52:23 +0200 Subject: [PATCH 03/12] cpuid: 20230505 -> 20230614 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 381576492af4..396baa4b98c1 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20230505"; + version = "20230614"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-VdMEAM1rq5rPNZft/JpSeiWOOntcQMzJuLMrENPimzA="; + sha256 = "sha256-scgwRe/CYHYwd1HgZi1YAnf1+b+JzwJyMaeBIAPDpOg="; }; # For pod2man during the build process. From 4370f458816b033ead1404214a4ae71ee47881d2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 16 Jun 2023 00:00:05 +0100 Subject: [PATCH 04/12] fheroes2: 1.0.4 -> 1.0.5 Changes: https://github.com/ihhub/fheroes2/releases/tag/1.0.5 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index f61983a2c737..77f9340b1b02 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-+XlOx5gIQzYru2CwWKqTSdIlxuNfiUjDEsnvP6kDUYg="; + sha256 = "sha256-h9kWeq7NgJUChqH49nJNuG/6fzAOteZlKUs6Vtbv7Ww="; }; nativeBuildInputs = [ imagemagick ]; From 38d5461112ef87e8fa3749ee8ba4f0fb3cd1a563 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 16 Jun 2023 04:20:00 +0000 Subject: [PATCH 05/12] esbuild: 0.18.3 -> 0.18.4 Diff: https://github.com/evanw/esbuild/compare/v0.18.3...v0.18.4 Changelog: https://github.com/evanw/esbuild/blob/v0.18.4/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index bef7327f5d66..b475c1ab4deb 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-rWziaR3c4rRcXp2CLNWWC4Kc2woCXP/nrMOCsp/nc9Y="; + hash = "sha256-sipZMwcYMyaI6STI7dZ5RXCtsvFCm2wSB+nspTZLpbk="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 771263581492d3dc99d8068f23f926263c68f6be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jun 2023 01:51:47 +0000 Subject: [PATCH 06/12] pmenu: 3.0.1 -> 3.1.0 --- pkgs/tools/X11/pmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix index 7de509a299c5..cb49de6d4c4b 100644 --- a/pkgs/tools/X11/pmenu/default.nix +++ b/pkgs/tools/X11/pmenu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pmenu"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "phillbush"; repo = "pmenu"; rev = "v${version}"; - sha256 = "sha256-xeOiJEOPz5QEMlWP6bWhTjmj4tfNqh3rsEVmnKvrKuM="; + sha256 = "sha256-bX1qiNUTxNFeS0hNc5dUqQLEgv22nHqJ0yW55CQlGw4="; }; buildInputs = [ From 947c53b0147bc6a40947b53efacdb6ecf96b1e03 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 16 Jun 2023 22:16:57 -0400 Subject: [PATCH 07/12] cargo-expand: 1.0.52 -> 1.0.53 Diff: https://github.com/dtolnay/cargo-expand/compare/1.0.52...1.0.53 Changelog: https://github.com/dtolnay/cargo-expand/releases/tag/1.0.53 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index be26317bb1fe..f40390b92135 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.52"; + version = "1.0.53"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-xPVS1pynqUiCmM5n+GGgzemOulfM280Zx6GRbvRm0lM="; + sha256 = "sha256-+2ZZKX7w9P+2D6g1BYXC5tl4soYYKuDdAqIlJuD+OFE="; }; - cargoHash = "sha256-9T5Ro9tX9az23leVaKTz3aMQHN33cxdVTRgvVjLEbeU="; + cargoHash = "sha256-Rn7M95BHR1IaNE58EfuXWdyxhoMskIN7HmKVKhToS8s="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; From 6da3dc95e246c969fc4a0e4f903237c2a201b2a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jun 2023 02:41:08 +0000 Subject: [PATCH 08/12] ocm: 0.1.66 -> 0.1.67 --- pkgs/applications/networking/cluster/ocm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index e7f01e9916e1..cd9b90f565ef 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.66"; + version = "0.1.67"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-iOgDWqP9sFd5/0e5/+WP6R3PpJa8AiUE4EjI39HwWX8="; + sha256 = "sha256-MNagqeT6Uw9fLl6gJ+2FYTRZ2rO2qTYi8SBDoOR9EUM="; }; - vendorHash = "sha256-yY/X0LVIH1ULegx8MIZyUxD1wPNxxISSCBxj9aY2wtA="; + vendorHash = "sha256-4d8IGe/gTt4HAqyg05pYtAFfHp6NCmUBtfxRA64rEmM="; # Strip the final binary. ldflags = [ "-s" "-w" ]; From 9eee85085bacf2feaa51820563b8382e6d6b3639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Jun 2023 08:12:19 +0200 Subject: [PATCH 09/12] python311Packages.furl: fixup tests with python 3.11.4 --- pkgs/development/python-modules/furl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 0f561573d581..3c9592c37d0d 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -16,6 +16,13 @@ buildPythonPackage rec { sha256 = "5a6188fe2666c484a12159c18be97a1977a71d632ef5bb867ef15f54af39cc4e"; }; + # With python 3.11.4, invalid IPv6 address does throw ValueError + # https://github.com/gruns/furl/issues/164#issuecomment-1595637359 + postPatch = '' + substituteInPlace tests/test_furl.py \ + --replace '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]' + ''; + propagatedBuildInputs = [ orderedmultidict six From c6c4464fbf64c8c1eaf5c4694e28ae42e00452c7 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 17 Jun 2023 17:41:00 +1000 Subject: [PATCH 10/12] python3Packages.k5test: unmark as broken on aarch64-linux --- pkgs/development/python-modules/k5test/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 7b5889692bef..a4620c14882d 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "k5test" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; From 18f2be2e566348a3fdbdaefd236f28cd378aff38 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 28 May 2023 16:00:33 +0000 Subject: [PATCH 11/12] nixos/public-inbox: require that URL be non-empty public-inbox-init doesn't work if passed an empty URL. --- nixos/modules/services/mail/public-inbox.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index 099997fa9fe9..a7d7097065a2 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -177,8 +177,7 @@ in description = lib.mdDoc "The email addresses of the public-inbox."; }; options.url = mkOption { - type = with types; nullOr str; - default = null; + type = types.nonEmptyStr; example = "https://example.org/lists/example-discuss"; description = lib.mdDoc "URL where this inbox can be accessed over HTTP."; }; From 486cc09058cb58e9255f8583fa33b1a300acb564 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 7 Jun 2023 10:23:46 -0700 Subject: [PATCH 12/12] recoll: simplify --with{out}-inotify expression This cleanup commit uses `lib.withFeature` to simplify the expression for recoll's `--with{out}-inotify` flags. --- pkgs/applications/search/recoll/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 55d636b8651c..933b07a5d8b9 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -89,11 +89,9 @@ mkDerivation rec { ] ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" - ] ++ (if stdenv.isLinux then [ - "--with-inotify" - ] else [ - "--without-inotify" - ]); + ] ++ [ + (lib.withFeature stdenv.isLinux "inotify") + ]; env.NIX_CFLAGS_COMPILE = toString [ "-DNIXPKGS" ];