From 048001f32311322da793395f2a1f900bee83aa2c Mon Sep 17 00:00:00 2001 From: Michal Atlas Date: Fri, 14 Jun 2024 02:38:45 +0200 Subject: [PATCH 1/4] sbclPackages.misc-extensions: 20150608 -> 4.0.3 --- pkgs/development/lisp-modules/packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 90caed15cb69..307bd90dd72e 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -882,6 +882,17 @@ let meta.mainProgram = "qlot"; }; + misc-extensions = super.misc-extensions.overrideLispAttrs (old: rec { + version = "4.0.3"; + src = pkgs.fetchFromGitLab { + domain = "gitlab.common-lisp.net"; + owner = "misc-extensions"; + repo = "misc-extensions"; + rev = "v${version}"; + hash = "sha256-bDNI4mIaNw/rf7ZwvwolKo6+mUUxsgubGUd/988sHAo="; + }; + }); + }); in packages From 96d481a0656cba9b2a2a8031feec0e073f7e8113 Mon Sep 17 00:00:00 2001 From: Michal Atlas Date: Fri, 14 Jun 2024 02:39:37 +0200 Subject: [PATCH 2/4] sbclPackages.fset: 20200925 -> 1.4.0 --- pkgs/development/lisp-modules/packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 307bd90dd72e..480b304ca221 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -893,6 +893,26 @@ let }; }); + fset = super.fset.overrideLispAttrs (old: rec { + version = "1.4.0"; + src = pkgs.fetchFromGitHub { + owner = "slburson"; + repo = "fset"; + rev = "v${version}"; + hash = "sha256-alO8Ek5Xpyl5N99/LgyIZ50aoRbY7bKh3XBntFV6Q5k="; + }; + lispLibs = with super; [ + self.misc-extensions + mt19937 + named-readtables + ]; + meta = { + description = "functional collections library"; + homepage = "https://gitlab.common-lisp.net/fset/fset/-/wikis/home"; + license = pkgs.lib.licenses.llgpl21; + }; + }); + }); in packages From 00998ce02c5c0a445ff09ac4ca4ede6134cae7f0 Mon Sep 17 00:00:00 2001 From: Michal Atlas Date: Fri, 14 Jun 2024 02:40:10 +0200 Subject: [PATCH 3/4] sbclPackages.coalton: init --- pkgs/development/lisp-modules/packages.nix | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 480b304ca221..930ee786d7b2 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -913,6 +913,33 @@ let }; }); + coalton = build-asdf-system { + pname = "coalton"; + version = "trunk"; + src = pkgs.fetchFromGitHub { + owner = "coalton-lang"; + repo = "coalton"; + rev = "05111b8a59e3f7346b175ce1ec621bff588e1e1f"; + hash = "sha256-L9o7Y3zDx9qLXGe/70c1LWEKUWsSRgBQru66mIuaCFw="; + }; + lispLibs = with super; [ + alexandria + eclector-concrete-syntax-tree + fiasco + float-features + self.fset + named-readtables + trivial-garbage + ]; + nativeLibs = [ pkgs.mpfr ]; + systems = [ "coalton" "coalton/tests" ]; + meta = { + description = "statically typed functional programming language that supercharges Common Lisp"; + homepage = "https://coalton-lang.github.io"; + license = pkgs.lib.licenses.mit; + }; + }; + }); in packages From 28e2d04cf05a65dc20e1d150d5affd6c97bde60e Mon Sep 17 00:00:00 2001 From: Michal Atlas Date: Fri, 14 Jun 2024 04:34:40 +0200 Subject: [PATCH 4/4] nyxt.cl-gobject-introspection: update to fix Upstream explicitly fixes compatibility with the newest SBCL --- pkgs/development/lisp-modules/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 930ee786d7b2..7afc6cb87137 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -419,8 +419,8 @@ let src = pkgs.fetchFromGitHub { owner = "andy128k"; repo = "cl-gobject-introspection"; - rev = "83beec4492948b52aae4d4152200de5d5c7ac3e9"; - sha256 = "sha256-g/FwWE+Rzmzm5Y+irvd1AJodbp6kPHJIFOFDPhaRlXc="; + rev = "4908a84c16349929b309c50409815ff81fb9b3c4"; + sha256 = "sha256-krVU5TQsVAbglxXMq29WJriWBIgQDLy1iCvB5iNziEc="; };})) (cl-webkit2.overrideAttrs (final: prev: { src = pkgs.fetchFromGitHub {