cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nyxt: 3.6.0 -> 3.7.0

Browse source 
Release notes since 3.6.0:
https://nyxt.atlas.engineer/article/release-3.7.0.org
https://nyxt.atlas.engineer/article/release-3.6.1.org
This commit is contained in:
dariof4 2023-09-11 15:47:29 +02:00
parent da45825636
commit a6d7135b40
2 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/nyxt/default.nix
View file

@ -3,7 +3,7 @@
, glib, gdk-pixbuf, cairo
, mailcap, pango, gtk3
, glib-networking, gsettings-desktop-schemas
, xclip, notify-osd, enchant
, xclip, wl-clipboard, notify-osd, enchant
}:
stdenv.mkDerivation rec {
@ -41,9 +41,8 @@ stdenv.mkDerivation rec {
cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png"
done
# Need to suffix PATH with xclip to be able to copy/paste in Nyxt even if xclip/xsel/wl-clipboard are not in the user's PATH
mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \
--suffix PATH : ${lib.makeBinPath [ xclip ]} \
--prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard ]} \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \
--argv0 nyxt "''${gappsWrapperArgs[@]}"
'';

50
pkgs/development/lisp-modules/packages.nix
View file

@ -218,18 +218,6 @@ let
};
};
cl-webkit2_3_5_9 = build-asdf-system {
inherit (super.cl-webkit2) pname systems nativeLibs lispLibs;
version = "3.5.9";
src = pkgs.fetchFromGitHub {
owner = "joachifm";
repo = "cl-webkit";
rev = "3.5.9";
sha256 = "sha256-YJo5ahL6+HLeJrxFBuZZjuK3OfA6DnAu82vvXMsNBgI=";
};
};
prompter = build-asdf-system {
pname = "prompter";
version = "0.1.0";
@ -258,12 +246,12 @@ let
nasdf = build-asdf-system {
pname = "nasdf";
version = "20230524-git";
version = "20230911-git";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "ntemplate";
rev = "51a884f388ec526c32914093fcad6bb2434e3c14";
sha256 = "sha256-bjQPkiHAxhjsHCnWpCGMsmQlGDJFGtQEdevnhK2k+kY=";
rev = "ab7a018f3a67a999c72710644b10b4545130c139";
sha256 = "sha256-fXGh0h6CXLoBgK1jRxkSNyQVAY1gvi4iyHQBuzueR5Y=";
};
};
@ -370,7 +358,7 @@ let
nyxt-gtk = build-asdf-system {
pname = "nyxt";
version = "3.6.0";
version = "3.7.0";
lispLibs = (with super; [
alexandria
@ -410,7 +398,6 @@ let
spinneret
slynk
trivia
trivial-clipboard
trivial-features
trivial-garbage
trivial-package-local-nicknames
@ -418,9 +405,31 @@ let
unix-opts
cluffer
cl-cffi-gtk
cl-gobject-introspection
quri
sqlite
# TODO: Remove these overrides after quicklisp updates past the June 2023 release
(trivial-clipboard.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "snmsts";
repo = "trivial-clipboard";
rev = "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b";
sha256 = "sha256-n15IuTkqAAh2c1OfNbZfCAQJbH//QXeH0Bl1/5OpFRM=";
};}))
(cl-gobject-introspection.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "andy128k";
repo = "cl-gobject-introspection";
rev = "83beec4492948b52aae4d4152200de5d5c7ac3e9";
sha256 = "sha256-g/FwWE+Rzmzm5Y+irvd1AJodbp6kPHJIFOFDPhaRlXc=";
};}))
(cl-webkit2.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "joachifm";
repo = "cl-webkit";
rev = "66fd0700111586425c9942da1694b856fb15cf41";
sha256 = "sha256-t/B9CvQTekEEsM/ZEp47Mn6NeZaTYFsTdRqclfX9BNg=";
};
}))
]) ++ (with self; [
history-tree
nhooks
@ -432,7 +441,6 @@ let
nsymbols
nclasses
nfiles
cl-webkit2_3_5_9
swank
cl-containers
]);
@ -440,8 +448,8 @@ let
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nyxt";
rev = "3.6.0";
sha256 = "sha256-DaPEKdYf5R+RS7VQzbdLSqZvEQfxjeGEdX8rwmHRLrY=";
rev = "3.7.0";
sha256 = "sha256-viiyO4fX3uyGuvojQ1rYYKBldRdVNzeJX1KYlYwfWVU=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];