Update dependencies

This commit is contained in:
Charlotte Van Petegem 2022-07-27 19:02:18 +02:00
parent 5771049657
commit b30e2a759f
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 15 additions and 77 deletions

View file

@ -1,29 +0,0 @@
From ec92be456760eee7eff0b2a052c33b6396ad1dd5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
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 = ''

View file

@ -1,33 +0,0 @@
From 3fdefecb10752db6f260cf5721390b35ded49ed8 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
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