Commit 0d84933b authored by Kasper Gałkowski's avatar Kasper Gałkowski Committed by Kasper Gałkowski
Browse files

sbcl.pkgs: update to Quicklisp dist from June 2023

parent 97e40605
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ in lib.makeScope pkgs.newScope (self: {")
   "clml.blas.hompack"
   ;; Fails on SBCL due to heap exhaustion
   "magicl"
   ;; Probably missing dependency in QL data
   "mcclim-bezier"
   ;; Missing dependency on c2ffi cffi extension
   "hu.dwim.zlib"
   ;; These require libRmath.so, but I don't know where to get it from
+5 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@
        ;; system name? This looks like it uses a lot of memory.
        (let ((systems
                (sql-query
                 "with pkg as (
                 "with pkgs as (
                    select
                      name, asd, url, deps,
                      ltrim(replace(prefix, r.project, ''), '-_') as version
@@ -128,10 +128,11 @@
                  select
                    name, version, asd, url,
                    (select json_group_array(
                       json_array(value, (select version from pkg where name=value))
                       json_array(value, (select version from pkgs where name=value))
                     )
                     from json_each(deps)) as deps
                  from pkg"
                     from json_each(deps)
                     where value <> 'asdf') as deps
                  from pkgs"
                 )))

          ;; First pass: insert system and source tarball informaton.
+3898 −2760

File changed.

Preview size limit exceeded, changes collapsed.

+54 −13
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ let
  };

  nasdf-unstable = build-asdf-system {
    inherit (super.nasdf) pname systems;
    pname = "nasdf";
    version = "20230524-git";
    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
@@ -334,7 +334,7 @@ let
  };

  njson_1_0_0 = build-asdf-system {
    inherit (super.njson) pname;
    pname = "njson";
    version = "1.0.0";
    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
@@ -347,7 +347,7 @@ let
  };

  nsymbols_0_3_1 = build-asdf-system {
    inherit (super.nsymbols) pname;
    pname = "nsymbols";
    version = "0.3.1";
    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
@@ -361,7 +361,7 @@ let
  };

  nclasses_0_5_0 = build-asdf-system {
    inherit (super.nclasses) pname systems;
    pname = "nclasses";
    version = "0.5.0";
    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
@@ -373,7 +373,7 @@ let
  };

  nfiles_1_1_2 = build-asdf-system {
    inherit (super.nfiles) pname systems;
    pname = "nfiles";
    version = "1.1.2";
    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
@@ -394,11 +394,49 @@ let
    ];
  };

  nhooks = build-asdf-system {
    pname = "nhooks";
    version = "20230214-git";
    src = pkgs.fetchzip {
      url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nhooks-20230214-git.tgz";
      sha256 = "0rapn9v942yd2snlskvlr1g22hmyhlsrclahxjsgn4pbvqc5gwyw";
    };
    lispLibs = with self; [ bordeaux-threads closer-mop serapeum ];
  };

  nkeymaps = build-asdf-system {
    pname = "nkeymaps";
    version = "20230214-git";
    src = pkgs.fetchzip {
      url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nkeymaps-20230214-git.tgz";
      sha256 = "197vxqby87vnpgcwchs3dqihk1gimp2cx9cc201pkdzvnbrixji6";
    };
    lispLibs = with self; [ alexandria fset trivial-package-local-nicknames ];
  };


  history-tree = build-asdf-system {
    pname = "history-tree";
    version = "20230214-git";
    src = pkgs.fetchzip {
      url = "http://beta.quicklisp.org/archive/history-tree/2023-02-14/history-tree-20230214-git.tgz";
      sha256 = "12kvnc8vcvg7nmgl5iqgbr4pj0vgb8f8avk9l5czz7f2hj91ysdp";
    };
    lispLibs = with self; [
      alexandria
      cl-custom-hash-table
      local-time
      nasdf-unstable
      nclasses_0_5_0
      trivial-package-local-nicknames
    ];
  };

  nyxt-gtk = build-asdf-system {
    inherit (super.nyxt) pname;
    pname = "nyxt";
    version = "3.3.0";

    lispLibs = with super; [
    lispLibs = (with super; [
      self.nasdf-unstable
      self.prompter
      self.cl-colors2_0_5_4
@@ -428,7 +466,6 @@ let
      dexador
      enchant
      flexi-streams
      history-tree
      idna
      iolib
      lass
@@ -437,8 +474,6 @@ let
      log4cl
      montezuma
      ndebug
      nhooks
      nkeymaps
      osicat
      parenscript
      py-configparser
@@ -459,7 +494,11 @@ let
      cluffer
      cl-cffi-gtk
      cl-gobject-introspection
    ];
    ]) ++ (with self; [
      history-tree
      nhooks
      nkeymaps
    ]);

    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
@@ -484,13 +523,15 @@ let
    '';

    buildScript = pkgs.writeText "build-nyxt.lisp" ''
      (load "${super.nyxt.asdfFasl}/asdf.${super.nyxt.faslExt}")
      (load "${super.alexandria.asdfFasl}/asdf.${super.alexandria.faslExt}")
      ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:make instead
      (asdf:make :nyxt/gi-gtk-application)
    '';

    # TODO(kasper): use wrapGAppsHook
    installPhase = super.nyxt.installPhase + ''
    installPhase = ''
      mkdir -pv $out
      cp -r * $out
      rm -v $out/nyxt
      mkdir -p $out/bin
      cp -v nyxt $out/bin
+0 −5
Original line number Diff line number Diff line
--- a/src/naming-sbcl.lisp
+++ b/src/naming-sbcl.lisp
@@ -108,1 +108,1 @@
-              then (sb-c::lambda-parent lambda)
+              then (sb-c::lexenv-lambda (sb-c::lambda-lexenv lambda))
Loading