Revert "Revert "Merge master into staging-next""

In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
This commit is contained in:
Frederik Rietdijk
2020-02-05 19:41:25 +01:00
parent 873e6a4e65
commit 419bc0a4cd
28 changed files with 297 additions and 422 deletions
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
version = "1.8.30";
version = "1.8.31";
src = fetchurl {
url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz";
sha256 = "1rvrqlqrrjsd06dczgj9cwjdkpkqil5zzlwh87h06ms6qzfx6nm3";
sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y";
};
prePatch = ''