Merge staging-next into staging

2021-04-02 06:05:30 +00:00
parent 2efec1b83f 089e5dccf2
commit b719e2423f
5 changed files with 36 additions and 30 deletions
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {

  patches = [
    (fetchpatch {
-      url = "https://roy.marples.name/cgit/dhcpcd.git/patch/?id=114870290a8d3d696bc4049c32eef3eed03d6070";
+      name = "?id=114870290a8d3d696bc4049c32eef3eed03d6070";
+      url = "https://roy.marples.name/git/dhcpcd/commitdiff_plain/114870290a8d3d696bc4049c32eef3eed03d6070";
      sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb";
    })
  ];