From eea887fd23d6a9b7240d079d9238cd52ef9cb072 Mon Sep 17 00:00:00 2001 From: Pouya Abbassi Date: Sun, 1 Dec 2024 20:27:22 +0330 Subject: [PATCH 1/2] maintainers: add pouya --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/applications/terminal-emulators/st/siduck76-st.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e55b7c07349f8..2696ff51b9799 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18078,6 +18078,13 @@ github = "potb"; githubId = 10779093; }; + pouya = { + email = "me@pouyacode.net"; + github = "pouya-abbassi"; + githubId = 8519318; + name = "Pouya Abbasi"; + keys = [ { fingerprint = "8CC7 EB15 3563 4205 E9C2 AAD9 AF5A 5A4A D4FD 8797"; } ]; + }; poweredbypie = { name = "poweredbypie"; github = "poweredbypie"; diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix index d981ba481e59f..478c9b1ea7d58 100644 --- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix +++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/siduck76/st"; description = "Fork of st with many add-ons"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pouya ]; platforms = platforms.linux; }; } From dbe6cd859a9ef0c7f01a11b875bda257ea4f6634 Mon Sep 17 00:00:00 2001 From: Pouya Abbassi Date: Sun, 1 Dec 2024 20:30:12 +0330 Subject: [PATCH 2/2] st-snazzy: rename from siduck76-st --- .../manual/release-notes/rl-2505.section.md | 3 ++ .../terminal-emulators/st/siduck76-st.nix | 52 ------------------- pkgs/by-name/st/st-snazzy/package.nix | 47 +++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 51 insertions(+), 53 deletions(-) delete mode 100644 pkgs/applications/terminal-emulators/st/siduck76-st.nix create mode 100644 pkgs/by-name/st/st-snazzy/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index db753bbdf4ae4..3f1e22e8c2971 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -233,6 +233,9 @@ - `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start. +- `siduck76-st` has been renamed to `st-snazzy`, like the project's [flake](https://github.com/siduck/st/blob/main/flake.nix). + + ## Other Notable Changes {#sec-release-25.05-notable-changes} diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix deleted file mode 100644 index 478c9b1ea7d58..0000000000000 --- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fontconfig, - harfbuzz, - libX11, - libXext, - libXft, - ncurses, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "siduck76-st"; - version = "0.pre+unstable=2021-08-20"; - - src = fetchFromGitHub { - owner = "siduck76"; - repo = "st"; - rev = "c9bda1de1f3f94ba507fa0eacc96d6a4f338637f"; - hash = "sha256-5n+QkSlVhhku7adtl7TuWhDl3zdwFaXc7Ot1RaIN54A="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - fontconfig - harfbuzz - libX11 - libXext - libXft - ncurses - ]; - - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/siduck76/st"; - description = "Fork of st with many add-ons"; - license = licenses.mit; - maintainers = with maintainers; [ pouya ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/st/st-snazzy/package.nix b/pkgs/by-name/st/st-snazzy/package.nix new file mode 100644 index 0000000000000..2a947e1a81cd4 --- /dev/null +++ b/pkgs/by-name/st/st-snazzy/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fontconfig, + harfbuzz, + libX11, + libXft, + ncurses, + gd, + glib, + pkg-config, +}: + +stdenv.mkDerivation { + pname = "st-snazzy"; + version = "0.8.5-unstable-2024-09-06"; + + src = fetchFromGitHub { + owner = "siduck"; + repo = "st"; + rev = "a7582f96afdee6bf0793cd0d8f84b755fd6aabf6"; + hash = "sha256-wohkmDsm26kqFGQKuY6NuBQsifT7nZNgrLqLFsU+Vog="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXft + ncurses + gd + glib + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + env.TERMINFO = "${placeholder "out"}/share/terminfo"; + + meta = { + homepage = "https://github.com/siduck/st"; + description = "snazzy terminal (suckless + beautiful)"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pouya ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2b5d5afbf31f3..4e017dd8154fa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1183,6 +1183,7 @@ mapAliases { sexp = sexpp; # Added 2023-07-03 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shipyard = jumppad; # Added 2023-06-06 + siduck76-st = st-snazzy; # Added 2024-12-24 signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; shout = nodePackages.shout; # Added unknown; moved 2024-10-19 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7057e25505318..ed3751d5ef7d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1572,7 +1572,6 @@ with pkgs; }; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; - siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3;