From 686fce87800b3ba3ab039ba61136e8752c2b6e91 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 7 Aug 2024 01:28:00 +0200 Subject: [PATCH 1/2] jsawk: remove Upstream is dead and unmaintained since it was introduced in nixpkgs. --- pkgs/tools/text/jsawk/default.nix | 29 ----------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/tools/text/jsawk/default.nix diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix deleted file mode 100644 index 9547e65dc43d..000000000000 --- a/pkgs/tools/text/jsawk/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_102 }: - -stdenv.mkDerivation { - pname = "jsawk"; - version = "1.5-pre"; - src = fetchFromGitHub { - owner = "micha"; - repo = "jsawk"; - rev = "5a14c4af3c7b59807701b70a954ecefc6f77e978"; - sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr"; - }; - dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out/bin - cp $src/jsawk $out/bin/ - wrapProgram $out/bin/jsawk \ - --prefix PATH : "${spidermonkey_102}/bin" - ''; - - meta = { - description = "Like awk, but for JSON"; - mainProgram = "jsawk"; - homepage = "https://github.com/micha/jsawk"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ puffnfresh ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e831bd025759..94cccc0943c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -689,6 +689,7 @@ mapAliases ({ jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 join-desktop = throw "'join-desktop' has been removed because it is unmaintained upstream"; # Added 2023-10-04 + jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbc717638f52..a0bcc33bd2a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9221,8 +9221,6 @@ with pkgs; jrnl = callPackage ../applications/misc/jrnl { }; - jsawk = callPackage ../tools/text/jsawk { }; - jsbeautifier = with python3Packages; toPythonApplication jsbeautifier; jscoverage = callPackage ../development/tools/misc/jscoverage { }; From a93bc09c27cd9e8c80428c3ca1faeab0fd218193 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 7 Aug 2024 01:29:06 +0200 Subject: [PATCH 2/2] spidermonkey_102: remove EOL since 2023/09 --- pkgs/development/interpreters/spidermonkey/102.nix | 4 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/102.nix diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix deleted file mode 100644 index ae60e0206789..000000000000 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "102.15.1"; - hash = "sha512-vbZrT7ViKvPmBYCjvNRk2Y7xPLONasbJ5fwEblZ6ADzwgBJdd0iVDJHEQv3l6AJMUMQYDS9VGqNSgWCjwFrhhw=="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 94cccc0943c1..70fecb5f6a53 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1401,6 +1401,7 @@ mapAliases ({ spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 + spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0bcc33bd2a1..0ea27ae85807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17128,9 +17128,6 @@ with pkgs; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { inherit (darwin) libobjc; }; - spidermonkey_102 = callPackage ../development/interpreters/spidermonkey/102.nix { - inherit (darwin) libobjc; - }; spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { inherit (darwin) libobjc; };