Merge staging-next into staging

2021-02-04 00:35:42 +00:00
parent 25e3e66b65 f29b00fcb4
commit a93a3ec715
33 changed files with 154 additions and 76 deletions
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:

 stdenv.mkDerivation {
-  name = "pinentry-mac-0.9.4";
+  pname = "pinentry-mac";
+  version = "0.9.4";

  src = fetchFromGitHub {
    owner = "matthewbauer";