Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lisp-packages.nix: update Nyxt #131665

Closed
wants to merge 2 commits into from
Closed

lisp-packages.nix: update Nyxt #131665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c74db90
lisp-packages.nix: update Nyxt
jmercouris Jul 20, 2021
9bda72a
Update pkgs/development/lisp-modules/lisp-packages.nix
jmercouris Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/lisp-modules/lisp-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ let lispPackages = rec {
};
nyxt = pkgs.lispPackages.buildLispPackage rec {
baseName = "nyxt";
version = "2.0.0";
version = "2.1.1";

description = "Browser";

Expand Down Expand Up @@ -194,7 +194,7 @@ let lispPackages = rec {
owner = "atlas-engineer";
repo = "nyxt";
rev = "${version}";
sha256 = "sha256-eSRNfzkAzGTorLjdHo1LQEKLx4ASdv3RGXIFZ5WFIXk=";
sha256 = "0kzm05swhyb197cjfd3iglf60b997sx7v95yxzyq483jxqbcxm0r";
};

packageName = "nyxt";
Expand Down
10 changes: 6 additions & 4 deletions pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Generated file. */
args @ { fetchurl, ... }:
args @ { fetchFromGitHub, ... }:
rec {
baseName = "cl-webkit2";
version = "cl-webkit-20210411-git";
Expand All @@ -8,9 +8,11 @@ rec {

deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];

src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz";
sha256 = "10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh";
src = fetchFromGitHub {
owner = "joachifm";
repo = "cl-webkit";
rev = "90b1469713265096768fd865e64a0a70292c733d";
sha256 = "sha256:0lxws342nh553xlk4h5lb78q4ibiwbm2hljd7f55w3csk6z7bi06";
};

packageName = "cl-webkit2";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/lisp-modules/quicklisp-to-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{stdenv, lib, fetchurl, pkgs, clwrapper}:
{stdenv, lib, fetchurl, fetchFromGitHub, pkgs, clwrapper}:
let quicklisp-to-nix-packages = rec {
inherit stdenv lib fetchurl clwrapper pkgs quicklisp-to-nix-packages;
inherit stdenv lib fetchurl fetchFromGitHub clwrapper pkgs quicklisp-to-nix-packages;

callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
buildLispPackage = callPackage ./define-package.nix;
Expand Down Expand Up @@ -3082,7 +3082,7 @@ let quicklisp-to-nix-packages = rec {
((f: x: (x // (f x)))
(qlOverrides."cl-webkit2" or (x: {}))
(import ./quicklisp-to-nix-output/cl-webkit2.nix {
inherit fetchurl;
inherit fetchFromGitHub;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
Expand Down