Merge staging-next into staging

2021-01-29 00:43:57 +00:00
parent 798f7b136c 98b8e8ebf8
commit 3ac0ccda7a
32 changed files with 269 additions and 112 deletions
@@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , fetchFromGitHub
 , bison
 , pam
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "doas";
-  version = "6.8";
+  version = "6.8.1";

  src = fetchFromGitHub {
    owner = "Duncaen";
    repo = "OpenDoas";
    rev = "v${version}";
-    sha256 = "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb";
+    sha256 = "sha256-F0FVVspGDZmzxy4nsb/wsEoCw4eHscymea7tIKrWzD0=";
  };

  # otherwise confuses ./configure