Merge pull request #101599 from 7c6f434c/nyxt-deps

Nyxt deps

5 files changed, 131 insertions, 12 deletions

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index d7e14e2ff3cc..35ea301b510e 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -99,5 +99,95 @@ let lispPackages = rec {
 
           asdFilesToKeep = ["clx-truetype.asd"];
   };
+  cluffer = buildLispPackage rec {
+    baseName = "cluffer";
+    version = "2018-09-24";
+
+    buildSystems = [ "cluffer-base" "cluffer-simple-buffer" "cluffer-simple-line" "cluffer-standard-buffer" "cluffer-standard-line" "cluffer" ];
+    parasites = [ "cluffer-test" ];
+
+    description = "General purpose text-editor buffer";
+    deps = with pkgs.lispPackages; [
+      acclimation clump
+    ];
+    src = pkgs.fetchFromGitHub {
+      owner = "robert-strandh";
+      repo = "cluffer";
+      rev = "4aad29c276a58a593064e79972ee4d77cae0af4a";
+      sha256 = "1bcg13g7qb3dr8z50aihdjqa6miz5ivlc9wsj2csgv1km1mak2kj";
+      # date = 2018-09-24T04:45:36+02:00;
+    };
+
+    packageName = "cluffer";
+
+    asdFilesToKeep = [ "cluffer.asd" "cluffer-base.asd" "cluffer-simple-buffer.asd" "cluffer-simple-line.asd" "cluffer-standard-buffer.asd" "cluffer-standard-line.asd" ];
+  };
+  nyxt = pkgs.lispPackages.buildLispPackage rec {
+    baseName = "nyxt";
+    version = "2020-10-23";
+
+    buildSystems = [ "nyxt" "nyxt-ext" ];
+
+    description = "Browser";
+    deps = with pkgs.lispPackages; [
+      alexandria
+      bordeaux-threads
+      chanl
+      cl-annot
+      cl-ansi-text
+      cl-containers
+      cl-css
+      cl-json
+      cl-markup
+      cl-ppcre
+      cl-ppcre-unicode
+      cl-prevalence
+      cl-webkit2
+      closer-mop
+      cluffer
+      dbus
+      dexador
+      enchant
+      fset
+      hu_dot_dwim_dot_defclass-star
+      ironclad
+      local-time
+      log4cl
+      lparallel
+      mk-string-metrics
+      osicat
+      parenscript
+      plump
+      prove-asdf
+      quri
+      serapeum
+      sqlite
+      str
+      swank
+      trivia
+      trivial-clipboard
+      trivial-features
+      trivial-package-local-nicknames
+      trivial-types
+      unix-opts
+    ];
+    src = pkgs.fetchFromGitHub {
+      owner = "atlas-engineer";
+      repo = "nyxt";
+      rev = "f744af5233b3636460ce71650de2b0c7dcb9fa8e";
+      sha256 = "1m4jic7nbm2jmxlm8k0zqg62z91g2f2s86by086brgfw056idjmz";
+      # date = 2020-10-23T19:06:04+02:00;
+    };
+
+    packageName = "nyxt";
+
+    asdFilesToKeep = [ "nyxt.asd" "nyxt-ext.asd" ];
+
+    propagatedBuildInputs = [
+      pkgs.libressl.out
+      pkgs.webkitgtk
+      pkgs.sbcl
+    ];
+  };
 };
 in lispPackages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
new file mode 100644
index 000000000000..a554ef8d6800
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_defclass-star'';
+  version = ''20150709-darcs'';
+
+  description = ''Simplify class like definitions with defclass* and friends.'';
+
+  deps = [ args."hu_dot_dwim_dot_asdf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz'';
+    sha256 = ''032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs'';
+  };
+
+  packageName = "hu.dwim.defclass-star";
+
+  asdFilesToKeep = ["hu.dwim.defclass-star.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM hu.dwim.defclass-star DESCRIPTION
+    Simplify class like definitions with defclass* and friends. SHA256
+    032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs URL
+    http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz
+    MD5 e37f386dca8f789fb2e303a1914f0415 NAME hu.dwim.defclass-star FILENAME
+    hu_dot_dwim_dot_defclass-star DEPS
+    ((NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf)) DEPENDENCIES
+    (hu.dwim.asdf) VERSION 20150709-darcs SIBLINGS
+    (hu.dwim.defclass-star+contextl hu.dwim.defclass-star+hu.dwim.def+contextl
+     hu.dwim.defclass-star+hu.dwim.def hu.dwim.defclass-star+swank
+     hu.dwim.defclass-star.documentation hu.dwim.defclass-star.test)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 7e44999e58cd..3a92bd267147 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -105,18 +105,6 @@ $out/lib/common-lisp/query-fs"
       '';
     };
   };
-  serapeum = x: {
-    overrides = y: (x.overrides y) //{
-      # Override src until quicklisp catches up to 65837f8 (see serapeum
-      # issue #42)
-      src = pkgs.fetchFromGitHub {
-        owner = "ruricolist";
-        repo = "serapeum";
-        rev = "65837f8a0d65b36369ec8d000fff5c29a395b5fe";
-        sha256 = "0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw";
-      };
-    };
-  };
   sqlite = x: {
     propagatedBuildInputs = [pkgs.sqlite];
     overrides = y: (x.overrides y) // {
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index c6b77efa7850..bec69e3a05d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -158,3 +158,4 @@ trivial-main-thread
 cl-webkit2
 acclimation
 clump
+hu.dwim.defclass-star
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2b73fee2b538..7fcd2d6a355f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -1412,6 +1412,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "hu_dot_dwim_dot_defclass-star" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu_dot_dwim_dot_defclass-star" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix {
+         inherit fetchurl;
+           "hu_dot_dwim_dot_asdf" = quicklisp-to-nix-packages."hu_dot_dwim_dot_asdf";
+       }));
+
+
   "clump" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clump" or (x: {}))