summary refs log tree commit diff
path: root/pkgs/tools/filesystems/squashfs/default.nix
diff options
context:
space:
mode:
authorRuud van Asseldonk <dev@veniogames.com>2021-07-24 09:16:13 +0200
committerRuud van Asseldonk <dev@veniogames.com>2021-07-24 13:00:31 +0200
commitf2356e8dcbe63b70a92a123b6a773c62ca6844d9 (patch)
tree2c28c45d70899fc6da90e02cd666470d55b65bd0 /pkgs/tools/filesystems/squashfs/default.nix
parent270afc54e1520caa0f34dc0e8b01362ed31f2688 (diff)
downloadnixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.tar
nixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.tar.gz
nixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.tar.bz2
nixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.tar.lz
nixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.tar.xz
nixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.tar.zst
nixpkgs-f2356e8dcbe63b70a92a123b6a773c62ca6844d9.zip
squashfsTools: 4.4 -> 4.5
I had to update the 4k alignment patch for this. While it does apply,
and the result compiles, and even appears to work fine superficially,
I do not know if there have been any changes to squashfs internals that
now require other places to take the alignment flag into account. Will
do more testing soon.
Diffstat (limited to 'pkgs/tools/filesystems/squashfs/default.nix')
-rw-r--r--pkgs/tools/filesystems/squashfs/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index cddb1722584..2c8cd317f66 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -10,23 +10,19 @@
 
 stdenv.mkDerivation rec {
   pname = "squashfs";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
     rev = version;
-    sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw";
+    sha256 = "1nanwz5qvsakxfm37md5i7xqagv69nfik9hpj8qlp6ymw266vgxr";
   };
 
   patches = [
     # This patch adds an option to pad filesystems (increasing size) in
     # exchange for better chunking / binary diff calculation.
     ./4k-align.patch
-    # Add -no-hardlinks option. This is a rebased version of
-    # c37bb4da4a5fa8c1cf114237ba364692dd522262, can be removed
-    # when upgrading to the next version after 4.4
-    ./0001-Mksquashfs-add-no-hardlinks-option.patch
   ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ zlib xz zstd lz4 lzo ];