summaryrefslogtreecommitdiffstats
path: root/pkgs/development/lisp-modules
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/lisp-modules')
-rw-r--r--pkgs/development/lisp-modules/nix-cl.nix14
-rw-r--r--pkgs/development/lisp-modules/packages.nix12
2 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/development/lisp-modules/nix-cl.nix b/pkgs/development/lisp-modules/nix-cl.nix
index 3f45f58110e9..6c52e9254f37 100644
--- a/pkgs/development/lisp-modules/nix-cl.nix
+++ b/pkgs/development/lisp-modules/nix-cl.nix
@@ -145,9 +145,9 @@ let
...
} @ args:
- stdenv.mkDerivation (rec {
+ (stdenv.mkDerivation (rec {
inherit
- pname version nativeLibs javaLibs lispLibs systems asds
+ version nativeLibs javaLibs lispLibs systems asds
pkg program flags faslExt
;
@@ -216,6 +216,7 @@ let
dontStrip = true;
} // (args // {
+ pname = "${args.pkg.pname}-${args.pname}";
src = if builtins.length (args.patches or []) > 0
then pkgs.applyPatches { inherit (args) src patches; }
else args.src;
@@ -225,7 +226,14 @@ let
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
+ # Moreover, it is used in the default list of systems to load
+ # So we pass the original pname
+ pname = args.pname;
+ }));
# Build the set of lisp packages using `lisp`
# These packages are defined manually for one reason or another:
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 3ce3bc9e954d..bbe63b08d43c 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -232,13 +232,13 @@ let
prompter = build-asdf-system rec {
pname = "prompter";
- version = "0.1.1";
+ version = "20240108-git";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "prompter";
- rev = version;
- sha256 = "sha256-A9gIUBj0oUDFGR5aqHz+tdNR6t03LPMrx0n9qM3ACwE=";
+ rev = "7890ed5d02e70aba01ceb964c6ee4f40776e7dc0";
+ hash = "sha256-rRKtpSKAqfzvnlC3NQ4840RrlbBUpI4V6uX6p5hRJWQ=";
};
lispLibs = [
@@ -362,7 +362,7 @@ let
nyxt-gtk = build-asdf-system {
pname = "nyxt";
- version = "3.10.0";
+ version = "3.11.0";
lispLibs = (with super; [
alexandria
@@ -470,8 +470,8 @@ let
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nyxt";
- rev = "3.10.0";
- sha256 = "sha256-yEa5Lx1egkg9Jh3EQfvaBQicm31uxIq/3s2NOQUC4uc=";
+ rev = "3.11.0";
+ hash = "sha256-Nw2r3FdqwxHlq8CrZo7Z423xe0rR5zu+U4dDPdG880M=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];