From 067d46bc663dc27a7d7bbdae0b3f65d63bb2260f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 25 Apr 2024 16:15:44 +0200 Subject: [PATCH 01/57] photoprism: 231128-f48ff16ef -> 240420-ef5f14bc4 https://github.com/photoprism/photoprism/releases/tag/240420-ef5f14bc4 --- pkgs/servers/photoprism/backend.nix | 2 +- pkgs/servers/photoprism/default.nix | 4 ++-- pkgs/servers/photoprism/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/servers/photoprism/backend.nix index 7403f4dc897f..c1fc2f5b00c4 100644 --- a/pkgs/servers/photoprism/backend.nix +++ b/pkgs/servers/photoprism/backend.nix @@ -19,7 +19,7 @@ buildGoModule rec { substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-mt2L5vf57/MntjtfJVua799nF4CkRYI8payLoPc0oQA="; + vendorHash = "sha256-ogJ/FwWJt1L0NGKX29tqWmHo4WslzC7ck5r7vn5PEuY="; subPackages = [ "cmd/photoprism" ]; diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index f2f7914394b8..c9b05257de86 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,14 +1,14 @@ { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: let - version = "231128-f48ff16ef"; + version = "240420-ef5f14bc4"; pname = "photoprism"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-gVxKa5JKGz5VSVCuJHat0DWCYaUH+9an6JsYUPe9muQ="; + hash = "sha256-oJRd4eTwoTYKAJAsG9y0mnG+zF+eeLlSXNgaKLcb43w="; }; libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/servers/photoprism/frontend.nix index 782efb1d0d3d..67f2cdd147a8 100644 --- a/pkgs/servers/photoprism/frontend.nix +++ b/pkgs/servers/photoprism/frontend.nix @@ -8,7 +8,7 @@ buildNpmPackage { cd frontend ''; - npmDepsHash = "sha256-4bAWSSy7kvG1ChzEb2iuxgWxnkjtJlr7Lm7USbgsmAw="; + npmDepsHash = "sha256-mgDg6awsEHkZyMzvFLwlfXGjdvjtwkNJiiNcnRBSJVo="; installPhase = '' runHook preInstall From 00fc2d271cfd25b03990c72b20e93c6f96c7f7ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Apr 2024 06:40:46 +0000 Subject: [PATCH 02/57] python311Packages.wktutils: 1.1.6 -> 2.0.0 --- pkgs/development/python-modules/wktutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 549e7f480b08..6b78ba959946 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "wktutils"; - version = "1.1.6"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-WKTUtils"; rev = "refs/tags/v${version}"; - hash = "sha256-PFeIMIFOff9ztdmIP7jcFzKkmhm01G0QnDm20AafUsg="; + hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho="; }; propagatedBuildInputs = [ From 9283efe75770b8b58b9e30d19988f2e822445f69 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:47:26 +0100 Subject: [PATCH 03/57] c0: unstable-2023-09-05 -> 0-unstable-2023-09-05 --- pkgs/development/compilers/c0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index de728cb32c9f..15b83980b9c6 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "c0"; - version = "unstable-2023-09-05"; + version = "0-unstable-2023-09-05"; src = fetchFromBitbucket { owner = "c0-lang"; From 5c85ae0bac4480d800b4e1991b3e5c9b46ecff48 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:48:18 +0100 Subject: [PATCH 04/57] open-watcom-v2-unwrapped: unstable-2023-11-24 -> 0-unstable-2023-11-24 --- pkgs/development/compilers/open-watcom/v2.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 37503496c917..de4aad453c38 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "unstable-2023-11-24"; + version = "0-unstable-2023-11-24"; src = fetchFromGitHub { owner = "open-watcom"; @@ -89,6 +89,8 @@ stdenv.mkDerivation rec { prettyName = "open-watcom-v2"; updateScript = unstableGitUpdater { url = "https://github.com/open-watcom/open-watcom-v2.git"; + # no numerical releases, monthly "YYYY-MM-DD-Build" tags and daily "Current-build", "Last-CI-build" & "Coverity-scan" retagging + hardcodeZeroVersion = true; }; }; From 0122b82531e23279384ef3877523383ccfa9a7e9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:48:43 +0100 Subject: [PATCH 05/57] zig-shell-completions: unstable-2023-11-18 -> 0-unstable-2023-11-18 --- pkgs/development/compilers/zig/shell-completions.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/shell-completions.nix b/pkgs/development/compilers/zig/shell-completions.nix index d60f7950dcad..44773cf9a553 100644 --- a/pkgs/development/compilers/zig/shell-completions.nix +++ b/pkgs/development/compilers/zig/shell-completions.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig-shell-completions"; - version = "unstable-2023-11-18"; + version = "0-unstable-2023-11-18"; src = fetchFromGitHub { owner = "ziglang"; From 402d9d64e259255a75d66cc153392637d0aae630 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:49:59 +0100 Subject: [PATCH 06/57] femtolisp: unstable-2023-07-12 -> 0-unstable-2023-07-12 --- pkgs/development/interpreters/femtolisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix index ecd3bc1f8fd7..34efdc91ac6d 100644 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "femtolisp"; - version = "unstable-2023-07-12"; + version = "0-unstable-2023-07-12"; src = fetchFromSourcehut { owner = "~ft"; From 85a40080aab1ceb9ba3de22031fb465fde637982 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:51:17 +0100 Subject: [PATCH 07/57] nelua: unstable-2024-04-20 -> 0-unstable-2024-04-20 --- pkgs/development/interpreters/nelua/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index fd57cc4b46ee..07494f121b02 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "unstable-2024-04-20"; + version = "0-unstable-2024-04-20"; src = fetchFromGitHub { owner = "edubart"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace lualib/nelua/version.lua \ --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \ - --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "unstable-" version}'" + --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'" ''; makeFlags = [ "PREFIX=$(out)" ]; @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + # no releases, only stale "latest" tag + hardcodeZeroVersion = true; + }; meta = with lib; { description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; From 9293af315e4603d4ee1383f1440e98fabbdea51d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:44:15 +0100 Subject: [PATCH 08/57] scheme-manpages: unstable-2024-02-11 -> 0-unstable-2024-02-11 --- pkgs/data/documentation/scheme-manpages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 87119f31452b..96d8d9ac1194 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2024-02-11"; + version = "0-unstable-2024-02-11"; src = fetchFromGitHub { owner = "schemedoc"; From 4712ec00cfd393fbe8e7036b001bc743efb343e6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:45:07 +0100 Subject: [PATCH 09/57] dracula-theme: unstable-2024-04-24 -> 4.0.0-unstable-2024-04-24 --- pkgs/data/themes/dracula-theme/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index cb3e112821fc..229a19f1b966 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "unstable-2024-04-24"; + version = "4.0.0-unstable-2024-04-24"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -38,7 +38,9 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Dracula variant of the Ant theme"; From caa9e587a4e698731873c928f251026b6a3e5613 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:45:39 +0100 Subject: [PATCH 10/57] material-kwin-decoration: unstable-2023-01-15 -> 7-unstable-2023-01-15 --- pkgs/data/themes/material-kwin-decoration/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix index ba81e1f62987..85bf37cc7892 100644 --- a/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/pkgs/data/themes/material-kwin-decoration/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { pname = "material-kwin-decoration"; - version = "unstable-2023-01-15"; + version = "7-unstable-2023-01-15"; src = fetchFromGitHub { owner = "Zren"; @@ -47,7 +47,9 @@ mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { From 4b084efb0d969403cdcfe828cd0d96ed9a074605 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:46:08 +0100 Subject: [PATCH 11/57] nixos-bgrt-plymouth: unstable-2023-03-10 -> 0-unstable-2023-03-10 --- pkgs/data/themes/nixos-bgrt-plymouth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix index 0486aed864f4..b6b5be1adda0 100644 --- a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix +++ b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "nixos-bgrt-plymouth"; - version = "unstable-2023-03-10"; + version = "0-unstable-2023-03-10"; src = fetchFromGitHub { repo = "plymouth-theme-nixos-bgrt"; From 29a16ce2a73d78639a539a324ef7ef74f9c2befc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:46:29 +0100 Subject: [PATCH 12/57] pantheon.file-roller-contract: unstable-2021-02-22 -> 0-unstable-2021-02-22 --- pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index c9a24b4906c7..6a2a22ddf83a 100644 --- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "file-roller-contract"; - version = "unstable-2021-02-22"; + version = "0-unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; From cfc30e70941243b2e67eb7e864e23675e2392760 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:46:52 +0100 Subject: [PATCH 13/57] wingpanel-indicator-ayatana: unstable-2023-04-18 -> 2.0.7-unstable-2023-04-18 --- .../third-party/wingpanel-indicator-ayatana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index f199894d924b..c3c24b02401a 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-ayatana"; - version = "unstable-2023-04-18"; + version = "2.0.7-unstable-2023-04-18"; src = fetchFromGitHub { owner = "Lafydev"; From abb24383d2c0b172c5df26d196985b5776abe177 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:02:55 +0100 Subject: [PATCH 14/57] sladeUnstable: unstable-2023-09-30 -> 3.2.4-unstable-2023-09-30 --- pkgs/games/doom-ports/slade/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix index 7ecc5d5d1b6a..db85d405f8c5 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/games/doom-ports/slade/git.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2023-09-30"; + version = "3.2.4-unstable-2023-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; From 60d2263d86dd75e4a779a1ea000cb5a1da3ce791 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:03:32 +0100 Subject: [PATCH 15/57] nile: unstable-2024-03-09 -> 1.0.2-unstable-2024-03-09 --- pkgs/games/nile/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index b83eda87f934..18d1d3c28ae5 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { pname = "nile"; - version = "unstable-2024-03-09"; + version = "1.0.2-unstable-2024-03-09"; format = "pyproject"; src = fetchFromGitHub { @@ -56,5 +56,7 @@ buildPythonApplication rec { maintainers = with maintainers; [ aidalgol ]; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; } From 4d15920cd16128fb3ebff4289d659395d2cf4aaf Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:06:15 +0100 Subject: [PATCH 16/57] bloat: unstable-2024-02-12 -> 0-unstable-2024-02-12 --- pkgs/servers/bloat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index dfde129e8887..3ca2b494e234 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,7 +6,7 @@ buildGoModule { pname = "bloat"; - version = "unstable-2024-02-12"; + version = "0-unstable-2024-02-12"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; From 5ae0b96fa2a54efe9e9a549f9e678ad1b17d1f1a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:06:57 +0100 Subject: [PATCH 17/57] klipper: unstable-2024-04-20 -> 0.12.0-unstable-2024-04-20 --- pkgs/servers/klipper/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 071c268c5dc6..3752c7147797 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2024-04-20"; + version = "0.12.0-unstable-2024-04-20"; src = fetchFromGitHub { owner = "KevinOConnor"; @@ -63,7 +63,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru.updateScript = unstableGitUpdater { + url = meta.homepage; + tagPrefix = "v"; + }; meta = with lib; { description = "The Klipper 3D printer firmware"; From cbf9e8f389556f6956d973d7ff297978e5a15001 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:07:50 +0100 Subject: [PATCH 18/57] moonraker: unstable-2023-12-27 -> 0.8.0-unstable-2023-12-27 --- pkgs/servers/moonraker/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index d4cc61af2802..a6b3f3eb21e7 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -24,7 +24,7 @@ let ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2023-12-27"; + version = "0.8.0-unstable-2023-12-27"; src = fetchFromGitHub { owner = "Arksine"; @@ -44,7 +44,10 @@ in stdenvNoCC.mkDerivation rec { ''; passthru = { - updateScript = unstableGitUpdater { url = meta.homepage; }; + updateScript = unstableGitUpdater { + url = meta.homepage; + tagPrefix = "v"; + }; tests.moonraker = nixosTests.moonraker; }; From 77f1d8831c98b41160cc4383536bed3fea40e929 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:08:11 +0100 Subject: [PATCH 19/57] postgresqlPackages.pgjwt: unstable-2023-03-02 -> 0-unstable-2023-03-02 --- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 2b6ee2edaf85..7134c052363d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "pgjwt"; - version = "unstable-2023-03-02"; + version = "0-unstable-2023-03-02"; src = fetchFromGitHub { owner = "michelp"; From 92dcac933996e1d56d4ce34d1dc8b9dae3edfc63 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:09:03 +0100 Subject: [PATCH 20/57] postgresqlPackages.tds_fdw: unstable-2024-02-10 -> 2.0.3-unstable-2024-02-10 --- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 9986f2131f30..86ab520944e7 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; # Move to stable version when it's released. - version = "unstable-2024-02-10"; + version = "2.0.3-unstable-2024-02-10"; buildInputs = [ postgresql freetds ]; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { install -D tds_fdw.control -t $out/share/postgresql/extension ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; From be077886cd21429930edfe7585755b3cc4e23282 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:11:02 +0100 Subject: [PATCH 21/57] nushellPlugins.net: unstable-2024-04-05 -> 0-unstable-2024-04-05 cargoHash is affected by version change because full derivation name is used in the vendoring process. --- pkgs/shells/nushell/plugins/net.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index a4a2d049b9b5..23729360e83a 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage { pname = "nu-plugin-net"; - version = "unstable-2024-04-05"; + version = "0-unstable-2024-04-05"; src = fetchFromGitHub { owner = "fennewald"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { hash = "sha256-uKLYTRR2tThSvwWbvEePOLZ9ehNPfCYruZxTKSIxpEA="; }; - cargoHash = "sha256-2A9RalZhXigLq/6w738G6PnkV3FyK+3HHXPDQRHTIm0="; + cargoHash = "sha256-BsCOej31vfTf+Wca4+AjxkhXz6wpMRFJmGBsUqOj2U0="; nativeBuildInputs = [ rustPlatform.bindgenHook From e1c10217f95693ac6335e7573a82137d4fd65cab Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:11:33 +0100 Subject: [PATCH 22/57] rc-9front: unstable-2022-11-01 -> 0-unstable-2022-11-01 --- pkgs/shells/rc-9front/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/rc-9front/default.nix b/pkgs/shells/rc-9front/default.nix index a7d2f1e54e3e..ff265dbec871 100644 --- a/pkgs/shells/rc-9front/default.nix +++ b/pkgs/shells/rc-9front/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "rc-9front"; - version = "unstable-2022-11-01"; + version = "0-unstable-2022-11-01"; src = fetchFrom9Front { domain = "shithub.us"; From 693b337466340eace2090621aea3a3a651d16475 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:12:25 +0100 Subject: [PATCH 23/57] zsh-prezto: unstable-2024-04-15 -> 0-unstable-2024-04-15 --- pkgs/shells/zsh/zsh-prezto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 61b51a252fb6..e311bea156f1 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2024-04-15"; + version = "0-unstable-2024-04-15"; src = fetchFromGitHub { owner = "sorin-ionescu"; From c5f4f7823940379c67836ad3054197de7df09780 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 7 May 2024 20:39:15 +0800 Subject: [PATCH 24/57] home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap: unstable-2023-12-16 -> 0.9.0 Changelog: https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v0.9.0 - Format using nixfmt-rfc-style - Add passthru.updateScript - Add meta.changelog --- .../zigbee2mqtt-networkmap/default.nix | 19 +++++++++++-------- .../zigbee2mqtt-networkmap/update.sh | 9 +++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) create mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix index f8e75ede0156..8de17253e000 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix @@ -1,25 +1,26 @@ -{ lib -, fetchFromGitHub -, fetchYarnDeps -, mkYarnPackage +{ + lib, + fetchFromGitHub, + fetchYarnDeps, + mkYarnPackage, }: mkYarnPackage rec { pname = "zigbee2mqtt-networkmap"; - version = "unstable-2023-12-16"; + version = "0.9.0"; src = fetchFromGitHub { owner = "azuwis"; repo = "zigbee2mqtt-networkmap"; - rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3"; - hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos="; + rev = "v${version}"; + hash = "sha256-K4DyrurC4AzzJCcB4CS9UlQbUQSWpR7PevA2JFFMRZM="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs="; + hash = "sha256-h/5TWaIg8AfY6I/JBRmUF6yCCbxCMs9nRECWEaaK2to="; }; configurePhase = '' @@ -49,8 +50,10 @@ mkYarnPackage rec { doDist = false; passthru.entrypoint = "zigbee2mqtt-networkmap.js"; + passthru.updateScript = ./update.sh; meta = with lib; { + changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${version}"; description = "Home Assistant Custom Card to show Zigbee2mqtt network map"; homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap"; maintainers = with maintainers; [ azuwis ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh new file mode 100755 index 000000000000..b2675bc5c3d9 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +set -xe + +dirname="$(dirname "$0")" + +# nix-update picks the wrong file `pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix` +nix-update --override-filename "$dirname/default.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap From e854824e7e68d2b1011535d6efdcb7b5041b0cbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 11:08:11 +0200 Subject: [PATCH 25/57] python312Packages.aiomisc: 17.5.6 -> 17.5.15 Changelog: https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md --- pkgs/development/python-modules/aiomisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 9182859bb90e..47a702ddf083 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.5.6"; + version = "17.5.15"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oq4z+ULN6VYkXX4Oz/JqKZSIh55AHOxFJVLyaNGqaNA="; + hash = "sha256-tfJm0W20UeuWIrihXpEmbiX5+Zs1ASIzJbhjodLdctI="; }; build-system = [ poetry-core ]; From bf952f3388e4410db2357e2891447b09dbbf2942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:08:06 +0000 Subject: [PATCH 26/57] offat: 0.17.3 -> 0.17.5 --- pkgs/by-name/of/offat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 6bdd5e507b71..029fab3da789 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "offat"; - version = "0.17.3"; + version = "0.17.5"; pyproject = true; src = fetchFromGitHub { owner = "OWASP"; repo = "OFFAT"; rev = "refs/tags/v${version}"; - hash = "sha256-q9xqtJJ9R81tNvd5Z6S4OWMqDwVoijntw2LOXldVy0E="; + hash = "sha256-61VJPsmSvKZKBWQNl7klqZqFjEjhM3n4LuafZh4d6g4="; }; sourceRoot = "${src.name}/src"; From 7f16302d55f9a2849bcb0859417828f1cfb85812 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:27:50 +0000 Subject: [PATCH 27/57] json-schema-for-humans: 0.47 -> 1.0.1 --- .../python-modules/json-schema-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index f758ae924496..de8f63fea748 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.47"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-yioYsCp+q5YWdIWDlNZkpaLqo++n+dV5jyEeIhUDHr4="; + hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; pythonRelaxDeps = [ From 5a1cb2997c4cbed04c71af35cd8c5e2b7ea3e04c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 19:57:48 +0200 Subject: [PATCH 28/57] python312Packages.rokuecp: 0.19.2 -> 0.19.3 Diff: https://github.com/ctalkington/python-rokuecp/compare/refs/tags/0.19.2...0.19.3 Changelog: https://github.com/ctalkington/python-rokuecp/releases/tag/0.19.3 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 0a204c11be28..8090bda230bb 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.19.2"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-L6uedckc2lEQ6CUlQGEyDhnuVsxRRgDQJUEsZTfm2sU="; + hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM="; }; nativeBuildInputs = [ From 25d0207632ab17b827025d746827793f979a45b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 19:59:14 +0200 Subject: [PATCH 29/57] python312Packages.rokuecp: refactor --- .../python-modules/rokuecp/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 8090bda230bb..7bcbd4a8d40b 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rokuecp"; version = "0.19.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -29,11 +29,17 @@ buildPythonPackage rec { hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" + ''; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp backoff cachetools @@ -49,12 +55,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - disabledTests = [ # Network related tests are having troube in the sandbox "test_resolve_hostname" From 43cc6801e302748486e5c3fa401e18cf76b7fd7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:00:29 +0200 Subject: [PATCH 30/57] python312Packages.rokuecp: format with nixfmt --- .../python-modules/rokuecp/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 7bcbd4a8d40b..47800983f5e3 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -1,18 +1,19 @@ -{ lib -, aiohttp -, aresponses -, awesomeversion -, backoff -, buildPythonPackage -, cachetools -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytest-freezegun -, pytestCheckHook -, pythonOlder -, xmltodict -, yarl +{ + lib, + aiohttp, + aresponses, + awesomeversion, + backoff, + buildPythonPackage, + cachetools, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytest-freezegun, + pytestCheckHook, + pythonOlder, + xmltodict, + yarl, }: buildPythonPackage rec { @@ -35,9 +36,7 @@ buildPythonPackage rec { --replace-fail "--cov" "" ''; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ aiohttp @@ -66,9 +65,7 @@ buildPythonPackage rec { "test_get_tv_channels_single_channel" ]; - pythonImportsCheck = [ - "rokuecp" - ]; + pythonImportsCheck = [ "rokuecp" ]; meta = with lib; { description = "Asynchronous Python client for Roku (ECP)"; From 36eae19b00a92cd043db2e5b52c8b92b303c3a89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:04:57 +0200 Subject: [PATCH 31/57] python312Packages.pyenphase: 1.20.2 -> 1.20.3 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.20.2...v1.20.3 Changelog: https://github.com/pyenphase/pyenphase/blob/v1.20.3/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 45e4b014db72..3081ed70edb5 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.2"; + version = "1.20.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-sjZaLqTYoXJ1cpaSuyLNAsUrACOMVah7DKaKxGkG0zE="; + hash = "sha256-4lMsyzw56gFimUs52mEzy5eKYF9s2ClNi3yfdIBbccY="; }; postPatch = '' From e12fbc0bc8d41a80ee3289335ead063d97b4bd45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:06:33 +0200 Subject: [PATCH 32/57] python312Packages.publicsuffixlist: 0.10.0.20240506 -> 0.10.0.20240508 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 4fcf9436e071..f404504cce90 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240506"; + version = "0.10.0.20240508"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gg1UcELZ8+gQg4VcBsagHhtUc9i6/d03q9oanyDT6K8="; + hash = "sha256-DnDamv29WeYYL6FFDxfxFWRGYUvmNemorW+DlvoEM64="; }; build-system = [ setuptools ]; From 9808270ad40be66b92a930e9784aaa523a50eb2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:28:54 +0200 Subject: [PATCH 33/57] python312Packages.fuzzytm: 2.0.5 -> 2.0.9 --- pkgs/development/python-modules/fuzzytm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuzzytm/default.nix b/pkgs/development/python-modules/fuzzytm/default.nix index e7dae0d02ee1..7f0ac6c5df92 100644 --- a/pkgs/development/python-modules/fuzzytm/default.nix +++ b/pkgs/development/python-modules/fuzzytm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "fuzzytm"; - version = "2.0.5"; + version = "2.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "FuzzyTM"; inherit version; - hash = "sha256-IELkjd3/yc2lBYsLP6mms9LEcXOfVtNNooEKCMf9BtU="; + hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; propagatedBuildInputs = [ From a381bb051228a38f28e18282695bb69c7ddad232 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:31:38 +0200 Subject: [PATCH 34/57] python312Packages.fuzzytm: refactor --- pkgs/development/python-modules/fuzzytm/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuzzytm/default.nix b/pkgs/development/python-modules/fuzzytm/default.nix index 7f0ac6c5df92..4a7d8ddbd930 100644 --- a/pkgs/development/python-modules/fuzzytm/default.nix +++ b/pkgs/development/python-modules/fuzzytm/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , pyfume +, setuptools , scipy , pythonOlder }: @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "fuzzytm"; version = "2.0.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,11 @@ buildPythonPackage rec { hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ gensim numpy pandas From ffd0198c413d41935043cce2fde2305639bb3268 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:32:17 +0200 Subject: [PATCH 35/57] python312Packages.fuzzytm: format with nixfmt --- .../python-modules/fuzzytm/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/fuzzytm/default.nix b/pkgs/development/python-modules/fuzzytm/default.nix index 4a7d8ddbd930..3a86d0c55397 100644 --- a/pkgs/development/python-modules/fuzzytm/default.nix +++ b/pkgs/development/python-modules/fuzzytm/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gensim -, numpy -, pandas -, pyfume -, setuptools -, scipy -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + gensim, + numpy, + pandas, + pyfume, + setuptools, + scipy, + pythonOlder, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ gensim @@ -38,9 +37,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "FuzzyTM" - ]; + pythonImportsCheck = [ "FuzzyTM" ]; meta = with lib; { description = "Library for Fuzzy Topic Models"; From 4a398361da0161f7ed641f375bcac0cbee9cf88c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 21:39:49 +0000 Subject: [PATCH 36/57] kubescape: 3.0.9 -> 3.0.10 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 501c6dc1435b..985eea01f364 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,17 +10,17 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-pAe289XwKq/PO39/Wt60uipt4Z0ZD5f73pDaOTXXwi0="; + hash = "sha256-r6w2Cfyjxqf/1DMBGgmE8Oh/WnvBOa7mAEGXnPjk1Pg="; fetchSubmodules = true; }; - vendorHash = "sha256-UWmsS79N8ooFr4qpKqOVC14cgf5ckAQwzROHGl1smD8="; + vendorHash = "sha256-WPa6IKPjdBtoHYKA2yYtaI1LCbkyv374fcThxbSEKxo="; subPackages = [ "." From 68998c804f04d36c2c5abde3c29f3a4ba144449f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 21:42:12 +0000 Subject: [PATCH 37/57] sabnzbd: 4.3.0 -> 4.3.1 --- pkgs/by-name/sa/sabnzbd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 9bcfe9b0ec4f..99a8e66514f6 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -48,14 +48,14 @@ let ]); path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.3.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2zRhDFKbWq4JA7XE5/VFbfkN2ZQcqcuqGD5kjHmeXUA="; + sha256 = "sha256-OlACGAYP4nMZZAVJduzj0AGTzSwM+lE7+H2xgmQVSWg="; }; nativeBuildInputs = [ makeWrapper ]; From 2f04c5f8a3063206c66fa69a346d2776b8074115 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2024 15:29:21 +0200 Subject: [PATCH 38/57] linux: always use xz for compressing modules The change I merged too hastily in #302300 increases the size by ~30%. This could be improved upon, but in the meantime let's go back to xz while keeping zstd-compressed firmware (only 4.4% larger) and _support_ for zstd-compressed modules. --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index c18f3af9219f..b27d4c658bfe 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -53,7 +53,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - `system.etc.overlay.enable` option was added. If enabled, `/etc` is mounted via an overlayfs instead of being created by a custom perl script. -- For each supporting version of the Linux kernel firmware blobs and kernel modules +- For each supporting version of the Linux kernel firmware blobs are compressed with zstd. For firmware blobs this means an increase of 4.4% in size, however a significantly higher decompression speed. diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cf38897c5070..62922d442697 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -951,8 +951,7 @@ let ZEROPLUS_FF = yes; MODULE_COMPRESS = whenOlder "5.13" yes; - MODULE_COMPRESS_XZ = whenOlder "5.13" yes; - MODULE_COMPRESS_ZSTD = whenAtLeast "5.13" yes; + MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC From 344c714c3610f0c3eec800a73c10920e7f989716 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 22:56:25 +0000 Subject: [PATCH 39/57] tbls: 1.74.1 -> 1.74.3 --- pkgs/tools/misc/tbls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index c930d2038149..0d20bead317e 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.74.1"; + version = "1.74.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-QuusOxXcTp7c6zkj6L//jOXWwLUgrsUFtsUtrNZrkOk="; + hash = "sha256-tS/sdX74Fr6arZh7/JiNFz1grjPMVZfg8C1VvqxsbYM="; }; - vendorHash = "sha256-mDZOBwm3k3L4QqQA+1C3jRz46R7+4wwJg9BVNWB0F0A="; + vendorHash = "sha256-NafHcWP9xJX2hy8i1TKtBi54cXDKgoxbgwLQjYRBcjU="; nativeBuildInputs = [ installShellFiles ]; From 27b7517d8716e231286cbe835d476067c0ab28f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 22:56:40 +0000 Subject: [PATCH 40/57] cargo-tarpaulin: 0.29.0 -> 0.29.2 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index accb456f1192..b554353a508c 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-eLLnSfuFnvlarpFBkhq3eumIyXOuuYU9ZJHpsKt0WQE="; + hash = "sha256-3OLMTiMX5dsW691MX432YUuVqKOtrmS6Tpk96QVEyo8="; }; - cargoHash = "sha256-bTflBJ5Rz2Xdip2ptUyGi+CpR0ZN0ggVutSk1S9nW1c="; + cargoHash = "sha256-+xCA0LVEHhBGOgMx+/ABZL1I7NSJEWf21p9gmQJNBJo="; nativeBuildInputs = [ pkg-config From b0985f752f050775491a0e3ec917885cdb0efb25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 00:30:07 +0000 Subject: [PATCH 41/57] cpp-utilities: 5.24.7 -> 5.24.8 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 49ebc34fbcf2..599fa32022e1 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.7"; + version = "5.24.8"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY="; + sha256 = "sha256-Bo7XYArkJOK/dsX+K+xadz8SCh736ZMaB29jX4X+RGw="; }; nativeBuildInputs = [ cmake ]; From 6db0481e0e41952a65e4e22fbf71acd6bde73d39 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 8 May 2024 21:05:41 -0400 Subject: [PATCH 42/57] sourcehut: Fix werkzueg patch hash --- pkgs/applications/version-management/sourcehut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index c9cfa31ce9f3..c941cc7570da 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -69,7 +69,7 @@ let patches = (oldAttrs.patches or []) ++ [ (fetchpatch { url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch"; - hash = "sha256-H45/YF9zaOUg6UqEEus4uBeGA/TjynuJZcRyc6BHQ30="; + hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4="; }) ]; }); From 4e295b648eb40e76c841aa0e9f0875d2ae73e6a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 05:31:34 +0000 Subject: [PATCH 43/57] cargo-whatfeatures: 0.9.11 -> 0.9.12 --- pkgs/development/tools/rust/cargo-whatfeatures/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index e040971df830..2aa7b4760ca1 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-whatfeatures"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "museun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCS0EDSNnCii98OBZlPwwq7LBociN7zo8FZJvxt9X4w="; + sha256 = "sha256-62eEHxX+Gsz+Bif1ev0nTRituRkfqlGYZfa9cFkO26M="; }; - cargoHash = "sha256-SNhulId9naSBO7UxiiX7q0RIVJngflAO2UfpxvKDIF4="; + cargoHash = "sha256-bk/mbQu4lzhA9ct7cws70MYuj8oNEBgC+0EjHlaN1lc="; nativeBuildInputs = [ pkg-config ]; From 5de1fb484354f877a1714e998986d7f05ac663b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 05:32:13 +0000 Subject: [PATCH 44/57] monkeysAudio: 10.71 -> 10.72 --- pkgs/applications/audio/monkeys-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 0018c99bc1af..3fdcda98d116 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.71"; + version = "10.72"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-YHPC+dHfvRSr6GldWSlgCGt/wuO/WXQGRliarnM8/AU="; + hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ="; stripRoot = false; }; nativeBuildInputs = [ From 7d414b938fa31580fc3352465eeb2a2fde31f201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 9 May 2024 08:05:49 +0200 Subject: [PATCH 45/57] tbs: 20231210 -> 20240506 --- pkgs/os-specific/linux/tbs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index 5805a400c1e2..4d4a1a96ce5f 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -5,22 +5,22 @@ let name = repo; owner = "tbsdtv"; repo = "linux_media"; - rev = "d0a7e44358f28064697e0eed309db03166dcd83b"; - hash = "sha256-BTHlnta5qv2bdPjD2bButwYGpwR/bq99/AUoZqTHHYw="; + rev = "d8d1ff33c0c47e34fe3e860b52b4d6c457520866"; + hash = "sha256-1Z9itZ5GFpfUeRtp5xTnS+I91LUZLDhsEcF2v8ThaCs="; }; build = fetchFromGitHub rec { name = repo; owner = "tbsdtv"; repo = "media_build"; - rev = "88764363a3e3d36b3c59a0a2bf2244e262035d47"; - hash = "sha256-LFTxYVPudflxqYTSBIDNkTrGs09MOuYBXwpGYqWfEFQ="; + rev = "8cd12a6e90999f3a341018812a5d66d7e6b30913"; + hash = "sha256-+I0NrML54ni37qgDHbRUQiLmmw/UZgXmoFoiDNDeH5A="; }; in stdenv.mkDerivation { pname = "tbs"; - version = "20231210-${kernel.version}"; + version = "20240506-${kernel.version}"; srcs = [ media build ]; sourceRoot = build.name; @@ -66,6 +66,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.6"; + broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.9"; }; } From 96a608f3d2f1ae2044cc1b08936ff39df246e6fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 09:42:50 +0200 Subject: [PATCH 46/57] kubescape: format with nixfmt --- pkgs/tools/security/kubescape/default.nix | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 985eea01f364..bfc482613d54 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, git -, installShellFiles -, kubescape -, testers +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + git, + installShellFiles, + kubescape, + testers, }: buildGoModule rec { @@ -22,17 +23,11 @@ buildGoModule rec { vendorHash = "sha256-WPa6IKPjdBtoHYKA2yYtaI1LCbkyv374fcThxbSEKxo="; - subPackages = [ - "." - ]; + subPackages = [ "." ]; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ - git - ]; + nativeCheckInputs = [ git ]; ldflags = [ "-s" @@ -89,7 +84,10 @@ buildGoModule rec { Jenkins, CircleCI and Github workflows. ''; license = licenses.asl20; - maintainers = with maintainers; [ fab jk ]; + maintainers = with maintainers; [ + fab + jk + ]; mainProgram = "kubescape"; broken = stdenv.isDarwin; }; From 6c7320a2e2aa5fa216fdab5ff93a70e142491e0e Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Thu, 9 May 2024 00:50:58 -0700 Subject: [PATCH 47/57] mtr: add meta.mainProgram --- pkgs/tools/networking/mtr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index e62b4547525a..6343cf53fb2a 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2Only; maintainers = with maintainers; [ koral orivej raskin globin ]; + mainProgram = "mtr"; platforms = platforms.unix; }; } From fe6d7b04bd879d782b172e6efbef502a294b9ea0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 10:02:42 +0200 Subject: [PATCH 48/57] python312Packages.json-schema-for-humans: refactor --- .../python-modules/json-schema-for-humans/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index de8f63fea748..a26e35ce9cbf 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -35,12 +35,15 @@ buildPythonPackage rec { "dataclasses-json" ]; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ click dataclasses-json htmlmin @@ -70,10 +73,10 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - mainProgram = "generate-schema-doc"; homepage = "https://github.com/coveooss/json-schema-for-humans"; changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; + mainProgram = "generate-schema-doc"; }; } From 96d18bf71b2ecb971b2cbb92559b6ec66e33a26c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 10:03:13 +0200 Subject: [PATCH 49/57] python312Packages.json-schema-for-humans: format with nixfmt --- .../json-schema-for-humans/default.nix | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index a26e35ce9cbf..e96a5b37db43 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,20 +1,21 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, click -, dataclasses-json -, fetchFromGitHub -, htmlmin -, jinja2 -, markdown2 -, poetry-core -, pygments -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, pyyaml -, requests +{ + lib, + beautifulsoup4, + buildPythonPackage, + click, + dataclasses-json, + fetchFromGitHub, + htmlmin, + jinja2, + markdown2, + poetry-core, + pygments, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + pyyaml, + requests, }: buildPythonPackage rec { @@ -31,17 +32,11 @@ buildPythonPackage rec { hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; - pythonRelaxDeps = [ - "dataclasses-json" - ]; + pythonRelaxDeps = [ "dataclasses-json" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ click @@ -67,9 +62,7 @@ buildPythonPackage rec { "TestMdGenerate" ]; - pythonImportsCheck = [ - "json_schema_for_humans" - ]; + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; From 1a964af2b298cf68d9a354a99983ca62da69f782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 01:37:57 +0000 Subject: [PATCH 50/57] liquidsoap: 2.2.4 -> 2.2.5 --- pkgs/tools/audio/liquidsoap/full.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index f4fac11df220..c8a0d266a6c8 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -7,7 +7,7 @@ let pname = "liquidsoap"; - version = "2.2.4"; + version = "2.2.5"; in stdenv.mkDerivation { inherit pname version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "savonet"; repo = "liquidsoap"; rev = "refs/tags/v${version}"; - hash = "sha256-aAW3PeobTRVi5mV321MHZ6RymvOY4DbZITjwcMwGwFo="; + hash = "sha256-o3P7oTizO2l2WkB4LormZ/Ses5jZOpgQ1r1zB1Y3Bjs="; }; postPatch = '' From 5caf4b9c39057a8d6df0c2d397032bce552e9769 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 9 May 2024 05:57:40 +0200 Subject: [PATCH 51/57] liquidsoap: add meta.changelog --- pkgs/tools/audio/liquidsoap/full.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index c8a0d266a6c8..5d749f1a818d 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -129,12 +129,13 @@ stdenv.mkDerivation { ocamlPackages.yaml ]; - meta = with lib; { + meta = { description = "Swiss-army knife for multimedia streaming"; mainProgram = "liquidsoap"; homepage = "https://www.liquidsoap.info/"; - maintainers = with maintainers; [ dandellion ehmry ]; - license = licenses.gpl2Plus; + changelog = "https://raw.githubusercontent.com/savonet/liquidsoap/main/CHANGES.md"; + maintainers = with lib.maintainers; [ dandellion ehmry ]; + license = lib.licenses.gpl2Plus; platforms = ocamlPackages.ocaml.meta.platforms or []; }; } From 8baf42676a6430674a4f38494aea94ba596bb7f3 Mon Sep 17 00:00:00 2001 From: GY <20533356+importantblimp@users.noreply.github.com> Date: Thu, 9 May 2024 10:40:13 +1200 Subject: [PATCH 52/57] mindustry: add .desktop category --- pkgs/games/mindustry/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 0562ff40ac2d..906c6de2795b 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -98,6 +98,7 @@ let desktopName = "Mindustry"; exec = "mindustry"; icon = "mindustry"; + categories = [ "Game" ]; }; cleanupMindustrySrc = '' From 89367b288689bb4da17a43d8fde71441dd919221 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 11:25:09 +0200 Subject: [PATCH 53/57] python312Packages.wktutils: refactor --- .../python-modules/wktutils/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 6b78ba959946..1324922e2743 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -3,15 +3,14 @@ , dateparser , defusedxml , fetchFromGitHub -, fiona , geomet , geopandas , kml2geojson , pyshp , pythonOlder , pyyaml -, regex , requests +, setuptools-scm , shapely , scikit-learn }: @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "wktutils"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,25 +29,32 @@ buildPythonPackage rec { hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"twine",' "" + ''; + + build-system = [ + setuptools-scm + ]; + + dependencies = [ dateparser defusedxml - fiona geomet geopandas kml2geojson pyshp pyyaml - regex - requests shapely - scikit-learn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "sklearn" "scikit-learn" - ''; + passthru.optional-dependencies = { + extras = [ + requests + scikit-learn + ]; + }; # Module doesn't have tests doCheck = false; @@ -60,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of tools for handling WKTs"; homepage = "https://github.com/asfadmin/Discovery-WKTUtils"; + changelog = "https://github.com/asfadmin/Discovery-WKTUtils/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 13472345563f49623d0d5f264c81d684dd2b81d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 11:25:32 +0200 Subject: [PATCH 54/57] python312Packages.wktutils: format with nixfmt --- .../python-modules/wktutils/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 1324922e2743..23529f04a356 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, dateparser -, defusedxml -, fetchFromGitHub -, geomet -, geopandas -, kml2geojson -, pyshp -, pythonOlder -, pyyaml -, requests -, setuptools-scm -, shapely -, scikit-learn +{ + lib, + buildPythonPackage, + dateparser, + defusedxml, + fetchFromGitHub, + geomet, + geopandas, + kml2geojson, + pyshp, + pythonOlder, + pyyaml, + requests, + setuptools-scm, + shapely, + scikit-learn, }: buildPythonPackage rec { @@ -34,9 +35,7 @@ buildPythonPackage rec { --replace-fail '"twine",' "" ''; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ dateparser @@ -59,9 +58,7 @@ buildPythonPackage rec { # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ - "WKTUtils" - ]; + pythonImportsCheck = [ "WKTUtils" ]; meta = with lib; { description = "Collection of tools for handling WKTs"; From bcd689277f0de79c60ba75642e00eea3f954aafa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 04:33:59 +0000 Subject: [PATCH 55/57] spicedb: 1.31.0 -> 1.32.0 --- pkgs/servers/spicedb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 8ded7678a860..e92978b56fd4 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-xbYK+9wTsOIh8fpgbL63JmDzsXFmfPa0TKS06hmwLAg="; + hash = "sha256-PIl5FmXWyp6mkSzTQe7hu4aWeQgGa1YrC5+t1eMQhPY="; }; - vendorHash = "sha256-RBQfrz74Fzse9Rjj6DGfMttbupfSFjP5KbxFHihwMKY="; + vendorHash = "sha256-LrNoIknYY9XIwdyUq7f5pG0IU0WZVSgTNMTFoZAIhp8="; subPackages = [ "cmd/spicedb" ]; From 3f8ff2f06b24a379a193f79046c65a744d8776bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 May 2024 12:57:15 +0200 Subject: [PATCH 56/57] home-assistant: pin sigstore at 1.1.2 Fixes the github component. Closes: #310122 --- pkgs/servers/home-assistant/default.nix | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index eab18d3b2dcd..ed315a18df97 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -387,6 +387,46 @@ let }; }); + # newer sigstore version transitivevly require pydantic>=2 + sigstore = super.sigstore.overridePythonAttrs (oldAttrs: rec { + version = "1.1.2"; + src = fetchFromGitHub { + owner = "sigstore"; + repo = "sigstore-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-QqY5GOBS75OkbSaF5Ua5jnJAhsYfVRuWLUoWDxX8Ino="; + }; + dependencies = with self; [ + appdirs + cryptography + id + pydantic + pyjwt + pyopenssl + requests + securesystemslib + sigstore-protobuf-specs + tuf + ]; + doCheck = false; # pytest too new + }); + + sigstore-protobuf-specs = super.sigstore-protobuf-specs.overridePythonAttrs { + version = "0.1.0"; + src = fetchPypi { + pname = "sigstore-protobuf-specs"; + version = "0.1.0"; + hash = "sha256-YistIxYToo7T5mYKzYeBhnW06DSG9JoPDBmKxUdfy4E="; + }; + nativeBuildInputs = with self; [ + flit-core + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "betterproto" + ]; + }; + tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { version = "0.5.1"; src = fetchFromGitHub { @@ -397,6 +437,19 @@ let }; }); + tuf = super.tuf.overridePythonAttrs rec { + version = "2.1.0"; + src = fetchFromGitHub { + owner = "theupdateframework"; + repo = "python-tuf"; + rev = "refs/tags/v${version}"; + hash = "sha256-MdPctAZuKn/YAwpMJ5gWU7PXJD3iK7bYprLXV52wNQQ="; + }; + disabledTests = [ + "test_sign_failures" + ]; + }; + versioningit = super.versioningit.overridePythonAttrs { doCheck = false; }; From 1bbd237c04dcc6e2c92ed1986bc508f69a2363ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 May 2024 13:03:15 +0200 Subject: [PATCH 57/57] python312Packages.homeassistant-stubs: 2024.5.1 -> 2024.5.2 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.5.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 21b9895ba3ef..dd86f2244745 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.5.1"; + version = "2024.5.2"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-lYoYU39/ayZb8Ue25a7uSN5x8tihzjj5mGaVKWPfa1w="; + hash = "sha256-bgXHEz8YuHcdGYzLpM7H8IVXixFC8Bz0i4SaatA49Qo="; }; nativeBuildInputs = [