Merge staging-next into staging

2020-09-22 18:31:56 +02:00
parent c24b9331e0 e3607652b6
commit 7bff759fac
142 changed files with 3478 additions and 882 deletions
@@ -2,21 +2,14 @@

 buildGoModule rec {
  pname = "age";
-  version = "1.0.0-beta4";
+  version = "1.0.0-beta5";
  vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m";

-  doCheck = false;
-
-  subPackages = [
-    "cmd/age"
-    "cmd/age-keygen"
-  ];
-
  src = fetchFromGitHub {
    owner = "FiloSottile";
    repo = "age";
    rev = "v${version}";
-    sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb";
+    sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk";
  };

  meta = with lib; {