diff --git a/flake.lock b/flake.lock index e8de62aa..f0775eb6 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1658775469, - "narHash": "sha256-FfeHLbIS0o2XOMZm5wtTEsh7etgTrrB/4SQV58dQoqk=", + "lastModified": 1658930599, + "narHash": "sha256-58wo+QPWdzN9umeDaypV9Ki+vaBiNZQtOlLRm8zAIGs=", "owner": "accentor", "repo": "flake", - "rev": "809dff49eb81ecbe72092352a0e23afdb058b83a", + "rev": "b09d61c65a8a5a1e0db4789a9d56a14a831a5900", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1658775482, - "narHash": "sha256-4dcWW2+VHOhMbUIbMBUjIrKqRwhL+pKILHH9AdArLRM=", + "lastModified": 1658933178, + "narHash": "sha256-iOGwYEW4ONe71G33PiTXJzgwanA5oXnFKfecTZadpdQ=", "owner": "accentor", "repo": "web", - "rev": "0a66a6b7a8ded6d2e0d7c50bd441d02440459aea", + "rev": "df46d70228cc8445fd9544eb615850e64d43e6a3", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1658737577, - "narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=", + "lastModified": 1658826464, + "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5", + "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1658917434, - "narHash": "sha256-AH1xtUA1hT+r+mbDhD/6qbqkPabFWYrmOfpgbsyFfjk=", + "lastModified": 1658932052, + "narHash": "sha256-qCX8Q0ZhbBqrNcrdOU+cp2x7SkMNPPSbbN6ZySsi4vY=", "owner": "nix-community", "repo": "NUR", - "rev": "864b70d110b86852cd177ffcaf0e68ba9a53f5b2", + "rev": "08060458b308efaf17d5a21db54ce490dbca980d", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1658774904, - "narHash": "sha256-KWhvqna327IlF5nzTgBBTXaK8XIL0KcGvXN/K6N7bDA=", + "lastModified": 1658930418, + "narHash": "sha256-F5FqOmJ90YPx4LBLusXNo4aTvmsmxcTsSQwK5ynCNLk=", "owner": "chvp", "repo": "tetris", - "rev": "0ceac7d46c890384cbf66b67066986806ff3e76a", + "rev": "9dfe32b9b77ee26b024c5849368490f1f3895b7e", "type": "github" }, "original": { diff --git a/patches/182843.patch b/patches/182843.patch deleted file mode 100644 index a14b0311..00000000 --- a/patches/182843.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ec92be456760eee7eff0b2a052c33b6396ad1dd5 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Mon, 25 Jul 2022 18:10:18 +0200 -Subject: [PATCH] mu: 1.8.6 -> 1.8.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 f711b18671ae4..510c3a69185d9 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -14,13 +14,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.8.6"; -+ version = "1.8.7"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = "v${version}"; -- sha256 = "u3MN7MrfHt/ylxDoNnfwnAOKdOAbVZwvIukje0EYgOo="; -+ sha256 = "/RGq/q0N623RR4HuAmyfFx1/OYZBrmK1ddhiT4bgy3k="; - }; - - postPatch = '' diff --git a/patches/182848.patch b/patches/182848.patch deleted file mode 100644 index 35346fdd..00000000 --- a/patches/182848.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3fdefecb10752db6f260cf5721390b35ded49ed8 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Mon, 25 Jul 2022 18:51:53 +0200 -Subject: [PATCH] pass: add openssh dependency to path - -pass git needs openssh when pushing to a remote ssh host. ---- - pkgs/tools/security/pass/default.nix | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix -index 7468b5dcc8d30..7d214f1649a33 100644 ---- a/pkgs/tools/security/pass/default.nix -+++ b/pkgs/tools/security/pass/default.nix -@@ -1,6 +1,6 @@ - { stdenv, lib, pkgs, fetchurl, buildEnv - , coreutils, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl --, which, procps , qrencode , makeWrapper, pass, symlinkJoin -+, which, openssh, procps, qrencode, makeWrapper, pass, symlinkJoin - - , xclip ? null, xdotool ? null, dmenu ? null - , x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport) -@@ -91,8 +91,9 @@ stdenv.mkDerivation rec { - gnused - tree - which -- qrencode -+ openssh - procps -+ qrencode - ] ++ optional stdenv.isDarwin openssl - ++ optional x11Support xclip - ++ optional waylandSupport wl-clipboard