diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 83ec8b2de680f..30c81cdb2529f 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -58,6 +58,8 @@ add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the vim plugin. +- `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 9159c1de0bf54..0000000000000 --- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix +++ /dev/null @@ -1,51 +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..1254f98013ba1 --- /dev/null +++ b/pkgs/by-name/st/st-snazzy/package.nix @@ -0,0 +1,29 @@ +{ 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 index 59273e85fb026..5f45290b5f3e6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1138,6 +1138,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 index 74a5c473a4ba6..60fb174ab550c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1579,7 +1579,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;