From b00353dc5a95b5956730f997db819c66529f51f6 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 15 Jun 2025 18:34:09 +0200 Subject: [PATCH] colorstorm: drop colorstorm is being rewritten from Zig to Go it has no maintainer in nixpkgs and was previously patched to build with more recent zig versions --- .../co/colorstorm/0001-fix-segfault.patch | 12 ------ pkgs/by-name/co/colorstorm/package.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/by-name/co/colorstorm/0001-fix-segfault.patch delete mode 100644 pkgs/by-name/co/colorstorm/package.nix diff --git a/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch b/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch deleted file mode 100644 index af572eb75fb3..000000000000 --- a/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/templator.zig b/src/templator.zig -index 5630a04..0dc8ca7 100644 ---- a/src/templator.zig -+++ b/src/templator.zig -@@ -77,7 +77,6 @@ pub fn parse_themes(f: std.fs.File) ![]Theme { - } - - const parsed = try std.json.parseFromSlice([]Theme, a, list.items, .{}); -- defer parsed.deinit(); - const themes = parsed.value; - - return themes; diff --git a/pkgs/by-name/co/colorstorm/package.nix b/pkgs/by-name/co/colorstorm/package.nix deleted file mode 100644 index a665bd9ed557..000000000000 --- a/pkgs/by-name/co/colorstorm/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig_0_13, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "colorstorm"; - # last tagged release is three years old and requires outdated Zig 0.9 - # new release requested in: https://github.com/benbusby/colorstorm/issues/16 - version = "2.0.0-unstable-2025-01-17"; - - src = fetchFromGitHub { - owner = "benbusby"; - repo = "colorstorm"; - rev = "e645c4293fb5f72968038dac99e0b8dab3db194f"; - hash = "sha256-6D+aNcjJksv7E9RJB9fnzgzvGoUPXV4Shz5wLu5YHtg="; - }; - - patches = [ - # Fixes a use-after-free segfault. - # See https://github.com/benbusby/colorstorm/pull/15#discussion_r1930406581 - # and upstream PR https://github.com/NixOS/nixpkgs/pull/377279 - ./0001-fix-segfault.patch - ]; - - nativeBuildInputs = [ - zig_0_13.hook - ]; - - meta = { - description = "Color theme generator for editors and terminal emulators"; - homepage = "https://github.com/benbusby/colorstorm"; - license = lib.licenses.mit; - maintainers = [ ]; - inherit (zig_0_13.meta) platforms; - mainProgram = "colorstorm"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fd2041c53b25..1085366b3f1d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -453,6 +453,7 @@ mapAliases { CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19 + colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15 connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27 cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27