Merge master into staging-next

2020-11-19 20:08:15 +01:00
parent 45ed0b7018 93b430bc6b
commit ea7b8978ef
295 changed files with 2338 additions and 1119 deletions
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "pass-genphrase";
-  version = "0.2";
+  version = "0.3";

  src = fetchFromGitHub {
    owner = "congma";
    repo = "pass-genphrase";
    rev = version;
-    sha256 = "1sdkmz5s6wdx4vdlgqf5kmyrm17zwzy3n52s13qpx32bnnajap1h";
+    sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
  };

  dontBuild = true;