lisp-modules: use self instead of super when not overriding (1e453625) · Commits · nix / nixpkgs

pkgs/development/lisp-modules/packages.nix

+40 −37

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ 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 ];
		};

		@@ -132,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 {
		@@ -143,7 +143,7 @@ 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" ];
		};

		@@ -195,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
		];
		@@ -231,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
		];

		};
		@@ -252,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"];
		};

		@@ -265,7 +265,7 @@ let
		rev = version;
		sha256 = "sha256-psk29WEA7Hxgp29oUniBNvI+lyZfMkdpa5A7okc6kKs=";
		};
		lispLibs = [ super.closer-mop ];
		lispLibs = [ self.closer-mop ];
		systems = [ "nsymbols" "nsymbols/star" ];

		};
		@@ -279,7 +279,7 @@ let
		rev = version;
		sha256 = "sha256-foXmaLxMYMFieB2Yd2iPsU4EX5kLXq7kyElqGZ47OgI=";
		};
		lispLibs = [ super.moptilities ];
		lispLibs = [ self.moptilities ];
		};

		nfiles = build-asdf-system rec {
		@@ -293,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
		];
		};

		@@ -351,7 +351,7 @@ let
		pname = "nyxt";
		version = "3.11.6";

		lispLibs = (with super; [
		lispLibs = (with self; [
		alexandria
		bordeaux-threads
		calispel
		@@ -434,7 +434,6 @@ let
		}))
		iterate
		symbol-munger
		]) ++ (with self; [
		history-tree
		nhooks
		nkeymaps
		@@ -585,7 +584,7 @@ let
		rev = "84b128192d6b11cf03f1150e474a23368f07edff";
		hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
		};
		lispLibs = with super; [
		lispLibs = with self; [
		cl-gobject-introspection-wrapper
		bordeaux-threads
		];
		@@ -600,7 +599,7 @@ let
		rev = "84b128192d6b11cf03f1150e474a23368f07edff";
		hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
		};
		lispLibs = with super; [
		lispLibs = with self; [
		cl-gobject-introspection-wrapper
		];
		};
		@@ -614,9 +613,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
		@@ -635,9 +636,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
		];
		@@ -655,9 +657,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
		];
		@@ -677,7 +680,7 @@ let
		rev = "7d624253e98afb987a01729bd72c99bae02f0d7d";
		hash = "sha256-AlTn+Q1gKnAFEfcnz9+VeHz681pPIirg2za3VXYiNWk=";
		};
		lispLibs = with super; [
		lispLibs = with self; [
		alexandria
		babel
		chipz
		@@ -767,7 +770,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 {
		@@ -780,7 +783,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
		@@ -796,7 +799,7 @@ let
		rev = "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094";
		sha256 = "sha256-iBM+VXu6JRqGmeIFzfXbGot+elvangmfSpDB7DjFpPg";
		};
		lispLibs = [ super.alexandria ];
		lispLibs = [ self.alexandria ];
		};

		nsb-cga = super.nsb-cga.overrideLispAttrs (oa: {
		@@ -814,7 +817,7 @@ let
		hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE=";
		};

		lispLibs = with super; [
		lispLibs = with self; [
		archive
		deflate
		dexador

Admin message