From 9053a25e06581cb5dd9902228e40e50335d32274 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Fri, 5 Dec 2025 18:08:32 +0100 Subject: [PATCH 1/3] dgop: switch to finalAttrs --- pkgs/by-name/dg/dgop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix index cb04ca653be3..406d29a53772 100644 --- a/pkgs/by-name/dg/dgop/package.nix +++ b/pkgs/by-name/dg/dgop/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "dgop"; version = "0.1.11"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "dgop"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc="; }; @@ -22,7 +22,7 @@ buildGoModule rec { ldflags = [ "-w" "-s" - "-X main.Version=${version}" + "-X main.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -43,10 +43,10 @@ buildGoModule rec { meta = { description = "API & CLI for System & Process Monitoring"; homepage = "https://github.com/AvengeMedia/dgop"; - changelog = "https://github.com/AvengeMedia/dgop/releases/tag/v${version}"; + changelog = "https://github.com/AvengeMedia/dgop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luckshiba ]; mainProgram = "dgop"; platforms = lib.platforms.unix; }; -} +}) From b223c725978132bb25f09bbbaf59f44d68a5737d Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Fri, 5 Dec 2025 18:08:48 +0100 Subject: [PATCH 2/3] dms-shell: switch to finalAttrs --- pkgs/by-name/dm/dms-shell/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index a9ad173a1c62..deba3b5218bd 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -9,25 +9,25 @@ bashNonInteractive, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "dms-shell"; version = "0.6.2"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "DankMaterialShell"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dLbiTWsKoF0if/Wqet/+L90ILdAaBqp+REGOou8uH3k="; }; - sourceRoot = "${src.name}/core"; + sourceRoot = "${finalAttrs.src.name}/core"; vendorHash = "sha256-nc4CvEPfJ6l16/zmhnXr1jqpi6BeSXd3g/51djbEfpQ="; ldflags = [ "-w" "-s" - "-X main.Version=${version}" + "-X main.Version=${finalAttrs.version}" ]; subPackages = [ "cmd/dms" ]; @@ -39,11 +39,11 @@ buildGoModule rec { postInstall = '' mkdir -p $out/share/quickshell - cp -r ${src}/quickshell $out/share/quickshell/dms + cp -r ${finalAttrs.src}/quickshell $out/share/quickshell/dms wrapProgram $out/bin/dms --add-flags "-c $out/share/quickshell/dms" - install -Dm644 ${src}/quickshell/assets/systemd/dms.service \ + install -Dm644 ${finalAttrs.src}/quickshell/assets/systemd/dms.service \ $out/lib/systemd/user/dms.service substituteInPlace $out/lib/systemd/user/dms.service \ --replace-fail /usr/bin/dms $out/bin/dms \ @@ -65,10 +65,10 @@ buildGoModule rec { meta = { description = "Desktop shell for wayland compositors built with Quickshell & GO"; homepage = "https://danklinux.com"; - changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}"; + changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luckshiba ]; mainProgram = "dms"; platforms = lib.platforms.linux; }; -} +}) From 72cfb60a36ea91de28abce87053fac6de8a68d5f Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Fri, 5 Dec 2025 18:09:34 +0100 Subject: [PATCH 3/3] dsearch: switch to finalAttrs --- pkgs/by-name/ds/dsearch/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ds/dsearch/package.nix b/pkgs/by-name/ds/dsearch/package.nix index a6d3b8348a0e..18056b4016db 100644 --- a/pkgs/by-name/ds/dsearch/package.nix +++ b/pkgs/by-name/ds/dsearch/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "dsearch"; version = "0.0.7"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "danksearch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rtfymtzsxEuto1mOm8A5ubREJzXKCai6dw9Na1Fa21Q="; }; @@ -22,7 +22,7 @@ buildGoModule rec { ldflags = [ "-w" "-s" - "-X main.Version=${version}" + "-X main.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -45,10 +45,10 @@ buildGoModule rec { meta = { description = "Fast, configurable filesystem search with fuzzy matching"; homepage = "https://github.com/AvengeMedia/danksearch"; - changelog = "https://github.com/AvengeMedia/danksearch/releases/tag/v${version}"; + changelog = "https://github.com/AvengeMedia/danksearch/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luckshiba ]; mainProgram = "dsearch"; platforms = lib.platforms.unix; }; -} +})