From 75c12612e36961ddb06eb7418e8ddbb5a787242e Mon Sep 17 00:00:00 2001
From: Colin King <colin@mercury.co>
Date: Mon, 17 Feb 2025 10:06:32 -0600
Subject: [PATCH 1/3] maintainers: add hakujin

Adds hakujin (Colin King) to maintainers.
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dda73802e1e0..6bc3c20f76c7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9019,6 +9019,12 @@
     githubId = 1498782;
     name = "Jesse Haber-Kucharsky";
   };
+  hakujin = {
+    email = "colin@hakuj.in";
+    github = "hakujin";
+    githubId = 2192042;
+    name = "Colin King";
+  };
   hamburger1984 = {
     email = "hamburger1984@gmail.com";
     github = "hamburger1984";

From 92638efdc4e96a2d004477f6fdd02d475d24ea31 Mon Sep 17 00:00:00 2001
From: Colin King <colin@mercury.co>
Date: Mon, 17 Feb 2025 10:10:17 -0600
Subject: [PATCH 2/3] shen-sbcl: 3.0.3 -> 39.1

Migrates to the new "S"-style Shen kernels which brings with them a new
build system. Removes the (now deprecated) shen-sources package.
---
 pkgs/by-name/sh/shen-sbcl/package.nix    | 49 ++++++++++++------------
 pkgs/by-name/sh/shen-sources/package.nix | 31 ---------------
 2 files changed, 25 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/by-name/sh/shen-sources/package.nix

diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix
index fac033bcf2e4..71a975b1413c 100644
--- a/pkgs/by-name/sh/shen-sbcl/package.nix
+++ b/pkgs/by-name/sh/shen-sbcl/package.nix
@@ -1,43 +1,44 @@
 {
   lib,
-  stdenv,
-  fetchurl,
-  shen-sources,
+  stdenvNoCC,
+  fetchzip,
   sbcl,
 }:
-
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "shen-sbcl";
-  version = "3.0.3";
+  version = "39.1";
 
-  src = fetchurl {
-    url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz";
-    sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz";
+  src = fetchzip {
+    url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip";
+    hash = "sha256-reN9avgYGYCMiA5BeHLhRK51liKF2ctqIgxf+4IWjVY=";
   };
 
   nativeBuildInputs = [ sbcl ];
+  dontStrip = true; # necessary to prevent runtime errors with sbcl
 
-  preBuild = ''
-    ln -s ${shen-sources} kernel
+  buildPhase = ''
+    runHook preBuild
+
+    sbcl --noinform --no-sysinit --no-userinit --load install.lsp
+
+    runHook postBuild
   '';
 
-  buildFlags = [ "build-sbcl" ];
-
-  checkTarget = "test-sbcl";
-
-  doCheck = true;
-
   installPhase = ''
-    install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
+    runHook preInstall
+
+    install -Dm755 sbcl-shen.exe $out/bin/shen-sbcl
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://shenlanguage.org";
     description = "Port of Shen running on Steel Bank Common Lisp";
-    changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md";
+    changelog = "https://shenlanguage.org/download.html#kernel";
     platforms = sbcl.meta.platforms;
-    maintainers = with maintainers; [ bsima ];
-    broken = true;
-    license = licenses.bsd3;
+    maintainers = with lib.maintainers; [ bsima ];
+    license = lib.licenses.bsd3;
+    mainProgram = "shen-sbcl";
   };
-}
+})
diff --git a/pkgs/by-name/sh/shen-sources/package.nix b/pkgs/by-name/sh/shen-sources/package.nix
deleted file mode 100644
index 595467dbe635..000000000000
--- a/pkgs/by-name/sh/shen-sources/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "shen-sources";
-  version = "22.4";
-
-  src = fetchurl {
-    url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz";
-    sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp . $out -R
-  '';
-
-  meta = with lib; {
-    homepage = "https://shenlanguage.org";
-    description = "Source code for the Shen Language";
-    changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ bsima ];
-    license = licenses.bsd3;
-  };
-}

From 8eb34667207004c8bd5d4a3a8b24ff8d23340fbe Mon Sep 17 00:00:00 2001
From: Colin King <colin@mercury.co>
Date: Mon, 17 Feb 2025 10:11:28 -0600
Subject: [PATCH 3/3] shen-sbcl: add hakujin as maintainer

Adds hakujin (Colin King) as a maintainer for `shen-sbcl`.
---
 pkgs/by-name/sh/shen-sbcl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix
index 71a975b1413c..281b43810ecb 100644
--- a/pkgs/by-name/sh/shen-sbcl/package.nix
+++ b/pkgs/by-name/sh/shen-sbcl/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Port of Shen running on Steel Bank Common Lisp";
     changelog = "https://shenlanguage.org/download.html#kernel";
     platforms = sbcl.meta.platforms;
-    maintainers = with lib.maintainers; [ bsima ];
+    maintainers = with lib.maintainers; [ hakujin ];
     license = lib.licenses.bsd3;
     mainProgram = "shen-sbcl";
   };