Merge pull request #103866 from cole-h/doas

doas: 6.6.1 -> 6.8
2020-11-30 19:02:55 +01:00
parent 9a63b3d3d6 19c0927d30
commit 6df56e1cb8
2 changed files with 14 additions and 3 deletions
@@ -10,13 +10,13 @@

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

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

  # otherwise confuses ./configure
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
  ];

  postPatch = ''
-    sed -i '/\(chown\|chmod\)/d' bsd.prog.mk
+    sed -i '/\(chown\|chmod\)/d' GNUmakefile
  '';

  buildInputs = [ bison pam ];