diff --git a/flake.lock b/flake.lock index 9c65ae1f..46093851 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1634808364, - "narHash": "sha256-zRavMj93kD1vHfccHTyxuhg22vZTnDSarJs+iEI4fzE=", + "lastModified": 1634867970, + "narHash": "sha256-P5+mu7iruBbzku4Rk/OOht/ZgU6mYLj3+GX5TocJz2A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b9f98ddb3168d4425db2112cbb9a31b626b13e27", + "rev": "343c8b190c66979d9a543c216148d417146db5c1", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1634743337, - "narHash": "sha256-CrevqYUr8MhfAken+vk4dz20z3auI/ytP7qsKITxlqw=", + "lastModified": 1634851225, + "narHash": "sha256-fwtGHHl7fTELucIRBKO5JORD8QP9Lo9PwY9nrJuEybE=", "owner": "nix-community", "repo": "home-manager", - "rev": "91155a98ed126553deb8696b25556d782d2a5450", + "rev": "cfe82d9f444a1b77f135070f1c1ee63fa061f2fd", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1634515797, - "narHash": "sha256-elgCUC2khtBkOSpE4gDymNvthTZAI4hGI2iNu3YEUkA=", + "lastModified": 1634782485, + "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f0194220f2402b06f7f79bba6351895facb5acb", + "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", "type": "github" }, "original": { diff --git a/modules/graphical/qutebrowser/default.nix b/modules/graphical/qutebrowser/default.nix index 7a16ad24..52abc12b 100644 --- a/modules/graphical/qutebrowser/default.nix +++ b/modules/graphical/qutebrowser/default.nix @@ -7,6 +7,18 @@ }; config = lib.mkIf config.chvp.graphical.qutebrowser.enable { + nixpkgs.overlays = [ + (self: super: { + qutebrowser = super.qutebrowser.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + (self.fetchpatch { + url = "https://github.com/qutebrowser/qutebrowser/pull/6626.patch"; + sha256 = "NuKHpjEILEfabLKXVatuNBX1a+6TelIBAauYQKW1zGI="; + }) + ]; + }); + }) + ]; chvp.base.zfs.homeLinks = [ { path = ".config/qutebrowser"; type = "data"; } { path = ".local/share/qutebrowser"; type = "cache"; } diff --git a/patches/141962.patch b/patches/141962.patch deleted file mode 100644 index 46969086..00000000 --- a/patches/141962.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 19bd112c96cca44db27ddc22314e71100b6882d4 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sun, 17 Oct 2021 11:34:42 +0200 -Subject: [PATCH] mu: 1.6.6 -> 1.6.7 - ---- - pkgs/tools/networking/mu/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix -index 4b9efdc24a60..0d94861da295 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -7,13 +7,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.6.6"; -+ version = "1.6.7"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c="; -+ sha256 = "bhZrottFT5NX43Iz1wFGYzaUSAgvgkhOwNHX6fjUs7M="; - }; - - postPatch = lib.optionalString (batchSize != null) '' diff --git a/patches/142535.patch b/patches/142535.patch new file mode 100644 index 00000000..5958ca92 --- /dev/null +++ b/patches/142535.patch @@ -0,0 +1,28 @@ +From ba4c80bcec1bdff0a517aed5bca206684208b167 Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Fri, 22 Oct 2021 08:45:56 +0200 +Subject: [PATCH] qutebrowser: 2.3.1 -> 2.4.0 + +--- + pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix +index d245e7035a46..e92815476676 100644 +--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix ++++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix +@@ -31,12 +31,12 @@ let + + in mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "qutebrowser"; +- version = "2.3.1"; ++ version = "2.4.0"; + + # the release tarballs are different from the git checkout! + src = fetchurl { + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; +- sha256 = "05n64mw9lzzxpxr7lhakbkm9ir3x8p0rwk6vbbg01aqg5iaanyj0"; ++ sha256 = "8s2auxTrq/ljBXOy+4RHvhkod3h9xOOWThtV9yqFkuw="; + }; + + # Needs tox