Unverified Commit 5314041f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #324528 from GaetanLepage/cosmic-tasks 

cosmic-tasks: 0-unstable-2024-04-30 -> 0.1.0 + rename to tasks
parents 015ea99a b7aa5733

pkgs/by-name/co/cosmic-tasks/Cargo.lock→pkgs/by-name/ta/tasks/Cargo.lock

+922 −751

File changed and moved.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/co/cosmic-tasks/package.nix→pkgs/by-name/ta/tasks/package.nix

+99 −0
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, pkg-config

, wrapGAppsHook3

, atk

, cairo

, gdk-pixbuf

, glib

, gtk3

, libsecret

, libxkbcommon

, openssl

, pango

, sqlite

, vulkan-loader

, stdenv

, darwin

, wayland

{

  lib,

  rustPlatform,

  fetchFromGitHub,

  pkg-config,

  wrapGAppsHook3,

  atk,

  cairo,

  gdk-pixbuf,

  glib,

  gtk3,

  libsecret,

  libxkbcommon,

  openssl,

  pango,

  sqlite,

  vulkan-loader,

  stdenv,

  wayland,

  nix-update-script,

}:



let

  commitDate = "2024-04-30";

in rustPlatform.buildRustPackage rec {

  pname = "cosmic-tasks";

  version = "0-unstable-${commitDate}";

rustPlatform.buildRustPackage rec {

  pname = "tasks";

  version = "0.1.0";



  src = fetchFromGitHub {

    owner = "edfloreshz";

    repo = "cosmic-tasks";

    rev = "020ae8633b23091f113b19f4b6f992e36404f2e2";

    hash = "sha256-ZPEzvscLYH4vJ+5Nh5J9m8ZX2jXXDMOLswSnHaCdSdA=";

    repo = "tasks";

    rev = "refs/tags/${version}";

    hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U=";

  };



  cargoLock = {
@@ -37,13 +36,13 @@ in rustPlatform.buildRustPackage rec { 
    outputHashes = {

      "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw=";

      "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";

      "clipboard_macos-0.1.0" = "sha256-KVcKQ4DtoZCgFBnejIaQfQxJJJxd/mFzHBI+4PbGBio=";

      "cosmic-config-0.1.0" = "sha256-VEE/1XQZaojz9gxTV/Zz++eVplsCfiDPgf/cAr2Rih8=";

      "cosmic-text-0.11.2" = "sha256-gUIQFHPaFTmtUfgpVvsGTnw2UKIBx9gl0K67KPuynWs=";

      "clipboard_macos-0.1.0" = "sha256-temNg+RdvquSLAdkwU5b6dtu9vZkXjnDASS/eJo2rz8=";

      "cosmic-config-0.1.0" = "sha256-dYxBp/2JkgFUtkcfzQieHS7MPf6GoOIxuCN/8AZraio=";

      "cosmic-text-0.11.2" = "sha256-O8l3Auo+7/aqPYvWQXpOdrVHHdjc1fjoU1nFxqdiZ5I=";

      "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";

      "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";

      "smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc=";

      "smithay-clipboard-0.8.0" = "sha256-LDd56TJ175qsj2/EV/dbBRV9HMU7RzgrG5JP7H2PmhE=";

      "smithay-clipboard-0.8.0" = "sha256-MqzynFCZvzVg9/Ry/zrbH5R6//erlZV+nmQ2St63Wnc=";

      "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";

      "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";

      "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
@@ -52,8 +51,8 @@ in 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 = commitDate;

  env.VERGEN_GIT_SHA = src.rev;

  env.VERGEN_GIT_COMMIT_DATE = "2024-07-03";

  env.VERGEN_GIT_SHA = "0e8c728c88a9cac1bac130eb083ca0fe58c7121d";



  nativeBuildInputs = [

    pkg-config
@@ -72,30 +71,29 @@ in rustPlatform.buildRustPackage rec { 
    pango

    sqlite

    vulkan-loader

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.AppKit

    darwin.apple_sdk.frameworks.CoreFoundation

    darwin.apple_sdk.frameworks.CoreGraphics

    darwin.apple_sdk.frameworks.CoreServices

    darwin.apple_sdk.frameworks.Foundation

    darwin.apple_sdk.frameworks.Metal

    darwin.apple_sdk.frameworks.QuartzCore

    darwin.apple_sdk.frameworks.Security

  ] ++ lib.optionals stdenv.isLinux [

    wayland

  ];



  postFixup = lib.optionalString stdenv.isLinux ''

    wrapProgram $out/bin/cosmic-tasks \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libxkbcommon wayland ]}"

  postFixup = ''

    wrapProgram $out/bin/tasks \

      --prefix LD_LIBRARY_PATH : "${

        lib.makeLibraryPath [

          libxkbcommon

          wayland

        ]

      }"

  '';



  passthru = {

    updateScript = nix-update-script { };

  };



  meta = with lib; {

    description = "Simple task management application for the COSMIC desktop";

    homepage = "https://github.com/edfloreshz/cosmic-tasks";

    homepage = "https://github.com/edfloreshz/tasks";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ GaetanLepage ];

    platforms = platforms.linux;

    mainProgram = "cosmic-tasks";

    mainProgram = "tasks";

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ mapAliases ({ 
  composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08

  cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12

  coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27

  cosmic-tasks = tasks; # Added 2024-07-04

  cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15

  crispyDoom = crispy-doom; # Added 2023-05-01

  cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22