st-snazzy: rename from siduck76-st

NixOS · Dec 11, 2024 · e24bc48 · e24bc48
1 parent e7ef39d
commit e24bc48
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 53 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -113,6 +113,8 @@
 - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).
   `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable.
 
+- `siduck76-st` has been renamed to `st-snazzy`, like the project's [flake](https://github.com/siduck/st/blob/main/flake.nix).
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## 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
diff --git a/pkgs/by-name/st/st-snazzy/package.nix 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";
+
+  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
@@ -1163,6 +1163,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-11-30
   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
@@ -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;