From 634b10c1d151ab5620b4ce6f72ec4f4d366c3b21 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Jan 2026 00:14:01 +0100 Subject: [PATCH] bsh: add pname and version, also move to by-name --- pkgs/by-name/bs/bsh/package.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/bs/bsh/package.nix diff --git a/pkgs/by-name/bs/bsh/package.nix b/pkgs/by-name/bs/bsh/package.nix new file mode 100644 index 000000000000..c235d9323340 --- /dev/null +++ b/pkgs/by-name/bs/bsh/package.nix @@ -0,0 +1,9 @@ +{ fetchurl }: + +fetchurl (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}.jar"; + pname = "bsh"; + version = "2.0b5"; + url = "http://www.beanshell.org/bsh-${finalAttrs.version}.jar"; + hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 587d9273d9af..acec04ef9adc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1675,11 +1675,6 @@ with pkgs; bozohttpd-minimal = bozohttpd.override { minimal = true; }; - bsh = fetchurl { - url = "http://www.beanshell.org/bsh-2.0b5.jar"; - hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; - }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables ( haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix );