From 8e7f92f8ffe6bcceb75623b6c9c0aa595e8e5ff4 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 28 Oct 2021 10:34:40 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 18 +++++++------- patches/142535.patch | 28 --------------------- patches/142647.patch | 59 -------------------------------------------- 3 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 patches/142535.patch delete mode 100644 patches/142647.patch diff --git a/flake.lock b/flake.lock index c686ec2a..8cfc796e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1635303073, - "narHash": "sha256-teBg+mOuj5NEburUcOlydHU79uc/I/JTeQCEHH6YY+Y=", + "lastModified": 1635386125, + "narHash": "sha256-dnNcJhDoeY5LOMNGxjnDhVpWMq23trfNQLRULtgflvU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c0f8d5f9d851d87cb37e2a0de883f4bee6c8b411", + "rev": "278ab5def18f7c3edd2dc65a64994e8b3aa63390", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1635285717, - "narHash": "sha256-CGsOBSkdjIHmKEbUkik1JKQhiKCJ64Hj7dROx7yEDCo=", + "lastModified": 1635394434, + "narHash": "sha256-aOllNFaasxQalCt2D0FXrgOMsn0TZZue42uNkjH896I=", "owner": "nix-community", "repo": "home-manager", - "rev": "46a69810cb95d2e7286089830dc535d6719eaa6f", + "rev": "158bc593983ef26daeb9cc73fd659f64b4d1998a", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "lastModified": 1635314702, + "narHash": "sha256-/CEuEaXFVl2vQ+o3lYzDPz4lfbHbMebyJqQ4jZ1PT30=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "rev": "a4bf44345706231f9dd56f85757499af1e940847", "type": "github" }, "original": { diff --git a/patches/142535.patch b/patches/142535.patch deleted file mode 100644 index 5958ca92..00000000 --- a/patches/142535.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 diff --git a/patches/142647.patch b/patches/142647.patch deleted file mode 100644 index 17b3d2a4..00000000 --- a/patches/142647.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 45fc09dfdd812e8cff48c53b70c87878e7776577 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 23 Oct 2021 11:21:54 +0200 -Subject: [PATCH 1/2] mu: 1.6.7 -> 1.6.8 - ---- - 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 0d94861da295..4b4582d39d0e 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.7"; -+ version = "1.6.8"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "bhZrottFT5NX43Iz1wFGYzaUSAgvgkhOwNHX6fjUs7M="; -+ sha256 = "S2ByfRBBcIIvFbHAn+OB6I4hCuC7Tx8I0bCvxw05UsE="; - }; - - postPatch = lib.optionalString (batchSize != null) '' - -From 1c862ee48bc793840170ac1b012c444947aec0d8 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Mon, 25 Oct 2021 08:43:45 +0200 -Subject: [PATCH 2/2] mu: 1.6.8 -> 1.6.9 - ---- - 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 4b4582d39d0e..b94cc498fa09 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.8"; -+ version = "1.6.9"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "S2ByfRBBcIIvFbHAn+OB6I4hCuC7Tx8I0bCvxw05UsE="; -+ sha256 = "RoSj283fcllEbirZOScKRU4BKLoxgatDdL1qYZu+LEI="; - }; - - postPatch = lib.optionalString (batchSize != null) ''