Skip to content

Commit

Permalink
Merge pull request NixOS#68453 from nlewo/pr-next
Browse files Browse the repository at this point in the history
Add the browser `next`
  • Loading branch information
7c6f434c committed Sep 23, 2019
2 parents fbfdaed + 1c7d338 commit 4342f5e
Show file tree
Hide file tree
Showing 45 changed files with 1,253 additions and 299 deletions.
25 changes: 25 additions & 0 deletions pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
@@ -0,0 +1,25 @@
{ stdenv, gcc7, pkg-config
, next
, webkitgtk, gsettings-desktop-schemas
}:

stdenv.mkDerivation rec {
pname = "next-gtk-webkit";
inherit (next) src version;

makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ];
installTargets = "install-gtk-webkit";

nativeBuildInputs = [ gcc7 pkg-config ];
buildInputs = [
webkitgtk
gsettings-desktop-schemas
];
meta = with stdenv.lib; {
description = "Infinitely extensible web-browser (user interface only)";
homepage = https://next.atlas.engineer;
license = licenses.bsd3;
maintainers = [ maintainers.lewo ];
platforms = [ "x86_64-linux" ];
};
}
80 changes: 80 additions & 0 deletions pkgs/applications/networking/browsers/next/default.nix
@@ -0,0 +1,80 @@
{ pkgs, stdenv, fetchFromGitHub
, gcc7, pkg-config, makeWrapper
, glib-networking
, next-gtk-webkit
, lispPackages
, sbcl
}:

stdenv.mkDerivation rec {
pname = "next";
version = "1.3.1";

src = fetchFromGitHub {
owner = "atlas-engineer";
repo = "next";
rev = version;
sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj";
};

# Stripping destroys the generated SBCL image
dontStrip = true;

prePatch = ''
substituteInPlace source/ports/gtk-webkit.lisp \
--replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
'';

nativeBuildInputs = [ sbcl makeWrapper ];
buildInputs = with lispPackages; [
trivial-features
trivial-garbage
alexandria
bordeaux-threads
cl-json
cl-markup
cl-ppcre
cl-ppcre-unicode
closer-mop
dexador
ironclad
lparallel
parenscript
quri
cl-css
log4cl
mk-string-metrics
sqlite
str
swank
trivia
trivial-clipboard
unix-opts
dbus
];
propagatedBuildInputs = [ next-gtk-webkit ];

buildPhase = ''
common-lisp.sh --eval "(require :asdf)" \
--eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
--eval '(asdf:make :next)' \
--quit
'';

installPhase = ''
install -D -m0755 next $out/bin/next
'';

preFixup = ''
wrapProgram $out/bin/next \
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
'';

meta = with stdenv.lib; {
description = "Infinitely extensible web-browser (with Lisp development files)";
homepage = https://next.atlas.engineer;
license = licenses.bsd3;
maintainers = [ maintainers.lewo ];
platforms = [ "x86_64-linux" ];
};
}
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
{
baseName = ''alexandria'';
version = ''20181210-git'';
version = ''20190710-git'';

description = ''Alexandria is a collection of portable public domain utilities.'';

deps = [ ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz'';
sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588'';
url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz'';
sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70'';
};

packageName = "alexandria";
Expand All @@ -19,8 +19,8 @@ args @ { fetchurl, ... }:
}
/* (SYSTEM alexandria DESCRIPTION
Alexandria is a collection of portable public domain utilities. SHA256
0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL
http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz
MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests)
0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL
http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz
MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests)
PARASITES NIL) */
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
{
baseName = ''array-utils'';
version = ''20181018-git'';
version = ''20190710-git'';

description = ''A few utilities for working with arrays.'';

deps = [ ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz'';
sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn'';
url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
};

packageName = "array-utils";
Expand All @@ -18,8 +18,8 @@ args @ { fetchurl, ... }:
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL
http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz
MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils
DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test)
SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL
http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz
MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils
DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test)
PARASITES NIL) */
@@ -0,0 +1,25 @@
args @ { fetchurl, ... }:
rec {
baseName = ''asdf-package-system'';
version = ''20150608-git'';

description = ''System lacks description'';

deps = [ ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
};

packageName = "asdf-package-system";

asdFilesToKeep = ["asdf-package-system.asd"];
overrides = x: x;
}
/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256
17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL
http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz
MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME
asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS
NIL PARASITES NIL) */
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''chunga'';
version = ''20180131-git'';

description = '''';
description = ''System lacks description'';

deps = [ args."trivial-gray-streams" ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["chunga.asd"];
overrides = x: x;
}
/* (SYSTEM chunga DESCRIPTION NIL SHA256
/* (SYSTEM chunga DESCRIPTION System lacks description SHA256
0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL
http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz
MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS
Expand Down
24 changes: 24 additions & 0 deletions pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -0,0 +1,24 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-css'';
version = ''20140914-git'';

description = ''Simple inline CSS generator'';

deps = [ ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
};

packageName = "cl-css";

asdFilesToKeep = ["cl-css.asd"];
overrides = x: x;
}
/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256
16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL
http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz
MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL
DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-dbi'';
version = ''20190521-git'';

description = '''';
description = ''System lacks description'';

deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-dbi.asd"];
overrides = x: x;
}
/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS
Expand Down
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-test-more'';
version = ''prove-20171130-git'';

description = '''';
description = ''System lacks description'';

deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-test-more.asd"];
overrides = x: x;
}
/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256
13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME
Expand Down
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-utilities'';
version = ''1.2.4'';

description = '''';
description = ''System lacks description'';

deps = [ ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-utilities.asd"];
overrides = x: x;
}
/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256
/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256
1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz
MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME
Expand Down
@@ -0,0 +1,34 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-xmlspam'';
version = ''20101006-http'';

description = ''Streaming pattern matching for XML'';

deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
};

packageName = "cl-xmlspam";

asdFilesToKeep = ["cl-xmlspam.asd"];
overrides = x: x;
}
/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256
1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL
http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz
MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cl-ppcre FILENAME cl-ppcre)
(NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
(NAME puri FILENAME puri)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
(alexandria babel cl-ppcre closure-common cxml puri trivial-features
trivial-gray-streams)
VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''clack-socket'';
version = ''clack-20190710-git'';

description = '''';
description = ''System lacks description'';

deps = [ ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["clack-socket.asd"];
overrides = x: x;
}
/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
Expand Down
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''clack-v1-compat'';
version = ''clack-20190710-git'';

description = '''';
description = ''System lacks description'';

deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["clack-v1-compat.asd"];
overrides = x: x;
}
/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
Expand Down
Expand Up @@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''closure-html'';
version = ''20180711-git'';

description = '''';
description = ''System lacks description'';

deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];

Expand All @@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["closure-html.asd"];
overrides = x: x;
}
/* (SYSTEM closure-html DESCRIPTION NIL SHA256
/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256
0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
Expand Down

0 comments on commit 4342f5e

Please sign in to comment.