gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #321363 from Uthar/quicklisp-2023-10

Browse Source 
lisp-modules: update imported packages to October 2023 Quicklisp release
This commit is contained in:
7c6f434c
2024-06-23 14:01:18 +00:00
committed by GitHub
parent d0f5c867a5 131cdc5d2d
commit 30a039c9ad
4 changed files with 3710 additions and 3253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/lisp-modules/imported.nix
+3595 -3101
View File
File diff suppressed because it is too large Load Diff
pkgs/development/lisp-modules/nix-cl.nix
+12 -4
View File
@@ -215,18 +215,26 @@ let
# save-lisp-and-die binaries in the past
dontStrip = true;
} // (args // {
} // (args // (let
isJVM = args.pkg.pname == "abcl";
javaLibs = lib.optionals isJVM args.javaLibs or [];
in {
pname = "${args.pkg.pname}-${args.pname}";
src = if builtins.length (args.patches or []) > 0
then pkgs.applyPatches { inherit (args) src patches; }
src = if args?patches || args?postPatch
then pkgs.applyPatches {
inherit (args) src;
patches = args.patches or [];
postPatch = args.postPatch or "";
}
else args.src;
patches = [];
inherit javaLibs;
propagatedBuildInputs = args.propagatedBuildInputs or []
++ lispLibs ++ javaLibs ++ nativeLibs;
meta = (args.meta or {}) // {
maintainers = args.meta.maintainers or lib.teams.lisp.members;
};
})) // {
}))) // {
# Useful for overriding
# Overriding code would prefer to use pname from the attribute set
# However, pname is extended with the implementation name
pkgs/development/lisp-modules/packages.nix
+91 -147
View File
@@ -43,46 +43,12 @@ let
src = build;
});
# A little hacky
isJVM = spec.pkg.pname == "abcl";
# Makes it so packages imported from Quicklisp can be re-used as
# lispLibs ofpackages in this file.
ql = quicklispPackagesFor spec;
packages = ql.overrideScope (self: super: {
cffi = let
jna = pkgs.fetchMavenArtifact {
groupId = "net.java.dev.jna";
artifactId = "jna";
version = "5.9.0";
sha256 = "0qbis8acv04fi902qzak1mbagqaxcsv2zyp7b8y4shs5nj0cgz7a";
};
in build-asdf-system {
src = pkgs.fetchzip {
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
sha256 = "17ryim4xilb1rzxydfr7595dnhqkk02lmrbkqrkvi9091shi4cj3";
};
version = "0.24.1";
pname = "cffi";
lispLibs = with super; [
alexandria
babel
trivial-features
];
javaLibs = optionals isJVM [ jna ];
};
cffi-libffi = build-asdf-system {
inherit (super.cffi-libffi) pname version asds lispLibs nativeLibs nativeBuildInputs;
src = pkgs.fetchzip {
url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz";
sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2";
};
patches = optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ];
};
cl-environments = super.cl-environments.overrideLispAttrs (old: {
patches = old.patches or [] ++ [
# Needed because SB-INT:TRULY-DYNAMIC-EXTENT has been removed since sbcl 2.3.10.
@@ -95,19 +61,27 @@ let
});
cl-unicode = build-with-compile-into-pwd {
pname = "cl-unicode";
version = "0.1.6";
src = pkgs.fetchzip {
url = "https://github.com/edicl/cl-unicode/archive/refs/tags/v0.1.6.tar.gz";
sha256 = "0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza";
};
systems = [ "cl-unicode" ];
lispLibs = with super; [
cl-ppcre
flexi-streams
];
inherit (super.cl-unicode) pname version src systems;
lispLibs = super.cl-unicode.lispLibs ++ [ self.flexi-streams ];
};
dissect = super.dissect.overrideAttrs {
version = "1.0.0-trunk";
src = pkgs.fetchFromGitHub {
owner = "Shinmera";
repo = "dissect";
rev = "a70cabcd748cf7c041196efd711e2dcca2bbbb2c";
hash = "sha256-WXv/jbokgKJTc47rBjvOF5npnqDlsyr8oSXIzN/7ofo=";
};
};
cl-gobject-introspection = super.cl-gobject-introspection.overrideLispAttrs (o: {
postPatch = ''
substituteInPlace src/init.lisp \
--replace sb-ext::set-floating-point-modes sb-int:set-floating-point-modes
'';
});
jzon = super.com_dot_inuoe_dot_jzon;
cl-notify = build-asdf-system {
@@ -129,19 +103,10 @@ let
inherit (super.cl-liballegro-nuklear) pname version src;
nativeBuildInputs = [ pkgs.allegro5 ];
nativeLibs = [ pkgs.allegro5 ];
lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ super.cl-liballegro ];
lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ];
patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ];
};
tuple = build-asdf-system {
pname = "tuple";
version = "b74bd067d";
src = pkgs.fetchzip {
url = "https://fossil.galkowski.xyz/tuple/tarball/b74bd067d4533ac0/tuple.tar.gz";
sha256 = "0dk356vkv6kwwcmc3j08x7143549m94rd66rpkzq8zkb31cg2va8";
};
};
lessp = build-asdf-system {
pname = "lessp";
version = "0.2-f8a9e4664";
@@ -167,7 +132,7 @@ let
url = "https://beta.quicklisp.org/archive/cl-facts/2022-11-06/cl-facts-20221106-git.tgz";
sha256 = "sha256-PBpyyJYkq1NjKK9VikSAL4TmrGRwUJlEWRSeKj/f4Sc=";
};
lispLibs = [ self.lessp self.rollback ] ++ [ super.local-time ];
lispLibs = [ self.lessp self.rollback self.local-time ];
};
cl-fuse = build-with-compile-into-pwd {
@@ -178,18 +143,43 @@ let
cl-containers = build-asdf-system {
inherit (super.cl-containers) pname version src;
lispLibs = super.cl-containers.lispLibs ++ [ super.moptilities ];
lispLibs = super.cl-containers.lispLibs ++ [ self.moptilities ];
systems = [ "cl-containers" "cl-containers/with-moptilities" ];
};
swank = build-with-compile-into-pwd {
inherit (super.swank) pname version src lispLibs;
swank = build-with-compile-into-pwd rec {
inherit (super.swank) pname lispLibs;
version = "2.29.1";
src = pkgs.fetchFromGitHub {
owner = "slime";
repo = "slime";
rev = "v${version}";
hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE=";
};
systems = [ "swank" "swank/exts" ];
patches = [ ./patches/swank-pure-paths.patch ];
postConfigure = ''
substituteAllInPlace swank-loader.lisp
'';
};
slynk = build-asdf-system {
pname = "slynk";
version = "trunk";
src = pkgs.fetchFromGitHub {
owner = "joaotavora";
repo = "sly";
rev = "ba40c8f054ec3b7040a6c36a1ef3e9596b936421";
hash = "sha256-hoaCZtyezuXptDPnAvBTT0SZ14M9Ifrmki3beBOwFmI=";
};
systems = [
"slynk" "slynk/arglists" "slynk/fancy-inspector"
"slynk/package-fu" "slynk/mrepl" "slynk/trace-dialog"
"slynk/profiler" "slynk/stickers" "slynk/indentation"
"slynk/retro"
];
};
cephes = build-with-compile-into-pwd {
inherit (super.cephes) pname version src lispLibs;
patches = [ ./patches/cephes-make.patch ];
@@ -205,7 +195,7 @@ let
url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz";
sha256 = "079hyp92cjkdfn6bhkxsrwnibiqbz4y4af6nl31lzw6nm91j5j37";
};
lispLibs = with super; [
lispLibs = with self; [
alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf
cl-store cl-vectors clx trivial-features zpb-ttf
];
@@ -241,14 +231,14 @@ let
lispLibs = [
self.cl-containers
self.nclasses
super.alexandria
super.calispel
super.closer-mop
super.lparallel
super.moptilities
super.serapeum
super.str
super.trivial-package-local-nicknames
self.alexandria
self.calispel
self.closer-mop
self.lparallel
self.moptilities
self.serapeum
self.str
self.trivial-package-local-nicknames
];
};
@@ -262,7 +252,7 @@ let
rev = version;
sha256 = "sha256-kw5DD0GJp/TeCiYATBY8GL8UKqYS6Q4j0a0eQsdcZRc=";
};
lispLibs = [ super.cl-json super.com_dot_inuoe_dot_jzon];
lispLibs = [ self.cl-json self.com_dot_inuoe_dot_jzon];
systems = [ "njson" "njson/cl-json" "njson/jzon"];
};
@@ -275,7 +265,7 @@ let
rev = version;
sha256 = "sha256-psk29WEA7Hxgp29oUniBNvI+lyZfMkdpa5A7okc6kKs=";
};
lispLibs = [ super.closer-mop ];
lispLibs = [ self.closer-mop ];
systems = [ "nsymbols" "nsymbols/star" ];
};
@@ -289,7 +279,7 @@ let
rev = version;
sha256 = "sha256-foXmaLxMYMFieB2Yd2iPsU4EX5kLXq7kyElqGZ47OgI=";
};
lispLibs = [ super.moptilities ];
lispLibs = [ self.moptilities ];
};
nfiles = build-asdf-system rec {
@@ -303,13 +293,13 @@ let
};
lispLibs = [
self.nclasses
super.quri
super.alexandria
super.iolib
super.serapeum
super.trivial-garbage
super.trivial-package-local-nicknames
super.trivial-types
self.quri
self.alexandria
self.iolib
self.serapeum
self.trivial-garbage
self.trivial-package-local-nicknames
self.trivial-types
];
};
@@ -361,7 +351,7 @@ let
pname = "nyxt";
version = "3.11.6";
lispLibs = (with super; [
lispLibs = (with self; [
alexandria
bordeaux-threads
calispel
@@ -407,44 +397,12 @@ let
cl-cffi-gtk
quri
sqlite
# TODO: Remove these overrides after quicklisp updates past the June 2023 release
(trivial-clipboard.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "snmsts";
repo = "trivial-clipboard";
rev = "f7b2c96fea00ca06a83f20b00b7b1971e76e03e7";
sha256 = "sha256-U6Y9BiM2P1t9P8fdX8WIRQPRWl2v2ZQuKdP1IUqvOAk=";
};}))
(cl-gobject-introspection.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "andy128k";
repo = "cl-gobject-introspection";
rev = "4908a84c16349929b309c50409815ff81fb9b3c4";
sha256 = "sha256-krVU5TQsVAbglxXMq29WJriWBIgQDLy1iCvB5iNziEc=";
};}))
(cl-webkit2.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "joachifm";
repo = "cl-webkit";
rev = "66fd0700111586425c9942da1694b856fb15cf41";
sha256 = "sha256-t/B9CvQTekEEsM/ZEp47Mn6NeZaTYFsTdRqclfX9BNg=";
};
}))
(slynk.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "joaotavora";
repo = "sly";
rev = "9c43bf65b967e12cef1996f1af5f0671d8aecbf4";
hash = "sha256-YlHZ/7VwvHe2PBPRshN+Gr3WuGK9MpkOJprP6QXI3pY=";
};
systems = [ "slynk" "slynk/arglists" "slynk/fancy-inspector"
"slynk/package-fu" "slynk/mrepl" "slynk/trace-dialog"
"slynk/profiler" "slynk/stickers" "slynk/indentation"
"slynk/retro" ];
}))
trivial-clipboard
cl-gobject-introspection
cl-webkit2
slynk
iterate
symbol-munger
]) ++ (with self; [
history-tree
nhooks
nkeymaps
@@ -455,16 +413,7 @@ let
nclasses
nfiles
cl-containers
# remove this override after quicklisp one is updated.
(swank.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "slime";
repo = "slime";
rev = "v2.29.1";
hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE=";
};
systems = [ "swank" "swank/exts" ];
}))
swank
]);
src = pkgs.fetchFromGitHub {
@@ -579,15 +528,6 @@ let
'';
});
ltk = super.ltk.overrideLispAttrs (o: {
src = pkgs.fetchzip {
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";
sha256 = "0mzikv4abq9yqlj6dsji1wh34mjizr5prv6mvzzj29z1485fh1bj";
};
version = "f19162e76";
});
magicl = build-with-compile-into-pwd {
inherit (super.magicl) pname version src lispLibs;
nativeBuildInputs = [ pkgs.gfortran ];
@@ -604,7 +544,7 @@ let
rev = "84b128192d6b11cf03f1150e474a23368f07edff";
hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
};
lispLibs = with super; [
lispLibs = with self; [
cl-gobject-introspection-wrapper
bordeaux-threads
];
@@ -619,7 +559,7 @@ let
rev = "84b128192d6b11cf03f1150e474a23368f07edff";
hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
};
lispLibs = with super; [
lispLibs = with self; [
cl-gobject-introspection-wrapper
];
};
@@ -633,9 +573,11 @@ let
rev = "e18f621b996fd986d9829d590203c690440dee64";
hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
};
lispLibs = with super; [
lispLibs = with self; [
cl-gobject-introspection-wrapper
] ++ [ self.cl-glib self.cl-glib_dot_gio ];
cl-glib
cl-glib_dot_gio
];
nativeBuildInputs = [
pkgs.gobject-introspection
pkgs.gtk4
@@ -654,9 +596,10 @@ let
rev = "e18f621b996fd986d9829d590203c690440dee64";
hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
};
lispLibs = with super; [
lispLibs = with self; [
cl-gobject-introspection-wrapper
] ++ [ self.cl-gtk4 ];
cl-gtk4
];
nativeBuildInputs = [
pkgs.libadwaita
];
@@ -674,9 +617,10 @@ let
rev = "e18f621b996fd986d9829d590203c690440dee64";
hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
};
lispLibs = with super; [
lispLibs = with self; [
cl-gobject-introspection-wrapper
] ++ [ self.cl-gtk4 ];
cl-gtk4
];
nativeBuildInputs = [
pkgs.webkitgtk_6_0
];
@@ -696,7 +640,7 @@ let
rev = "7d624253e98afb987a01729bd72c99bae02f0d7d";
hash = "sha256-AlTn+Q1gKnAFEfcnz9+VeHz681pPIirg2za3VXYiNWk=";
};
lispLibs = with super; [
lispLibs = with self; [
alexandria
babel
chipz
@@ -786,7 +730,7 @@ let
sha256 = "sha256-J08bU9HSVbzEivYtQsyIYPZJTrugj+jJSa4LglS0Olg=";
};
systems = [ "eu.turtleware.polyclot" "eu.turtleware.polyclot/demo" ];
lispLibs = with super; [ clim mcclim mcclim-layouts ];
lispLibs = with self; [ clim mcclim mcclim-layouts ];
};
kons-9 = build-asdf-system rec {
@@ -799,7 +743,7 @@ let
sha256 = "19rl7372j9f1cv2kl55r8vyf4dhcz4way4hkjgysbxzrb1psp17n";
};
systems = [ "kons-9" "kons-9/testsuite" ];
lispLibs = with super; [
lispLibs = with self; [
closer-mop trivial-main-thread trivial-backtrace cffi cl-opengl cl-glu
cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber
org_dot_melusina_dot_confidence
@@ -815,7 +759,7 @@ let
rev = "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094";
sha256 = "sha256-iBM+VXu6JRqGmeIFzfXbGot+elvangmfSpDB7DjFpPg";
};
lispLibs = [ super.alexandria ];
lispLibs = [ self.alexandria ];
};
nsb-cga = super.nsb-cga.overrideLispAttrs (oa: {
@@ -833,7 +777,7 @@ let
hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE=";
};
lispLibs = with super; [
lispLibs = with self; [
archive
deflate
dexador
pkgs/development/lisp-modules/ql.nix
+12 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, lib, build-asdf-system, ... }:
{ pkgs, lib, stdenv, build-asdf-system, ... }:
let
@@ -73,9 +73,20 @@ let
lla = super.lla.overrideLispAttrs (o: {
nativeLibs = [ pkgs.openblas ];
});
cffi = super.cffi.overrideLispAttrs (o: {
javaLibs = [
(pkgs.fetchMavenArtifact {
groupId = "net.java.dev.jna";
artifactId = "jna";
version = "5.9.0";
sha256 = "0qbis8acv04fi902qzak1mbagqaxcsv2zyp7b8y4shs5nj0cgz7a";
})
];
});
cffi-libffi = super.cffi-libffi.overrideLispAttrs (o: {
nativeBuildInputs = [ pkgs.libffi ];
nativeLibs = [ pkgs.libffi ];
patches = lib.optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ];
});
cl-rabbit = super.cl-rabbit.overrideLispAttrs (o: {
nativeBuildInputs = [ pkgs.rabbitmq-c ];