Merge branch 'master' into staging-next

2020-10-11 00:27:21 +02:00
parent 338b25697c 2085a25425
commit aabcf2d8f5
52 changed files with 570 additions and 352 deletions
@@ -31,6 +31,10 @@ stdenv.mkDerivation {
        + "partimage-0.6.9-openssl-1.1-compatibility.patch?id=3fe8e9910002b6523d995512a646b063565d0447";
      sha256 = "1hs0krxrncxq1w36bhad02yk8yx71zcfs35cw87c82sl2sfwasjg";
    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/p/partimage/0.6.9-8/debian/patches/04-fix-FTBFS-glic-2.28.patch";
+      sha256 = "0xid5636g58sxbhxnjmfjdy7y8rf3c77zmmpfbbqv4lv9jd2gmxm";
+    })
  ];

  meta = {