From d63c7ae7c7c8094b29a1b8478d819b5162bd00cf Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 24 Mar 2025 15:15:23 +0530 Subject: [PATCH] cosmic-packages: remove recursion --- pkgs/by-name/co/cosmic-applibrary/package.nix | 7 ++++--- pkgs/by-name/co/cosmic-edit/package.nix | 8 ++++---- pkgs/by-name/co/cosmic-idle/package.nix | 7 ++++--- pkgs/by-name/co/cosmic-notifications/package.nix | 6 +++--- pkgs/by-name/co/cosmic-osd/package.nix | 6 +++--- pkgs/by-name/co/cosmic-player/package.nix | 6 +++--- pkgs/by-name/co/cosmic-screenshot/package.nix | 6 +++--- pkgs/by-name/co/cosmic-settings-daemon/package.nix | 6 +++--- pkgs/by-name/co/cosmic-store/package.nix | 6 +++--- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 1c4e3666426c..a6fca5a62349 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -7,14 +7,15 @@ just, nix-update-script, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; - tag = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-hJOM5dZdLq6uYfhfspZzpbHgUOK/FWuIXuFPoisS8DU="; }; @@ -62,4 +63,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; mainProgram = "cosmic-app-library"; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 3a53f09a991e..f9077e2c283c 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -18,14 +18,14 @@ vulkan-loader, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; - rev = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-mKVZI/x8+LrwFHGnJOzOq/vFkGev7sM9xJQOTA7uZGA="; }; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made env.VERGEN_GIT_COMMIT_DATE = "2025-02-20"; - env.VERGEN_GIT_SHA = src.rev; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" @@ -95,4 +95,4 @@ rustPlatform.buildRustPackage rec { ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index ef647949aa8b..3bf2c64eb330 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -12,14 +12,15 @@ bash, nix-update-script, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-idle"; - tag = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-hORU+iMvWA4XMSWmzir9EwjpLK5vOLR8BgMZz+aIZ4U="; }; @@ -65,4 +66,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 178694623136..99a85f7ee6a7 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -14,14 +14,14 @@ intltool, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; - rev = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-d6bAiRSO2opKSZfadyQYrU9oIrXwPNzO/g2E2RY6q04="; }; @@ -70,4 +70,4 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index d251c6b88758..745f86f03891 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -8,14 +8,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; - tag = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-ezOeRgqI/GOWFknUVZI7ZLEy1GYaBI+/An83HWKL6ho="; }; @@ -51,4 +51,4 @@ rustPlatform.buildRustPackage rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index ad93070244b0..4dc39cf83dfb 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -15,14 +15,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; - tag = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-Ebjj+C+yLCRomZy2W8mYDig1pv7aQcD3A9V2M53RM5U="; }; @@ -91,4 +91,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; mainProgram = "cosmic-player"; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index 6bca6d0c9c1c..df6a50a5ec12 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; - rev = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI="; }; @@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec { platforms = platforms.linux; mainProgram = "cosmic-screenshot"; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 19a65681bf07..48345bac9841 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -9,14 +9,14 @@ udev, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; - rev = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME="; }; @@ -46,4 +46,4 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index dd8045df753d..e096b9cc2d03 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -12,14 +12,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; - tag = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-ce7PaHBhRFUoujAS6j10XWbD2PxzK6XXIk/ENclT1iY="; }; @@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec { ]; platforms = lib.platforms.linux; }; -} +})