From ec274619509db382f0bfebc012e3071800564773 Mon Sep 17 00:00:00 2001 From: airRnot1106 Date: Thu, 12 Jun 2025 22:19:54 +0900 Subject: [PATCH 01/28] lazynpm: init at 0.1.4 --- pkgs/by-name/la/lazynpm/package.nix | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/la/lazynpm/package.nix diff --git a/pkgs/by-name/la/lazynpm/package.nix b/pkgs/by-name/la/lazynpm/package.nix new file mode 100644 index 000000000000..c2e9f2df7c80 --- /dev/null +++ b/pkgs/by-name/la/lazynpm/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "lazynpm"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "jesseduffield"; + repo = "lazynpm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tMUM9GzzTwp/C9hET301LrdWJzVSMYabSQxM78WdE9M="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + "-X=main.buildSource=nixpkgs" + ]; + + meta = { + description = "Terminal UI for npm"; + homepage = "https://github.com/jesseduffield/lazynpm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ airrnot ]; + mainProgram = "lazynpm"; + }; +}) From b0554f20242298cfd12de6f9478c976868c8b022 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 20 Jun 2025 14:00:32 +0200 Subject: [PATCH 02/28] lsr: 0.2.0 -> 1.0.0 Diff: https://tangled.sh/@rockorager.dev/lsr/compare/v0.2.0...v1.0.0 --- pkgs/by-name/ls/lsr/deps.nix | 6 +++--- pkgs/by-name/ls/lsr/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ls/lsr/deps.nix b/pkgs/by-name/ls/lsr/deps.nix index 95585b248791..bb1ffafaa753 100644 --- a/pkgs/by-name/ls/lsr/deps.nix +++ b/pkgs/by-name/ls/lsr/deps.nix @@ -8,11 +8,11 @@ linkFarm "zig-packages" [ { - name = "ourio-0.0.0-_s-z0asOAgAhpi7gSpLLvWGj_4XURez4W9TWN6SGs5BP"; + name = "ourio-0.0.0-_s-z0dAWAgD3XNod2pTh0H8X-a3CjtpAwduh7jcgBz0G"; path = fetchgit { url = "https://github.com/rockorager/ourio"; - rev = "54c1a1ed8d0994636770e5185ecdb59fe6d8535e"; - hash = "sha256-WnNfO51t3Qc5LmeDOB6MVrsaUWR41mGuwbO5t5sCtwE="; + rev = "ed8a67650e5dbb0a6dca811c9d769187e306ad94"; + hash = "sha256-GbfZyzbjkVAcOECjQFWkDRw6QZr+kPXzadaI7xBSkig="; }; } { diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix index 798602921cc0..bbce9432aae4 100644 --- a/pkgs/by-name/ls/lsr/package.nix +++ b/pkgs/by-name/ls/lsr/package.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lsr"; - version = "0.2.0"; + version = "1.0.0"; src = fetchgit { url = "https://tangled.sh/@rockorager.dev/lsr"; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { "src" "docs" ]; - hash = "sha256-+5VHY02AHFtV405OGk5PR/2tl/3qDQHDrOUghZbx5ks="; + hash = "sha256-VeB0R/6h9FXSzBfx0IgpGlBz16zQScDSiU7ZvTD/Cds="; }; postPatch = '' From 96e17579a1091e01920b6cb2a6c196236e048542 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:43:25 +0800 Subject: [PATCH 03/28] hmcl: avoid with lib --- pkgs/by-name/hm/hmcl/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 867d97f8c374..477edcba0345 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -113,13 +113,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postFixup ''; - meta = with lib; { + meta = { homepage = "https://hmcl.huangyuhui.net"; description = "Minecraft Launcher which is multi-functional, cross-platform and popular"; + changelog = "https://docs.hmcl.net/changelog/stable.html"; mainProgram = "hmcl"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3Only; - maintainers = with maintainers; [ daru-san ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ daru-san ]; inherit (hmclJdk.meta) platforms; }; }) From 9bb6f268c4e9b93c06623f59494f8165d11d7a47 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:48:15 +0800 Subject: [PATCH 04/28] hmcl: correct finalAttrs usage --- pkgs/by-name/hm/hmcl/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 477edcba0345..6aad2232f6d0 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -28,22 +28,20 @@ gobject-introspection, }: -let - version = "3.6.12"; - icon = fetchurl { - url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; - hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - inherit version; + version = "3.6.12"; src = fetchurl { - url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; + url = "https://github.com/huanghongxun/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E="; }; + icon = fetchurl { + url = "https://github.com/huanghongxun/HMCL/raw/release-${finalAttrs.version}/HMCLauncher/HMCL/HMCL.ico"; + hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; + }; + dontUnpack = true; dontWrapGApps = true; @@ -71,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/hmcl} cp $src $out/lib/hmcl/hmcl.jar - magick ${icon} hmcl.png + magick ${finalAttrs.icon} hmcl.png install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png runHook postInstall From c147291ac446f0f7857957553edd5a3802cf649b Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:51:45 +0800 Subject: [PATCH 05/28] =?UTF-8?q?hmcl:=20add=20comment=20explaining=20why?= =?UTF-8?q?=20it=E2=80=99s=20not=20built=20from=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/hm/hmcl/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 6aad2232f6d0..b1f640094d19 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: { version = "3.6.12"; src = fetchurl { + # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. + # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/huanghongxun/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E="; }; From e5dcb41b50ba42de1eab1e7fc292b3f2cfcaec8e Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:53:29 +0800 Subject: [PATCH 06/28] hmcl: add updateScript --- pkgs/by-name/hm/hmcl/package.nix | 3 +++ pkgs/by-name/hm/hmcl/update.nix | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/by-name/hm/hmcl/update.nix diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index b1f640094d19..3da50f490d83 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -26,6 +26,7 @@ vulkan-loader, libpulseaudio, gobject-introspection, + callPackage, }: stdenv.mkDerivation (finalAttrs: { @@ -113,6 +114,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postFixup ''; + passthru.updateScript = lib.getExe (callPackage ./update.nix { }); + meta = { homepage = "https://hmcl.huangyuhui.net"; description = "Minecraft Launcher which is multi-functional, cross-platform and popular"; diff --git a/pkgs/by-name/hm/hmcl/update.nix b/pkgs/by-name/hm/hmcl/update.nix new file mode 100644 index 000000000000..9b974524f79b --- /dev/null +++ b/pkgs/by-name/hm/hmcl/update.nix @@ -0,0 +1,40 @@ +{ + writeShellApplication, + nix, + nix-update, + curl, + common-updater-scripts, + jq, +}: + +writeShellApplication { + name = "update-hmcl"; + runtimeInputs = [ + curl + jq + nix + common-updater-scripts + nix-update + ]; + + text = '' + # get old info + oldVersion=$(nix-instantiate --eval --strict -A "hmcl.version" | jq -e -r) + + get_latest_release() { + curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/HMCL-dev/HMCL/releases/latest" | jq -r ".tag_name" + } + + version=$(get_latest_release) + version="''${version#release-}" + + if [[ "$oldVersion" == "$version" ]]; then + echo "Already up to date!" + exit 0 + fi + + nix-update hmcl --version="$version" + update-source-version hmcl --source-key=icon --ignore-same-version + ''; +} From 6cd7e9d3c626024d7c930f6a06508c6039b98ffa Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 19:39:30 +0800 Subject: [PATCH 07/28] hmcl: gen multiple size icons --- pkgs/by-name/hm/hmcl/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 3da50f490d83..adb5a6f5bb25 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: { }; icon = fetchurl { - url = "https://github.com/huanghongxun/HMCL/raw/release-${finalAttrs.version}/HMCLauncher/HMCL/HMCL.ico"; - hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; + url = "https://github.com/huanghongxun/HMCL/raw/release-${finalAttrs.version}/HMCL/src/main/resources/assets/img/icon@8x.png"; + hash = "sha256-1OVq4ujA2ZHboB7zEk7004kYgl9YcoM4qLq154MZMGo="; }; dontUnpack = true; @@ -72,8 +72,13 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/hmcl} cp $src $out/lib/hmcl/hmcl.jar - magick ${finalAttrs.icon} hmcl.png - install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png + + for n in 16 32 48 64 96 128 256 + do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + magick ${finalAttrs.icon} -resize $size $out/share/icons/hicolor/$size/apps/hmcl.png + done runHook postInstall ''; From c6603237ac6dc3da4ee9b32f6d531a4757231846 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 19:41:19 +0800 Subject: [PATCH 08/28] hmcl: follow upstream, switch to HMCL-dev org --- pkgs/by-name/hm/hmcl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index adb5a6f5bb25..bae260c8bc65 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 - url = "https://github.com/huanghongxun/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; + url = "https://github.com/HMCL-dev/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E="; }; icon = fetchurl { - url = "https://github.com/huanghongxun/HMCL/raw/release-${finalAttrs.version}/HMCL/src/main/resources/assets/img/icon@8x.png"; + url = "https://github.com/HMCL-dev/HMCL/raw/release-${finalAttrs.version}/HMCL/src/main/resources/assets/img/icon@8x.png"; hash = "sha256-1OVq4ujA2ZHboB7zEk7004kYgl9YcoM4qLq154MZMGo="; }; From 9bd5502f42070514b22dd821c5ec8fc2aa12603f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:54:04 +0800 Subject: [PATCH 09/28] hmcl: add myself as maintainer --- pkgs/by-name/hm/hmcl/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index bae260c8bc65..58a7124271cb 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -128,7 +128,10 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "hmcl"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ daru-san ]; + maintainers = with lib.maintainers; [ + daru-san + moraxyc + ]; inherit (hmclJdk.meta) platforms; }; }) From cfd5cb75961f7b09bbbab6c62cd2347c214ad6b3 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 2 Jul 2025 15:30:03 +0200 Subject: [PATCH 10/28] readest: 0.9.61 -> 0.9.62 Changelog: https://github.com/readest/readest/releases/tag/v0.9.62 Diff: https://github.com/readest/readest/compare/v0.9.61...v0.9.62 --- pkgs/by-name/re/readest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index c923cc266e8e..1fad1fa0a2e7 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.61"; + version = "0.9.62"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-vtswHOG3/9oao+KrHWJi3NLsFghczmyLfT276kq5Llg="; + hash = "sha256-DaDIx3AbW4JCiZrO4+dxAxue0vCaxbzAGEgKoERFK7g="; fetchSubmodules = true; }; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-9YG0l/cIjk5imkoly/pNmTVN7N+K56tpWnD7HDFSqiw="; + hash = "sha256-lez75n3dIM4efpP+qPuDteCfMnC6wPD+L2173iJbTZM="; }; pnpmRoot = "../.."; From 949e299d246a7e2d64402dec4c3c0a841416987a Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 2 Jul 2025 23:43:29 -0700 Subject: [PATCH 11/28] kubernetes: use util-linuxMinimal instead of util-linux.withPatches This, and commits to k3s and util-linux close #409339. The util-linux.withPatches API was a temporary hack for the 25.05 release to fix Kubernetes, and is going away. While we're at it, we should use util-linuxMinimal because we do not need things such as systemd support for kubelet initialization. --- nixos/modules/services/cluster/kubernetes/kubelet.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index ca7b524081f6..9ab5d0baf8c7 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -336,10 +336,7 @@ in [ gitMinimal openssh - # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild - # for the 25.05 release. Once the staging cycle referenced in the above PR completes, - # switch back to plain util-linux. - util-linux.withPatches + util-linuxMinimal iproute2 ethtool thin-provisioning-tools From e6886d7080bac9c1c59b03c9ae1e65030106437b Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 2 Jul 2025 23:43:59 -0700 Subject: [PATCH 12/28] k3s: drop util-linux.withPatches This, as well as commits to kubernetes and util-linux, close #409339. util-linux.withPatches was a temporary hack to unbreak Kubernetes for the 25.05 release. --- pkgs/applications/networking/cluster/k3s/builder.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index e2662f989452..6d23342c9136 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -332,11 +332,6 @@ let ldflags = versionldflags; }).overrideAttrs overrideContainerdAttrs; - - # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild - # for the 25.05 release. Once the staging cycle referenced in the above PR completes, - # switch back to plain util-linuxMinimal. - k3sUtilLinux = util-linuxMinimal.withPatches; in buildGoModule rec { pname = "k3s"; @@ -383,7 +378,7 @@ buildGoModule rec { ipset bridge-utils ethtool - k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + util-linuxMinimal # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 conntrack-tools runc bash From 91a3afac528cad2c1a6048a9bb0c2d1d31207440 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 2 Jul 2025 23:44:54 -0700 Subject: [PATCH 13/28] util-linux: drop withPatches Closes #409339. This API was intended to be a temporary hack to fix Kubernetes and other consumers that relied on this specific util-linux mount behavior. Now that util-linux is correctly patched, we can drop this passthru. --- pkgs/by-name/ut/util-linux/package.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 702cc21ebd6a..92b7785d53f0 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -202,18 +202,6 @@ stdenv.mkDerivation (finalPackage: rec { ''; passthru = { - # TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild - # for the 25.05 release to fix Kubernetes. Once the staging cycle referenced - # in the above PR completes, this passthru and all consumers of it should go away. - withPatches = finalPackage.overrideAttrs (prev: { - patches = lib.unique ( - prev.patches or [ ] - ++ [ - ./fix-mount-regression.patch - ] - ); - }); - updateScript = gitUpdater { # No nicer place to find latest release. url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"; From 56a71ae59248c3ef7f0a482e68c00424cb1cdd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Jul 2025 12:56:12 +0000 Subject: [PATCH 14/28] dissent: 0.0.34 -> 0.0.35 --- pkgs/by-name/di/dissent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index 4a5f5f7f07a2..fbd411ac2e4b 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.34"; + version = "0.0.35"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; tag = "v${version}"; - hash = "sha256-65UsXSxcEQhQM3N4wUoEehJmF9pJPcGCG7fF/DWe+zU="; + hash = "sha256-cmp+oAUV+Oehs/kz6DRW57NgegBWbFVT/7xfY7CbcZM="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service ''; - vendorHash = "sha256-unb/x7bzWWkr2zKioOarY2VdrGBiJq/mORsWifuulqQ="; + vendorHash = "sha256-AhzM0wu2wwwG/sDY+r2wgmotK4zA5u6vzq4KoPMLkL0="; meta = { description = "Third-party Discord client designed for a smooth, native experience (formerly gtkcord4)"; From 3ed3dc16466ebff0b33b9cc7f337b48750a18d3b Mon Sep 17 00:00:00 2001 From: Yuchen He Date: Thu, 3 Jul 2025 19:32:42 +0200 Subject: [PATCH 15/28] s-tui: 1.1.6 -> 1.2.0 Signed-off-by: Yuchen He --- pkgs/by-name/s-/s-tui/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/s-/s-tui/package.nix b/pkgs/by-name/s-/s-tui/package.nix index 7f50fe06a09f..4ff7501d7482 100644 --- a/pkgs/by-name/s-/s-tui/package.nix +++ b/pkgs/by-name/s-/s-tui/package.nix @@ -2,25 +2,29 @@ lib, stdenv, python3Packages, - fetchPypi, + fetchFromGitHub, nix-update-script, s-tui, testers, + stress, }: python3Packages.buildPythonPackage rec { pname = "s-tui"; - version = "1.1.6"; + version = "1.2.0"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c="; + src = fetchFromGitHub { + owner = "amanusk"; + repo = "s-tui"; + tag = "v${version}"; + hash = "sha256-VdQSDRDdRO6jHSuscOQZXnVM6nWHaXRfR4sZ3x5lriI="; }; - propagatedBuildInputs = with python3Packages; [ - urwid - psutil + propagatedBuildInputs = [ + python3Packages.urwid + python3Packages.psutil + stress ]; passthru = { @@ -32,7 +36,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ lilacious ]; broken = stdenv.hostPlatform.isDarwin; # https://github.com/amanusk/s-tui/issues/49 mainProgram = "s-tui"; }; From 125ae45fe620e2730738fe513d7f76228c99e45c Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 3 Jul 2025 23:52:03 +0200 Subject: [PATCH 16/28] backrest: never download restic from an external URL --- pkgs/by-name/ba/backrest/package.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 73472f3d62b0..fa42dab819ea 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -8,6 +8,7 @@ restic, stdenv, util-linux, + makeBinaryWrapper, }: let pname = "backrest"; @@ -53,9 +54,19 @@ in buildGoModule { inherit pname src version; + postPatch = '' + sed -i -e \ + '/func installRestic(targetPath string) error {/a\ + return fmt.Errorf("installing restic from an external source is prohibited by nixpkgs")' \ + internal/resticinstaller/resticinstaller.go + ''; + vendorHash = "sha256-AINnBkP+e9C/f/C3t6NK+6PYSVB4NON0C71S6SwUXbE="; - nativeBuildInputs = [ gzip ]; + nativeBuildInputs = [ + gzip + makeBinaryWrapper + ]; preBuild = '' mkdir -p ./webui/dist @@ -87,6 +98,11 @@ buildGoModule { export HOME=$(pwd) ''; + postInstall = '' + wrapProgram $out/bin/backrest \ + --set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}" + ''; + meta = { description = "Web UI and orchestrator for restic backup"; homepage = "https://github.com/garethgeorge/backrest"; From cb74bd28e246936c4c4f1888f06174737173fbfd Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 3 Jul 2025 16:38:43 -0600 Subject: [PATCH 17/28] dynisland: 0.1.3 -> 0.1.4 https://github.com/cr3eperall/dynisland/releases/tag/0.1.4 Diff: https://github.com/cr3eperall/dynisland/compare/0.1.3...0.1.4 --- pkgs/by-name/dy/dynisland/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix index 3096cb8f0047..5c779283b2e5 100644 --- a/pkgs/by-name/dy/dynisland/package.nix +++ b/pkgs/by-name/dy/dynisland/package.nix @@ -6,26 +6,27 @@ openssl, gtk4, gtk4-layer-shell, + mimalloc, glib, pkg-config, wrapGAppsHook4, installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dynisland"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "cr3eperall"; repo = "dynisland"; - tag = version; - hash = "sha256-HqwykR6BXxtYSxNUYdegmjCwSVTW29pqP7qLWbcqLeg="; + tag = finalAttrs.version; + hash = "sha256-gO6QniPcv/250CD/cjEJPKijb4cg5R1mUvdrOqamEzk="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-91dQG0NvEL28gHxn6zk3vLODNft8C5ymkLddMT+PB0Q="; + cargoHash = "sha256-cvGsRFaqeMdp2cxgfZZcB2r67Si2K6En4or9HVG4WwA="; buildFeatures = [ "completions" ]; @@ -34,6 +35,7 @@ rustPlatform.buildRustPackage rec { openssl gtk4 gtk4-layer-shell + mimalloc ]; nativeBuildInputs = [ @@ -55,10 +57,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Dynamic and extensible GTK4 layer-shell, written in Rust"; homepage = "https://github.com/cr3eperall/dynisland"; - changelog = "https://github.com/cr3eperall/dynisland/releases/tag/${version}"; + changelog = "https://github.com/cr3eperall/dynisland/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ryand56 ]; mainProgram = "dynisland"; platforms = lib.platforms.linux; }; -} +}) From a0634a22c3319eaa9cdddf2ac54c102646b21805 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 4 Jul 2025 13:48:42 +0800 Subject: [PATCH 18/28] agorakit: add updateScript --- pkgs/by-name/ag/agorakit/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix index bbf42b287435..97e9a395c98d 100644 --- a/pkgs/by-name/ag/agorakit/package.nix +++ b/pkgs/by-name/ag/agorakit/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, php82, + nix-update-script, dataDir ? "/var/lib/agorakit", }: @@ -29,6 +30,8 @@ php82.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-PBymOrvorGfByTBVu/r+kBxQya5qIlu07mfu4ttT7xs="; composerStrictValidation = false; + passthru.updateScript = nix-update-script { }; + meta = { description = "Web-based, open-source groupware"; longDescription = "AgoraKit is web-based, open-source groupware for citizens' initiatives. By creating collaborative groups, people can discuss topics, organize events, store files and keep everyone updated as needed. AgoraKit is a forum, calendar, file manager and email notifier."; From 11688b33b41addada7110c43385cf3ace8375c56 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 4 Jul 2025 13:57:13 +0800 Subject: [PATCH 19/28] agorakit: 1.9.3 -> 1.11 --- pkgs/by-name/ag/agorakit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix index 97e9a395c98d..22d7e6274464 100644 --- a/pkgs/by-name/ag/agorakit/package.nix +++ b/pkgs/by-name/ag/agorakit/package.nix @@ -8,13 +8,13 @@ php82.buildComposerProject2 (finalAttrs: { pname = "agorakit"; - version = "1.9.3"; + version = "1.11"; src = fetchFromGitHub { owner = "agorakit"; repo = "agorakit"; - tag = finalAttrs.version; - sha256 = "sha256-mBBl/8nXG3FsMeecbERLyY2tGFhh+5nS8A4nd7HI+8c="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-YCHszRi+atEkaM9bHncpRtQsuiS6P22yKSqYzXq8flk="; }; installPhase = '' @@ -27,7 +27,7 @@ php82.buildComposerProject2 (finalAttrs: { runHook postInstall ''; - vendorHash = "sha256-PBymOrvorGfByTBVu/r+kBxQya5qIlu07mfu4ttT7xs="; + vendorHash = "sha256-tBB3Zl/N1XqPTD84at5WoGrD0G5rJbobk4E8BFOSm+M="; composerStrictValidation = false; passthru.updateScript = nix-update-script { }; From 8aecdfddf5e390020783e31b290f357aeaa57e81 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 4 Jul 2025 20:35:48 +0800 Subject: [PATCH 20/28] agorakit: add ngi team --- pkgs/by-name/ag/agorakit/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix index 22d7e6274464..c1c9595eccac 100644 --- a/pkgs/by-name/ag/agorakit/package.nix +++ b/pkgs/by-name/ag/agorakit/package.nix @@ -39,5 +39,6 @@ php82.buildComposerProject2 (finalAttrs: { license = lib.licenses.agpl3Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ shogo ]; + teams = with lib.teams; [ ngi ]; }; }) From 03a522501f70337e43d11de9766b1d93a3bb1394 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Jul 2025 21:51:21 +0000 Subject: [PATCH 21/28] firefly-iii-data-importer: 1.6.3 -> 1.7.3 --- pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 3f5dbe669942..381408cd8e5d 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "1.6.3"; + version = "1.7.3"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-+e5UtnK/eiFnmvtKjVp3EZ8JLi+dWnJ+vgjDJKRLqH8="; + hash = "sha256-CUotqHmVXKKkbAS4a7YWoVjs1GRhxrA5Y5rXtMx/mCo="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-ExHT4kRyyp4c7vGqUN7hbP8pScvto/qp81oDjZGBJis="; + vendorHash = "sha256-JN9HaX056+AhYkMyZ7KO7c6z43ynbRyORAOvW+6eVO8="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-i+Ytv8uLSrdLPC04BfZbRXRA7jmy1IX4nYW5WRZubCY="; + hash = "sha256-0vMxwm6NOdhCQcVeO93QNGB1BlqVckXzHkpCVvDB9ms="; }; composerRepository = php84.mkComposerRepository { From 836cc4b9aa4783d60bbb330520bbfb4fb32da099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Jul 2025 22:20:42 +0000 Subject: [PATCH 22/28] python3Packages.python-snoo: 0.6.6 -> 0.6.7 --- pkgs/development/python-modules/python-snoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix index 6eca6c123bd4..0a97d85299bd 100644 --- a/pkgs/development/python-modules/python-snoo/default.nix +++ b/pkgs/development/python-modules/python-snoo/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-snoo"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "Lash-L"; repo = "python-snoo"; tag = "v${version}"; - hash = "sha256-Aj9d45EKjv4xAs/Y9/8ew+aDe/GFGSxQeSG1SAObqE0="; + hash = "sha256-XHjIrR/lv07wPGDga1XsuHYgqQCgqXCLkhzGH8XTbSU="; }; postPatch = '' From 82d3b713efcc1690393454b7984d967d39b58a11 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 4 Jul 2025 23:10:45 +0000 Subject: [PATCH 23/28] ytdl-sub: 2025.06.27 -> 2025.07.04 Changelog: https://github.com/jmbannon/ytdl-sub/releases/tag/2025.07.04 Diff: https://github.com/jmbannon/ytdl-sub/compare/2025.06.27...2025.07.04 --- pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 4fc9d28bdea4..1332029d60ea 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.06.27"; + version = "2025.07.04"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-Ub5ITm30hZHWSMKFD7TX4z1GBQ0fU+cMqWRt2AVbGoI="; + hash = "sha256-aVI/OY1Dh5LvbDyg+GuWBz2e6oUgTzErqfnow22v8CI="; }; postPatch = '' From 302f10d89bec5780d6be99611b3d087ee97d9636 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 2 Jul 2025 21:41:27 +0000 Subject: [PATCH 24/28] alertmanager-ntfy: 1.0.0 -> 1.0.1 Diff: https://github.com/alexbakker/alertmanager-ntfy/compare/v1.0.0...v1.0.1 --- pkgs/by-name/al/alertmanager-ntfy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix index 32144dba93e1..dd0ce61d4212 100644 --- a/pkgs/by-name/al/alertmanager-ntfy/package.nix +++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "alertmanager-ntfy"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "alexbakker"; repo = "alertmanager-ntfy"; tag = "v${finalAttrs.version}"; - hash = "sha256-tyRBfcPL0tzsZgWwgjSW9eMcXZAotkx88tjDr2gw4s4="; + hash = "sha256-CtjWZIw0RHVnPP5OMiLbPjv/EuJI6GfWo2hEzRi7zVI="; }; vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4="; From 30891193c92c561eb81dcbf47c5a402a4781dad1 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 2 Jul 2025 19:02:14 +0800 Subject: [PATCH 25/28] pocket-id: 1.3.1 -> 1.5.0 Changelog: https://github.com/pocket-id/pocket-id/releases/tag/v1.5.0 --- pkgs/by-name/po/pocket-id/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index e707708f6d43..c0c992aa29b8 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "pocket-id"; - version = "1.3.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-I2wKxeXxGO8mx8pHzn/8mAqWsWBrMdFrznmkfEiBzpI="; + hash = "sha256-U5tZq310A6hnDIG8CeJl58EWLSshbXVaKJGSzLUCMI4="; }; sourceRoot = "${finalAttrs.src.name}/backend"; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-CmlYMqRb4+CC0VgpTQKOakc1k6mSIIYbn6l7URu6Eck="; + npmDepsHash = "sha256-AZ8je9uaJ1h9wxfs2RtPr2Ki0QNYD0nDd2BZDj6/sl8="; npmFlags = [ "--legacy-peer-deps" ]; env.BUILD_OUTPUT_PATH = "dist"; From be9ebab2a4116b9af1f7244093378e5215eb0496 Mon Sep 17 00:00:00 2001 From: Cameron <109548666+cameroncuttingedge@users.noreply.github.com> Date: Fri, 4 Jul 2025 19:39:15 -0700 Subject: [PATCH 26/28] copybara: init at 20250501 (#422226) --- pkgs/by-name/co/copybara/package.nix | 77 ++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 pkgs/by-name/co/copybara/package.nix diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix new file mode 100644 index 000000000000..0982dc097d47 --- /dev/null +++ b/pkgs/by-name/co/copybara/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchurl, + jdk21, + makeWrapper, + git, + gnused, + gnugrep, + gawk, + which, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "copybara"; + version = "20250501"; + + src = fetchurl { + url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; + hash = "sha256-a6ONq8mvSCLEAhdGdOCQWxnsflphZBkRt9K/U/ZF7IA="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + jdk21 + ]; + + runtimeDeps = [ + git + gnused + gnugrep + gawk + which + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + cp $src $out/share/java/copybara.jar + + mkdir -p $out/bin + makeWrapper ${jdk21}/bin/java $out/bin/copybara \ + --add-flags "-jar $out/share/java/copybara.jar" \ + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for transforming and moving code between repositories"; + longDescription = '' + Copybara is a tool used internally at Google for transforming and moving + code between repositories. It allows you to maintain code in multiple + repositories while keeping them in sync through transformations. + + Common use cases include: + - Importing sections of code from a confidential repository to a public repository + - Importing code from a public repository to a confidential repository + - Moving changes between authoritative and non-authoritative repositories + ''; + homepage = "https://github.com/google/copybara"; + changelog = "https://github.com/google/copybara/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cameroncuttingedge ]; + platforms = lib.platforms.all; + mainProgram = "copybara"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) From 6a038a134d51949bca16356448ab7ed9f541cfe2 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 4 Jul 2025 06:47:41 +0000 Subject: [PATCH 27/28] chibi: pass out dir when calling make --- pkgs/by-name/ch/chibi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix index 5108d2c707f2..656ba4801d42 100644 --- a/pkgs/by-name/ch/chibi/package.nix +++ b/pkgs/by-name/ch/chibi/package.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - make install PREFIX="$out" - ''; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; fixupPhase = '' wrapProgram "$out/bin/chibi-scheme" \ From 17fc04cecb574c00ea8faf3aa863352393bad420 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 4 Jul 2025 12:53:55 +0000 Subject: [PATCH 28/28] chibi: adopt maintainership as applePrincess --- pkgs/by-name/ch/chibi/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix index 656ba4801d42..309d16af8e50 100644 --- a/pkgs/by-name/ch/chibi/package.nix +++ b/pkgs/by-name/ch/chibi/package.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { description = "Small Footprint Scheme for use as a C Extension Language"; platforms = lib.platforms.all; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.DerGuteMoritz ]; + maintainers = with lib.maintainers; [ + applePrincess + DerGuteMoritz + ]; }; }