git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119996 from DeterminateSystems/sasquatch
5259a2eGraham Christensen
pkgs/tools/filesystems/sasquatch/default.nix+27−18
@@ -1,34 +1,43 @@
1+{ lib
2+, stdenv
1−{ fetchFromGitHub
3+, fetchFromGitHub
2, fetchurl
4, fetchurl
3−, lz4 ? null
4−, lz4Support ? false
5−, lzo
6−, lib, stdenv
7, xz
5, xz
6+, lzo
8, zlib
7, zlib
8+, zstd
9+, lz4
10+, lz4Support ? false
9}:
11}:
10
12
11−assert lz4Support -> (lz4 != null);
12−
13let
13let
14− patch = fetchFromGitHub {
14+ patch = fetchFromGitHub
15− owner = "devttys0";
15+ {
16+ # NOTE: This uses my personal fork for now, until
17+ # https://github.com/devttys0/sasquatch/pull/40 is merged.
18+ # I, cole-h, will keep this fork available until that happens.
19+ owner = "cole-h";
16− repo = "sasquatch";
20+ repo = "sasquatch";
17− rev = "3e0cc40fc6dbe32bd3a5e6c553b3320d5d91ceed";
21+ rev = "6edc54705454c6410469a9cb5bc58e412779731a";
18− sha256 = "19lhndjv7v9w6nmszry63zh5rqii9v7wvsbpc2n6q606hyz955g2";
22+ sha256 = "x+PuPYGD4Pd0fcJtlLWByGy/nggsmZkxwSXxJfPvUgo=";
19− } + "/patches/patch0.txt";
23+ } + "/patches/patch0.txt";
20in
24in
21stdenv.mkDerivation rec {
25stdenv.mkDerivation rec {
22 pname = "sasquatch";
26 pname = "sasquatch";
23− version = "4.3";
27+ version = "4.4";
24
28
25 src = fetchurl {
29 src = fetchurl {
26− url = "mirror://sourceforge/squashfs/squashfs4.3.tar.gz";
30+ url = "mirror://sourceforge/squashfs/squashfs${version}.tar.gz";
27− sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
31+ sha256 = "qYGz8/IFS1ouZYhRo8BqJGCtBKmopkXgr+Bjpj/bsH4=";
28 };
32 };
29
33
30− buildInputs = [ xz lzo xz zlib ]
34+ buildInputs = [
35+ xz
36+ lzo
37+ zlib
38+ zstd
39+ ]
31− ++ lib.optional lz4Support lz4;
40+ ++ lib.optionals lz4Support [ lz4 ];
32
41
33 patches = [ patch ];
42 patches = [ patch ];
34 patchFlags = [ "-p0" ];
43 patchFlags = [ "-p0" ];