lispPackages.quicklisp: distinfo 2021-02-28 -> 2021-04-11,

quicklispPackages: regenerate,
lispPackages.nyxt: 2021-03-27 -> 2021-05-06, use upstream Makefile

1 files changed, 16 insertions, 6 deletions

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 927254f52ae..82a86404ca5 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "https://beta.quicklisp.org/dist/quicklisp/2021-02-28/distinfo.txt";
-        sha256 = "sha256:1apc0s07fmm386rj866dbrhrkq3lrbgbd79kwcyp91ix7sza8z3z";
+        url = "https://beta.quicklisp.org/dist/quicklisp/2021-04-11/distinfo.txt";
+        sha256 = "sha256:1z7a7m9cm7iv4m9ajvyqphsw30s3qwb0l8g8ayfmkvmvhlj79g86";
       };
       buildPhase = "true; ";
       postInstall = ''
@@ -124,7 +124,7 @@ let lispPackages = rec {
   };
   nyxt = pkgs.lispPackages.buildLispPackage rec {
     baseName = "nyxt";
-    version = "2021-03-27";
+    version = "2021-05-06";
 
 
     description = "Browser";
@@ -132,6 +132,14 @@ let lispPackages = rec {
     overrides = x: {
       postInstall = ''
         echo "Building nyxt binary"
+        (
+          source "$out/lib/common-lisp-settings"/*-shell-config.sh
+          cd "$out/lib/common-lisp"/*/
+          makeFlags="''${makeFlags:-}"
+          make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags all
+          make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags install
+          cp nyxt "$out/bin/nyxt"
+        )
         NIX_LISP_PRELAUNCH_HOOK='
           nix_lisp_build_system nyxt/gtk-application \
            "(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \
@@ -181,13 +189,15 @@ let lispPackages = rec {
             fset
             cl-cffi-gtk
             cl-webkit2
+            cl-gobject-introspection
     ];
     src = pkgs.fetchFromGitHub {
       owner = "atlas-engineer";
       repo = "nyxt";
-      rev = "8ef171fd1eb62d168defe4a2d7115393230314d1";
-      sha256 = "sha256:1dz55mdmj68kmllih7ab70nmp0mwzqp9lh3im7kcjfmc1r64irdv";
-      # date = 2021-03-27T09:10:00+00:00;
+      rev = "940a5f9a19770771cf29f8fa7505e99c3a242b67";
+      sha256 = "sha256:0d5mawka26gwi9nb45x1n33vgskwyn46jrvfz7nzmm2jfaq4ipn6";
+      # Version 2 pre-release 7
+      # date = "2021-05-06T11:30:27Z";
     };
 
     packageName = "nyxt";