From 4a63197f0e15683898b06dac9f1d9476e2bd49b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 31 Mar 2024 14:21:28 -0700 Subject: [PATCH 01/30] python312Packages.recurring-ical-events: 2.1.3 -> 2.2.0 Diff: https://github.com/niccokunzmann/python-recurring-ical-events/compare/v2.1.3...v2.2.0 Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/v2.2.0/README.rst#changelog --- .../python-modules/recurring-ical-events/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index b4f5df6e42da..fd5cdb62dd7c 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.3"; + version = "2.2.0"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-K2pflwHpzuYDMNUB7YQu6NX21O0aOwRChBgjdiwFQ+Y="; + hash = "sha256-Njd+sc35jlA96iVf2uuVN2BK92ctwUDfBAUfpgqtPs0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar pytz python-dateutil From 8d6af7263701ec1507f06a389e89e9a65e88c25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 31 Mar 2024 14:25:27 -0700 Subject: [PATCH 02/30] calendar-cli: add meta.mainProgram --- nixos/tests/radicale.nix | 2 +- pkgs/tools/networking/calendar-cli/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 66650dce4a00..868b28085a67 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -6,7 +6,7 @@ let port = "5232"; filesystem_folder = "/data/radicale"; - cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}"; + cli = "${lib.getExe pkgs.calendar-cli} --caldav-user ${user} --caldav-pass ${password}"; in { name = "radicale3"; meta.maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/tools/networking/calendar-cli/default.nix index 45b3afbf895e..1aae34bf8989 100644 --- a/pkgs/tools/networking/calendar-cli/default.nix +++ b/pkgs/tools/networking/calendar-cli/default.nix @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { description = "Simple command-line CalDav client"; homepage = "https://github.com/tobixen/calendar-cli"; license = licenses.gpl3Plus; + mainProgram = "calendar-cli"; maintainers = with maintainers; [ dotlambda ]; }; } From 451eb7835dbd42461098070c97d020692c36060f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 31 Mar 2024 14:27:15 -0700 Subject: [PATCH 03/30] calendar-cli: use pyproject = true --- pkgs/tools/networking/calendar-cli/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/tools/networking/calendar-cli/default.nix index 1aae34bf8989..7cac9f4ae0f3 100644 --- a/pkgs/tools/networking/calendar-cli/default.nix +++ b/pkgs/tools/networking/calendar-cli/default.nix @@ -7,6 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "calendar-cli"; version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "tobixen"; @@ -15,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ icalendar caldav pytz From dde2c7e60605a90252bc728d20b4b98d7534d996 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Apr 2024 07:02:49 +0000 Subject: [PATCH 04/30] borgmatic: 1.8.9 -> 1.8.10 --- pkgs/tools/backup/borgmatic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 0268fae6a185..1845ea99def9 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -13,11 +13,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.9"; + version = "1.8.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YfDV2BJzi2DVi/eoWg3KeqmJjUv5+TrLpYdF8R7YuPY="; + sha256 = "sha256-hR2q49gCD9BZsk+jQ90EfKkkq7mX9qAO+gRsvdnuDec="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; From 0ef5f787de90257f5f86f9dc14f318e0ec42a4c4 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 18 Apr 2024 11:44:01 +0200 Subject: [PATCH 05/30] cri-tools: 1.29.0 -> 1.30.0 Signed-off-by: Sascha Grunert --- pkgs/tools/virtualization/cri-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 70991742e789..f59e0d2730eb 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-64vjN0tm6P+nXjrNPeTviXOQdibuH7YbQm/LjYLxatM="; + hash = "sha256-MuyXcdV29sLn9Vt0WE31nXtY9ofjEC0b5zSrmGXR0mw="; }; vendorHash = null; From d6479240ca003cb767d51e32c595d18e0781be85 Mon Sep 17 00:00:00 2001 From: tyxieblub <5111464+tyxieblub@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:41:15 +0200 Subject: [PATCH 06/30] shelldap: fix on darwin using shortenPerlShebang --- pkgs/tools/misc/shelldap/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 045c5732c3e0..09901368c870 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , fetchFromGitHub , perlPackages +, shortenPerlShebang }: perlPackages.buildPerlPackage rec { @@ -26,6 +28,8 @@ perlPackages.buildPerlPackage rec { YAMLSyck ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + prePatch = '' touch Makefile.PL ''; @@ -33,7 +37,11 @@ perlPackages.buildPerlPackage rec { installPhase = '' runHook preInstall install -Dm555 -t $out/bin shelldap - runHook preInstall + runHook postInstall + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/shelldap ''; # no make target 'test', not tests provided by source From 26630635476eb6ac8f40764517e0dbff09cf9be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Przemys=C5=82aw=20Kami=C5=84ski?= Date: Sat, 20 Apr 2024 11:36:50 +0200 Subject: [PATCH 07/30] scryer-prolog: Fix darwin build Build was failing because of missing SystemConfiguration dependency --- pkgs/development/compilers/scryer-prolog/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 02383e6b4a51..28744a00a5f1 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -7,6 +7,7 @@ , libmpc , mpfr , stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -23,12 +24,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl gmp libmpc mpfr ]; + + buildInputs = [ openssl gmp libmpc mpfr ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; CARGO_FEATURE_USE_SYSTEM_LIBS = true; meta = with lib; { - broken = stdenv.isDarwin; description = "A modern Prolog implementation written mostly in Rust"; mainProgram = "scryer-prolog"; homepage = "https://github.com/mthom/scryer-prolog"; From 3c5440e2c69621bf4074b8670f815d540e0f747b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 10:46:30 +0000 Subject: [PATCH 08/30] turso-cli: 0.90.7 -> 0.92.0 --- pkgs/development/tools/turso-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 84113832cb34..9e526b8b321b 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.90.7"; + version = "0.92.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-+pd2bRyu1BFhzJ1iGDmBv/DR8oZHC0hGZBgZZIxpaYo="; + hash = "sha256-L118k+NOvO9jBqBzPkrx/U+RjgY318b1Q0u5X7uT7i0="; }; vendorHash = "sha256-2NjdjB09WYzHjQEl2hMUWN1/xsj/Hlr8lVYU/pkxTqQ="; From 70364d30df28f57fffc5d9f71b608e0f408b9f37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 11:38:25 +0000 Subject: [PATCH 09/30] miriway: unstable-2024-04-04 -> unstable-2024-04-16 --- pkgs/applications/window-managers/miriway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index cd43a1be4765..7e59995126fa 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-04-04"; + version = "unstable-2024-04-16"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "add1e0cd695985020328b0d76c91f85cc88207ff"; - hash = "sha256-Vp9ZbN5lY26t3LhkflapsG84XEy0YQE4Kvxia0VlQyg="; + rev = "d7f43ac201e6f1aa7aeee668f5d16683f48917f1"; + hash = "sha256-hUTK7kd7gTvms4HMF7BgYWomRYZyRkqUfjhVtEF+YRE="; }; strictDeps = true; From 63e7c2ea43bf8fc0dee168c035481daaf385abc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 12:28:35 +0000 Subject: [PATCH 10/30] marimo: 0.4.0 -> 0.4.2 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 4031b10f55d0..aeb881754345 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.4.0"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IiM7iJs3CIl6WjstgvtJzIylVL49jRG246GU5G5GEG0="; + hash = "sha256-wFDx90zTaPF9gHLZnWBJQlMBuz8iZQRHkcS8BAxcZRA="; }; build-system = [ From 65f70ce384870e124b8dbaa43ca0499714acbda8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 12:51:34 +0000 Subject: [PATCH 11/30] pscale: 0.191.0 -> 0.195.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 1255470fb714..cb8f2f91ea39 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.191.0"; + version = "0.195.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+QGzLPJQbIql5Xomve/v3vGB5kdCDamxkRM6weIZMMw="; + sha256 = "sha256-Dgp4N4R239NSewHJ7iVhWwfoppXsnhhL8ZrDEbiM9v4="; }; - vendorHash = "sha256-dcMKi12YFTpQShGRm97Zptiw9JK55CAXm0r8UG+c1Dg="; + vendorHash = "sha256-0rzX54AdlFvvYhfZvS3qBxV4bIF2li8HwKdtm0jS04g="; ldflags = [ "-s" "-w" From c30c183baec7c7e0c029e41f8e6e3b90e82ae38a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Apr 2024 04:20:00 +0000 Subject: [PATCH 12/30] postgresqlPackages.lantern: set pname to postgresql-lantern To avoid Repology to mistake it for another project named Lantern. --- pkgs/servers/sql/postgresql/ext/lantern.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 63e78c8a2221..75c321571e05 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "lantern"; + pname = "postgresql-lantern"; version = "0.2.4"; src = fetchFromGitHub { From 085a5202c59ec646f64733c5b3a353613f3a092e Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:56:57 +0800 Subject: [PATCH 13/30] clipcat: 0.16.6 -> 0.17.0 --- pkgs/by-name/cl/clipcat/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index fdf91c96f8d9..68e6744bd175 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -1,25 +1,34 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , protobuf , installShellFiles +, darwin }: rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.16.6"; + version = "0.17.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-FSgBTQGl8LSLdv+SOAgQWLWiqFY+PRQBFYYdbmCttcY="; + hash = "sha256-e95h8YBVLcy9vubdJpfmeystT2Qw0Y8kap9IbTJW+s8="; }; - cargoHash = "sha256-TrzHmWUDAe4gbwm+VoTOuC50CWWnFsF99zscM85ammo="; + cargoHash = "sha256-+73vnGcdCDRMrav/Pi4Z37IlbArJ/SlYishz9KhF4x0="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; nativeBuildInputs = [ protobuf + installShellFiles ]; @@ -42,7 +51,7 @@ rustPlatform.buildRustPackage rec { description = "Clipboard Manager written in Rust Programming Language"; homepage = "https://github.com/xrelkd/clipcat"; license = licenses.gpl3Only; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ xrelkd ]; mainProgram = "clipcatd"; }; From 8a3f9b1aa8d5e3463b579954c8baa5ab3ddf3f17 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 21 Apr 2024 11:47:06 +0100 Subject: [PATCH 14/30] ytdownloader: 3.17.3 -> 3.17.4 --- pkgs/by-name/yt/ytdownloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index 9a607c16e4aa..b471ec819329 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -10,13 +10,13 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.17.3"; + version = "3.17.4"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-aqQGOqPLKKTBjWjL3KyRD4paBGCQLhCBjXwVVhoHDSk="; + hash = "sha256-GW+17DfPiFxw2QyJ5KTMZLDWmqXfnHfkg+QpM5XOP0M="; }; npmDepsHash = "sha256-lhFyiWy9dgnxxaElavzqA4YpRm7cVC23pvL5Kwve58E="; From cb772bbd806d360aeea138997b323daee8923805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 14:08:18 +0000 Subject: [PATCH 15/30] shopware-cli: 0.4.35 -> 0.4.36 --- pkgs/by-name/sh/shopware-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index e49ce5136af1..e37237ea289b 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.35"; + version = "0.4.36"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-RJKne2Nq8mrVBgiOkXoM1HKIJ/BU0MQckbequ/0THGk="; + hash = "sha256-14Za64G/UpFa6Dfyx7EAQqXMmCWyl5MIQEdutqMQrxE="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-jQCTdvJVe99sL8C9AkJZDsQV9tUoAXY18ar3+FNXEdM="; + vendorHash = "sha256-Zl84hA2YPG4p3t0V8ZPnLYGz4ggoTSln/koC40nbNZ4="; postInstall = '' export HOME="$(mktemp -d)" From 63b8343b8dc5cc021149a1b6bfe70607058bf232 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 16:34:45 +0000 Subject: [PATCH 16/30] dolt: 1.35.8 -> 1.35.10 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index e0c08ef2d987..b749d71d1223 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.35.8"; + version = "1.35.10"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-JpRJbAxu6Bz47vJ/DB3QpUZk2LcGHe/vUVpzbnsG+FI="; + sha256 = "sha256-VTScVd9GHbwHGZDGquld05zP6CrvqfdfhRO9GHH2zHA="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-Hk9ILvK9b/3Eh7D6NQT7W6ZCW0J3unuALqy/po46cm8="; + vendorHash = "sha256-4lmwDD9LKTATA8vJiWaWaWueIoSFrfW+C0O5uCh3TJw="; proxyVendor = true; doCheck = false; From 0d3b34f45acefcaef9ab7596ee1ed32c6b4d1e61 Mon Sep 17 00:00:00 2001 From: Kamila Borowska Date: Sun, 21 Apr 2024 22:22:17 +0200 Subject: [PATCH 17/30] maintainers: remove KamilaBorowska --- maintainers/maintainer-list.nix | 6 ------ nixos/tests/caddy.nix | 2 +- pkgs/applications/emulators/dolphin-emu/default.nix | 1 - pkgs/applications/emulators/melonDS/default.nix | 1 - pkgs/applications/emulators/snes9x/default.nix | 2 +- pkgs/applications/misc/skytemple/default.nix | 2 +- pkgs/by-name/un/universal-android-debloater/package.nix | 2 +- pkgs/development/python-modules/dungeon-eos/default.nix | 2 +- pkgs/development/python-modules/explorerscript/default.nix | 2 +- pkgs/development/python-modules/ndspy/default.nix | 2 +- pkgs/development/python-modules/pmdsky-debug-py/default.nix | 2 +- pkgs/development/python-modules/py-desmume/default.nix | 2 +- pkgs/development/python-modules/pygtkspellcheck/default.nix | 2 +- pkgs/development/python-modules/pypresence/default.nix | 2 +- pkgs/development/python-modules/setuptools-dso/default.nix | 2 +- pkgs/development/python-modules/skytemple-dtef/default.nix | 2 +- .../python-modules/skytemple-eventserver/default.nix | 2 +- pkgs/development/python-modules/skytemple-files/default.nix | 2 +- pkgs/development/python-modules/skytemple-icons/default.nix | 2 +- pkgs/development/python-modules/skytemple-rust/default.nix | 2 +- .../python-modules/skytemple-ssb-debugger/default.nix | 2 +- .../python-modules/skytemple-ssb-emulator/default.nix | 2 +- pkgs/development/python-modules/tilequant/default.nix | 2 +- pkgs/games/rocksndiamonds/default.nix | 2 +- pkgs/shells/bash/bash-completion/default.nix | 2 +- pkgs/tools/backup/zfsbackup/default.nix | 2 +- pkgs/tools/compression/flips/default.nix | 2 +- pkgs/tools/security/step-cli/default.nix | 2 +- 28 files changed, 25 insertions(+), 33 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 018666e7f010..faa621e90559 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21898,12 +21898,6 @@ githubId = 36407913; name = "Uli Baum"; }; - xfix = { - email = "kamila@borowska.pw"; - github = "KamilaBorowska"; - githubId = 1297598; - name = "Kamila Borowska"; - }; xfnw = { email = "xfnw+nixos@riseup.net"; github = "xfnw"; diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 41d8e57de468..0efe8f94e39d 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; meta = with pkgs.lib.maintainers; { - maintainers = [ xfix Br1ght0ne ]; + maintainers = [ Br1ght0ne ]; }; nodes = { diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index b2a9bbb7bbc4..3f77dcd105f9 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -204,7 +204,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MP2E ashkitten - xfix ivar ]; }; diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 0603373dfedd..bb0499f97277 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { artemist benley shamilton - xfix ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/emulators/snes9x/default.nix b/pkgs/applications/emulators/snes9x/default.nix index 34c2f72c7dd4..8f374b7e1818 100644 --- a/pkgs/applications/emulators/snes9x/default.nix +++ b/pkgs/applications/emulators/snes9x/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable // { url = "https://github.com/snes9xgit/snes9x/blob/${version}/LICENSE"; }; - maintainers = with maintainers; [ qknight xfix thiagokokada ]; + maintainers = with maintainers; [ qknight thiagokokada ]; platforms = platforms.unix; broken = (withGtk && stdenv.isDarwin); mainProgram = "snes9x"; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 98e41bf73e76..116c5096cb59 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -67,6 +67,6 @@ python3Packages.buildPythonApplication rec { description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index 6ce6fb28a8c5..ad5cf9d11e06 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation"; license = licenses.gpl3Only; mainProgram = "uad-ng"; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix index ace614bcaeb4..9f357168b0b5 100644 --- a/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/dungeon-eos"; description = "A package that simulates PMD EoS dungeon generation"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 014fa1057d56..4adc91b25dba 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/explorerscript"; description = "A programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.mit; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index dbdce14ae1f4..c4a7a6bf5578 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Python library for many Nintendo DS file formats"; homepage = "https://github.com/RoadrunnerWMC/ndspy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 8a8b89e60455..17511c8fc23b 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python"; homepage = "https://github.com/SkyTemple/pmdsky-debug-py"; license = licenses.mit; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 6d63a7db9c8f..1009a1fbedb7 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; homepage = "https://github.com/SkyTemple/py-desmume"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index 22b71bdbac83..1f9ac10b9eb4 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/koehlma/pygtkspellcheck"; description = "A Python spell-checking library for GtkTextViews based on Enchant"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 32f81827836b..87b32a590769 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = "https://qwertyquerty.github.io/pypresence/html/index.html"; description = "Discord RPC client written in Python"; license = licenses.mit; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix index c33a89deabf6..306d6b794e60 100644 --- a/pkgs/development/python-modules/setuptools-dso/default.nix +++ b/pkgs/development/python-modules/setuptools-dso/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "setuptools extension for building non-Python Dynamic Shared Objects"; homepage = "https://github.com/mdavidsaver/setuptools_dso"; license = licenses.bsd3; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index 1c1edb663e3c..92b03f7d3549 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A format for standardized rule-based tilesets with 256 adjacency combinations"; homepage = "https://github.com/SkyTemple/skytemple-dtef"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix index dc31cbcbd9ec..94c38cbcf468 100644 --- a/pkgs/development/python-modules/skytemple-eventserver/default.nix +++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-eventserver"; description = "Websocket server that emits SkyTemple UI events"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 1b8d744b7d17..1f91f3a4bea2 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; broken = stdenv.isDarwin; # pyobjc is missing }; } diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix index 34b9dd5cee73..b78bc27e3c25 100644 --- a/pkgs/development/python-modules/skytemple-icons/default.nix +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-icons"; description = "Icons for SkyTemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 411aadb9b400..5a604db033e6 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-rust"; description = "Binary Rust extensions for SkyTemple"; license = licenses.mit; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index c378053c206a..324f34f33524 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple-ssb-debugger"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index d3bbb87d6e09..39c034e3d87a 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "SkyTemple Script Engine Debugger Emulator Backend"; homepage = "https://github.com/SkyTemple/skytemple-ssb-emulator"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index c25c9ff2659c..906f644d89b1 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/tilequant"; changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; mainProgram = "tilequant"; }; } diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 6b1d51ab290b..65f0dd9392f7 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://www.artsoft.org/rocksndiamonds/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ orivej xfix ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 933fe08a61ed..80f5ffeff951 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.xfix ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix index d0f8972434a8..12bc55a54397 100644 --- a/pkgs/tools/backup/zfsbackup/default.nix +++ b/pkgs/tools/backup/zfsbackup/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc"; homepage = "https://github.com/someone1/zfsbackup-go"; license = licenses.mit; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "zfsbackup-go"; }; diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index 6ee1c03cabce..e061459ece26 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "A patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; license = licenses.gpl3Plus; - maintainers = [ maintainers.xfix ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "flips"; }; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 2afbec7f9069..0b7271b5b67a 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { homepage = "https://smallstep.com/cli/"; changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "step"; }; From 0a2f7c4ef91c08da9e8cefcdc4c6b604ae028ae5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 21 Apr 2024 22:45:40 +0100 Subject: [PATCH 18/30] pypy27Packages.pluthon: fix eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails to concatenate lists as: $ nix build --no-link -f. pypy27Packages.pluthon error: … while evaluating the attribute 'drvPath' at lib/customisation.nix:365:7: 364| in commonAttrs // { 365| drvPath = assert condition; drv.drvPath; | ^ 366| outPath = assert condition; drv.outPath; … while evaluating the attribute 'drvPath' at lib/customisation.nix:365:7: 364| in commonAttrs // { 365| drvPath = assert condition; drv.drvPath; | ^ 366| outPath = assert condition; drv.outPath; … while calling the 'derivationStrict' builtin at :9:12: 8| 9| strict = derivationStrict drvAttrs; | ^ 10| (stack trace truncated; use '--show-trace' to show the full trace) error: expected a list but found a set: { type = "derivation"; LANG = «thunk»; __ignoreNulls = true; __structuredAttrs = «thunk»; all = «thunk»; args = «thunk»; buildInputs = «thunk»; builder = «thunk»; cmakeFlags = «thunk»; configureFlags = «thunk»; «45 attributes elided» } --- pkgs/development/python-modules/pluthon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix index 51f73a7381c6..1ff7d0530002 100644 --- a/pkgs/development/python-modules/pluthon/default.nix +++ b/pkgs/development/python-modules/pluthon/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools uplc ordered-set - ] ++ lib.optionals (pythonOlder "3.9") graphlib-backport; + ] ++ lib.optional (pythonOlder "3.9") graphlib-backport; pythonImportsCheck = [ "pluthon" ]; From e5c2ae5fc2d8413971ef3b86bdf40a2b67c3fc25 Mon Sep 17 00:00:00 2001 From: Grigory Kirillov Date: Mon, 22 Apr 2024 01:29:18 +0300 Subject: [PATCH 19/30] gumbo: update project link --- pkgs/development/libraries/gumbo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 68416ef2edc0..118646c619ae 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "grisha"; + owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 HTML parsing algorithm"; - homepage = "https://github.com/google/gumbo-parser"; + homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; maintainers = [ maintainers.nico202 ]; platforms = with platforms; linux ++ darwin; license = licenses.asl20; From 04b2ca300b57eca48d848d183720b9f5b549dfbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 22:51:30 +0000 Subject: [PATCH 20/30] crunchy-cli: 3.4.3 -> 3.5.0 --- pkgs/by-name/cr/crunchy-cli/Cargo.lock | 52 ++++++++++++------------- pkgs/by-name/cr/crunchy-cli/package.nix | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/cr/crunchy-cli/Cargo.lock b/pkgs/by-name/cr/crunchy-cli/Cargo.lock index 682b85db2fbe..3e16a615852a 100644 --- a/pkgs/by-name/cr/crunchy-cli/Cargo.lock +++ b/pkgs/by-name/cr/crunchy-cli/Cargo.lock @@ -217,9 +217,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -354,7 +354,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crunchy-cli" -version = "3.4.3" +version = "3.5.0" dependencies = [ "chrono", "clap", @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "crunchy-cli-core" -version = "3.4.3" +version = "3.5.0" dependencies = [ "anyhow", "async-speed-limit", @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "crunchyroll-rs" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf93641a3697ba4cd6845b3a741089f4b4c692a91ed40dece6d7376c419ef9" +checksum = "ccd0a624f3f8ec3fb7af8d83b907142aaee1858579ab697f24f05d00736e5bb2" dependencies = [ "async-trait", "chrono", @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "crunchyroll-rs-internal" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48daba6fe0296c2b400cd6545cf2e8ee23870f1a5a35291fa2d61987098a5692" +checksum = "85c3614a871ec25ab17425405b08aea3c5869597e2348302b922c2a077aa9c3a" dependencies = [ "darling", "quote", @@ -486,9 +486,9 @@ dependencies = [ [[package]] name = "dash-mpd" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cafa2c33eff2857e1a14c38aa9a432aa565a01e77804a541fce7aec3affb8f8" +checksum = "79b4bdd5f1c0c7493d780c645f0bff5b9361e6408210fa88910adb181efca64c" dependencies = [ "base64 0.22.0", "base64-serde", @@ -831,9 +831,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -1375,9 +1375,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1459,9 +1459,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.0", "bytes", @@ -1576,9 +1576,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -1668,18 +1668,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", @@ -1688,9 +1688,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1838,9 +1838,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/cr/crunchy-cli/package.nix b/pkgs/by-name/cr/crunchy-cli/package.nix index a07cdeb9fa99..1573090d58d6 100644 --- a/pkgs/by-name/cr/crunchy-cli/package.nix +++ b/pkgs/by-name/cr/crunchy-cli/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "crunchy-cli"; - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "crunchy-labs"; repo = "crunchy-cli"; rev = "v${version}"; - hash = "sha256-/7zJbmMPoHEpcsDPe1eVenxGenPCU6CcHE8nTBTHil8="; + hash = "sha256-ykE4TqsBv6VEOgwKixo8IvgJt8CwCSTl5DcKfNGycdI="; }; cargoLock = { From 99df680e03194c035885675a6ccd71a94e18a231 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 21 Apr 2024 20:44:23 -0400 Subject: [PATCH 21/30] llvmPackages_{12,13,14,15,16,17,18,git}: use fixpoint instead of rec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, overriding llvmPackages.libllvm doesn’t work correctly. The original version of libllvm will also be built because it is referenced by libclang. Switching to the fixpoint allows the override to be propagated to clang as expected. This will be needed for future Darwin stdenv bootstrap improvements. --- pkgs/development/compilers/llvm/12/default.nix | 4 ++-- pkgs/development/compilers/llvm/13/default.nix | 4 ++-- pkgs/development/compilers/llvm/14/default.nix | 4 ++-- pkgs/development/compilers/llvm/15/default.nix | 4 ++-- pkgs/development/compilers/llvm/16/default.nix | 4 ++-- pkgs/development/compilers/llvm/17/default.nix | 4 ++-- pkgs/development/compilers/llvm/18/default.nix | 4 ++-- pkgs/development/compilers/llvm/git/default.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 0d9202df8aee..45955dc5e1b3 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -56,7 +56,7 @@ let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -74,7 +74,7 @@ let ./clang/gnu-install-dirs.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit clang-tools-extra_src llvm_meta; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index ecdbd14e98e7..018fb0c63850 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -82,7 +82,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -105,7 +105,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index fb1b8743b6eb..588dc8fffefd 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -78,7 +78,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -96,7 +96,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index ce8426857ebe..bfcbe2b86e24 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -84,7 +84,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -102,7 +102,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 5716267426b2..5dd07d77cf8c 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -85,7 +85,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -103,7 +103,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index 2f60666536f3..9f4be2261b0c 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -80,7 +80,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -98,7 +98,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index 0a30288755e6..4d2b160a23ff 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -80,7 +80,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -98,7 +98,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 56fae64d59d8..1a34130679db 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -85,7 +85,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -103,7 +103,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; From d08c0dbc47c7be7f8db9ebfbfc49b8e66d5b5d86 Mon Sep 17 00:00:00 2001 From: Will Bush Date: Sun, 21 Apr 2024 20:23:06 -0500 Subject: [PATCH 22/30] workflows: force CLI color when running nixpkgs-check-by-name Currently something about the environment in which GH action is running the colored library is not using ANSI colors. I have done some testing in this repo: https://github.com/willbush/throwaway-miette-gh-action-test/actions/runs/8777029939/job/24081383467 And I'm fairly certain env var `CLICOLOR_FORCE: 1` should fix colors. --- .github/workflows/check-by-name.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index bdc223e3d32c..c69d0fb20a9c 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -107,6 +107,10 @@ jobs: # Adds a result symlink as a GC root nix-store --realise "$toolPath" --add-root result - name: Running nixpkgs-check-by-name + env: + # Force terminal colors to be enabled. The library that + # nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/ + CLICOLOR_FORCE: 1 run: | if result/bin/nixpkgs-check-by-name --base "$base" .; then exit 0 From a97d8db6c704be51924ed0fbb7a106f779a75702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Apr 2024 18:35:06 -0700 Subject: [PATCH 23/30] librewolf-unwrapped: 124.0.2-1 -> 125.0.1-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 81beb044083a..593f70afe421 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "124.0.2-1", + "packageVersion": "125.0.1-1", "source": { - "rev": "124.0.2-1", - "sha256": "0qh40l1pif0b6n1amiw18pr13gvmi7rjd89q6n1qz8y14yf9w5xp" + "rev": "125.0.1-1", + "sha256": "1h2x08gdpw3bldmfkws5qafp73r4w11a7ad3xc6flyg96b8a6h4f" }, "settings": { - "rev": "8a499ecdab8a5136faee50aae1fdd48997711de6", - "sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6" + "rev": "6b2b6a89fc15a705388955e4d1375f453d8cdc89", + "sha256": "0yginhc8pn00k1gh8h7bzvrl4vi2wimbmrrgnmvvblv28bxhwnh0" }, "firefox": { - "version": "124.0.2", - "sha512": "8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e" + "version": "125.0.1", + "sha512": "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d" } } From 91354da6662d7f5f2714e8532e27cc43bb1d58bd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 21 Apr 2024 21:36:53 -0400 Subject: [PATCH 24/30] miranda: fix build with clang --- pkgs/development/compilers/miranda/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index f0d95323fe33..8385f5063db9 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -55,7 +55,11 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fcommon" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + ]); makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" From e2173b5f147e2f41154c63cec07136bea72c0bcf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 21 Apr 2024 21:30:43 -0400 Subject: [PATCH 25/30] snow: fix build --- pkgs/tools/security/snow/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/tools/security/snow/default.nix index dbea144cb1ba..5e7cb013a4ed 100644 --- a/pkgs/tools/security/snow/default.nix +++ b/pkgs/tools/security/snow/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0r9q45y55z4i0askkxmxrx0jr1620ypd870vz0hx2a6n9skimdy0"; }; - makeFlags = [ "CFLAGS=-O2" ]; + preBuild = '' + makeFlagsArray+=(CFLAGS="-O2 -std=c89") + ''; installPhase = '' install -Dm755 snow -t $out/bin From 13cd8b8437c43cafadf7c039372be95f16fbd4ec Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 21 Apr 2024 21:44:54 -0400 Subject: [PATCH 26/30] lambda-delta: fix build with clang --- pkgs/applications/emulators/lambda-delta/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix index a17a0eadfd5b..cf2001caff32 100644 --- a/pkgs/applications/emulators/lambda-delta/default.nix +++ b/pkgs/applications/emulators/lambda-delta/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ SDL2 ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c89"; + }; + configureFlags = [ "--without-SDL1" ]; From 2a30fa8ccbfe463f8c792ab91bd194b9772d3ec9 Mon Sep 17 00:00:00 2001 From: Samuel Tschiedel <431708+aisamu@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:57:14 -0300 Subject: [PATCH 27/30] msgpack-tools: include darwin --- pkgs/development/tools/msgpack-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index a7b3c36d87b2..5b3bc7b1472c 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ alibabzo ]; }; } From 3634c00898e3e8a2e6d09bc37b58e51e46e51107 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 03:30:15 +0000 Subject: [PATCH 28/30] cargo-expand: 1.0.84 -> 1.0.85 --- pkgs/by-name/ca/cargo-expand/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 922fe9d93942..1ee53112cff1 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.84"; + version = "1.0.85"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-b98OVx7vkA3sgxp8yPzdV7jAjsTqqTeffibCtK3hoMM="; + hash = "sha256-2i9FAWF9b1tNdDbTwCzQY8Mh/h85uigR5IT9kzPft00="; }; - cargoHash = "sha256-BH01DgwOdP9f0KFIbbF8RRhl/oivBET2ujxdzZ56lC0="; + cargoHash = "sha256-Vl0zC9TPhiFv2SiZtzIUV7GftB1y9K1gLy1ajisP8Y0="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; From fc67f455c73b369035d2ca6e5312854568b29b8c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 15 Apr 2024 14:01:29 +0200 Subject: [PATCH 29/30] =?UTF-8?q?haxe:=204.3.3=20=E2=86=92=204.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/haxe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 99fde9c66a59..d8f2e2e82217 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -126,7 +126,7 @@ in { sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; }; haxe_4_3 = generic { - version = "4.3.3"; - sha256 = "sha256-sMklqQkVbWCYCKpOU23AjkuxzcVV7Aa8ljlFpruam9Y="; + version = "4.3.4"; + sha256 = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; }; } From db06045c71e8f3e7024f6911ca3386f6ebba5871 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 15 Apr 2024 14:02:27 +0200 Subject: [PATCH 30/30] haxe: use OCaml 4.14 --- pkgs/development/compilers/haxe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index d8f2e2e82217..f7a05f8d1455 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -2,8 +2,8 @@ let ocamlDependencies = version: - if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages_4_12; [ + if lib.versionAtLeast version "4.3" + then with ocaml-ng.ocamlPackages_4_14; [ ocaml findlib sedlex