Merge master into staging-next

2021-04-02 18:14:54 +00:00
parent 60739e07d2 9d9a1339b8
commit b3a0328b7f
82 changed files with 2602 additions and 1381 deletions
@@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "squashfs-tools-ng";
-  version = "1.0.4";
+  version = "1.1.0";

  src = fetchurl {
    url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
-    sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072";
+    sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi";
  };

  nativeBuildInputs = [ doxygen graphviz pkg-config perl ];