movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-19 16:09:19 +03:00
Code Activity

catppuccin-fcitx5: merge with fcitx5-catppuccin

Browse source 
they are the same package
This commit is contained in:
jopejoe1 2024-06-19 20:27:23 +02:00
parent a9c4ba3169
commit 6f52adb1fe
3 changed files with 8 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/by-name/ca/catppuccin-fcitx5/package.nix
View file

@ -2,6 +2,7 @@
lib, lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
unstableGitUpdater,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "catppuccin-fcitx5"; pname = "catppuccin-fcitx5";
@ -14,6 +15,9 @@ stdenvNoCC.mkDerivation {
hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps="; hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps=";
}; };
dontConfigure = true;
dontBuild = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/share/fcitx5 mkdir -p $out/share/fcitx5
@ -21,11 +25,13 @@ stdenvNoCC.mkDerivation {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = unstableGitUpdater { };
meta = { meta = {
description = "Soothing pastel theme for Fcitx5"; description = "Soothing pastel theme for Fcitx5";
homepage = "https://github.com/catppuccin/fcitx5"; homepage = "https://github.com/catppuccin/fcitx5";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pluiedev ]; maintainers = with lib.maintainers; [ pluiedev Guanran928 ];
platforms = lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

39
pkgs/by-name/fc/fcitx5-catppuccin/package.nix
View file

@ -1,39 +0,0 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
unstableGitUpdater,
}:
stdenvNoCC.mkDerivation {
pname = "fcitx5-catppuccin";
version = "0-unstable-2022-10-05";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "fcitx5";
rev = "ce244cfdf43a648d984719fdfd1d60aab09f5c97";
hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/fcitx5/themes
cp -r src/catppuccin-* $out/share/fcitx5/themes
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "Soothing pastel theme for Fcitx5";
homepage = "https://github.com/catppuccin/fcitx5";
license = licenses.mit;
maintainers = with maintainers; [ Guanran928 ];
platforms = platforms.all;
};
}

1
pkgs/top-level/aliases.nix
View file

@ -376,6 +376,7 @@ mapAliases ({
faustStk = faustPhysicalModeling; # Added 2023-05-16 faustStk = faustPhysicalModeling; # Added 2023-05-16
fastnlo = fastnlo-toolkit; # Added 2021-04-24 fastnlo = fastnlo-toolkit; # Added 2021-04-24
fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
inherit (luaPackages) fennel; # Added 2022-09-24 inherit (luaPackages) fennel; # Added 2022-09-24
fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
FIL-plugins = fil-plugins; # Added 2024-06-12 FIL-plugins = fil-plugins; # Added 2024-06-12