Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

1 files changed, 127 insertions, 2 deletions

diff --git a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
index e6840e93bf35..f8338e48e19a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/nixpkgs/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/2019-12-27/distinfo.txt";
-        sha256 = "0fz0k7ydmddxvxyid0nkifap21n6bxap602qhqsac2dxglv3i4cs";
+        url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt";
+        sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65";
       };
       buildPhase = '' true; '';
       postInstall = ''
@@ -77,5 +77,130 @@ let lispPackages = rec {
     '';
     dontStrip = true;
   };
+
+  clx-truetype = buildLispPackage rec {
+          baseName = "clx-truetype";
+          version = ''20160825-git'';
+
+          buildSystems = [ "clx-truetype" ];
+          parasites = [ "clx-truetype-test" ];
+
+          description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
+          deps = with pkgs.lispPackages; [
+                  alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store
+                          cl-vectors clx trivial-features zpb-ttf
+          ];
+          src = pkgs.fetchurl {
+                  url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
+                  sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
+          };
+
+          packageName = "clx-truetype";
+
+          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";
+
+    overrides = x: {
+      postInstall = ''
+        echo "Building nyxt binary"
+        NIX_LISP_PRELAUNCH_HOOK='
+          nix_lisp_build_system nyxt/gtk-application \
+           "(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \
+           "" "(format *error-output* \"Alien objects:~%~s~%\" sb-alien::*shared-objects*)"
+        ' "$out/bin/nyxt-lisp-launcher.sh"
+        cp "$out/lib/common-lisp/nyxt/nyxt" "$out/bin/"
+      '';
+    };
+
+    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