From 2941217227b56834dfb3f06e43d7ba1b054cedc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Feb 2018 21:59:35 +0000 Subject: [PATCH] Revert "squashfuse: init at 0.1.101" This reverts commit 17210fee46826873a623ffd6b691da3d897277e3. --- pkgs/tools/filesystems/squashfuse/default.nix | 65 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 67 deletions(-) delete mode 100644 pkgs/tools/filesystems/squashfuse/default.nix diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix deleted file mode 100644 index 75b6deccc83e..000000000000 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, fuse, pkgconfig, pcre, - -# Optional Dependencies -lz4 ? null, xz ? null, zlib ? null, lzo ? null, zstd ? null}: - -with stdenv.lib; -let - mkFlag = trueStr: falseStr: cond: name: val: "--" - + (if cond then trueStr else falseStr) - + name - + optionalString (val != null && cond != false) "=${val}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "--without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - optLz4 = shouldUsePkg lz4; - optLzma = shouldUsePkg xz; - optZlib = shouldUsePkg zlib; - optLzo = shouldUsePkg lzo; - optZstd = shouldUsePkg zstd; -in - -stdenv.mkDerivation rec { - - pname = "squashfuse"; - version = "0.1.101"; - name = "${pname}-${version}"; - - meta = { - description = "FUSE filesystem to mount squashfs archives"; - homepage = https://github.com/vasi/squashfuse; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; - license = "BSD-2-Clause"; - }; - - # platforms.darwin should be supported : see PLATFORMS file in src. - # we could use a nix fuseProvider, and let the derivation choose the OS - # specific implementation. - - src = fetchurl { - url = "https://github.com/vasi/squashfuse/archive/${version}.tar.gz"; - sha256 = "08d1j1a73dhhypbk0q20qkrz564zpmvkpk3k3s8xw8gd9nvy2xa2"; - }; - - nativeBuildInputs = [ automake autoconf libtool pkgconfig]; - buildInputs = [ optLz4 optLzma optZlib optLzo optZstd fuse ]; - - # We can do it far better i guess, ignoring -with option - # but it should be safer like that. - # TODO: Improve writing nix expression mkWithLib. - configureFlags = [ - (mkWith (optLz4 != null) "lz4=${lz4}/lib" null) - (mkWith (optLzma != null) "xz=${xz}/lib" null) - (mkWith (optZlib != null) "zlib=${zlib}/lib" null) - (mkWith (optLzo != null) "lzo=${lzo}/lib" null) - (mkWith (optZstd != null) "zstd=${zstd}/lib" null) - ]; - - preConfigure = '' - ./autogen.sh - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45cf17897bd2..f56831eabf2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4710,8 +4710,6 @@ with pkgs; squashfsTools = callPackage ../tools/filesystems/squashfs { }; - squashfuse = callPackage ../tools/filesystems/squashfuse { }; - srcml = callPackage ../applications/version-management/srcml { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };