From d6d6d6030d4a2c1c3e01adf0676ad5f8b1bf1241 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 25 May 2020 21:07:23 -0700 Subject: [PATCH 1/5] maintainers: add bsima --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7ee7128513..cc25f9e37c0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1127,6 +1127,12 @@ githubId = 5525646; name = "Brice Waegeneire"; }; + bsima = { + email = "ben@bsima.me"; + github = "bsima"; + githubId = 200617; + name = "Ben Sima"; + }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; From 5303493efc24660810924ba6040b99a5a5c4782f Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 25 May 2020 21:07:42 -0700 Subject: [PATCH 2/5] shen-sources: init at 22.3 --- .../interpreters/shen-sources/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/interpreters/shen-sources/default.nix diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix new file mode 100644 index 00000000000..42376689f54 --- /dev/null +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + name = "shen-sources-${version}"; + version = "22.3"; + + src = fetchurl { + url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz"; + sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q"; + }; + + buildInputs = []; + buildPhase = ""; + installPhase = '' + mkdir -p $out + cp . $out -R + ''; + + meta = with stdenv.lib; { + homepage = https://shenlanguage.org; + description = "Source code for the Shen Language"; + platforms = platforms.linux; + maintainers = with maintainers; [ bsima ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062e5bc97bc..13c076812ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6587,6 +6587,8 @@ in schema2ldif = callPackage ../tools/text/schema2ldif { }; + shen-sources = callPackage ../development/interpreters/shen-sources { }; + shocco = callPackage ../tools/text/shocco { }; shopify-themekit = callPackage ../development/web/shopify-themekit { }; From 12ce76d7a55112754e8fe9d50afcee59bb9955cc Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 25 May 2020 21:26:39 -0700 Subject: [PATCH 3/5] shen-sbcl: init at 3.0.3 --- .../interpreters/shen-sbcl/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/interpreters/shen-sbcl/default.nix diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix new file mode 100644 index 00000000000..55389d9b71d --- /dev/null +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, shen-sources +, sbcl +}: + +stdenv.mkDerivation rec { + name = "shen-sbcl-${version}"; + version = "3.0.3"; + src = fetchurl { + url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz"; + sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz"; + }; + buildInputs = [ + sbcl shen-sources + ]; + buildPhase = '' + ln -s ${shen-sources} kernel + make sbcl + ''; + installPhase = '' + mkdir -p $out + install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl + ''; + meta = with stdenv.lib; { + homepage = https://shenlanguage.org; + description = "Port of Shen running on Steel Bank Common Lisp"; + platforms = platforms.linux; + maintainers = with maintainers; [ bsima ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13c076812ff..945bb3196c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6587,6 +6587,8 @@ in schema2ldif = callPackage ../tools/text/schema2ldif { }; + shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; + shen-sources = callPackage ../development/interpreters/shen-sources { }; shocco = callPackage ../tools/text/shocco { }; From eaa851c41f0802a80317010da51a4d9e3104b644 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 29 May 2020 12:07:53 -0700 Subject: [PATCH 4/5] shen-sbcl: set platforms to same as sbcl See https://github.com/NixOS/nixpkgs/pull/88915#issuecomment-636138041 --- pkgs/development/interpreters/shen-sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 55389d9b71d..6d10669d20d 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://shenlanguage.org; description = "Port of Shen running on Steel Bank Common Lisp"; - platforms = platforms.linux; + platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; }; From 976d2e5c0d3afd23c0a7c1c7a98253fdf912719f Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 29 May 2020 12:08:29 -0700 Subject: [PATCH 5/5] shen-sources: set platforms to all See https://github.com/NixOS/nixpkgs/pull/88915#issuecomment-636138041 --- pkgs/development/interpreters/shen-sources/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix index 42376689f54..f35631daa28 100644 --- a/pkgs/development/interpreters/shen-sources/default.nix +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://shenlanguage.org; description = "Source code for the Shen Language"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; };