Unverified Commit 86f6cabb authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

cosmic-packages: remove recursion (#392668)

parents 3ad33507 d63c7ae7

pkgs/by-name/co/cosmic-applibrary/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -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";

  };

}
 
})

pkgs/by-name/co/cosmic-edit/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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;

  };

}
 
})

pkgs/by-name/co/cosmic-idle/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})

pkgs/by-name/co/cosmic-notifications/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

  };

}
 
})

pkgs/by-name/co/cosmic-osd/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

  };

}
 
})