Merge pull request #20057 from joachifm/encfs

encfs: 1.8.1 -> 1.9.1

authored by Tim Steinbach and committed by GitHub ba9c422c cfbb419c

+31 -19
+13 -6
pkgs/development/libraries/tinyxml-2/default.nix
··· 1 - { stdenv, fetchurl, cmake }: 2 - let version = "3.0.0"; 3 - in stdenv.mkDerivation rec { 4 name = "tinyxml-2-${version}"; 5 - src = fetchurl { 6 - url = "https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz"; 7 - sha256 = "0ispg7ngkry8vhzzawbq42y8gkj53xjipkycw0rkhh487ras32hj"; 8 }; 9 10 nativeBuildInputs = [ cmake ]; 11 12 meta = { 13 platforms = stdenv.lib.platforms.unix; 14 }; 15 }
··· 1 + { stdenv, fetchFromGitHub, cmake }: 2 + 3 + stdenv.mkDerivation rec { 4 name = "tinyxml-2-${version}"; 5 + version = "4.0.1"; 6 + 7 + src = fetchFromGitHub { 8 + repo = "tinyxml2"; 9 + owner = "leethomason"; 10 + rev = version; 11 + sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y"; 12 }; 13 14 nativeBuildInputs = [ cmake ]; 15 16 meta = { 17 + description = "A simple, small, efficient, C++ XML parser"; 18 + homepage = http://www.grinninglizard.com/tinyxml2/index.html; 19 platforms = stdenv.lib.platforms.unix; 20 + license = stdenv.lib.licenses.zlib; 21 }; 22 }
+15 -12
pkgs/tools/filesystems/encfs/default.nix
··· 1 - { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl 2 - , pkgconfig, rlog }: 3 4 stdenv.mkDerivation rec { 5 name = "encfs-${version}"; 6 - version = "1.8.1"; 7 8 src = fetchFromGitHub { 9 - sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; 10 rev = "v${version}"; 11 repo = "encfs"; 12 owner = "vgough"; 13 }; 14 15 - buildInputs = [ boost fuse openssl rlog ]; 16 - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; 17 18 - configureFlags = [ 19 - "--with-boost-serialization=boost_wserialization" 20 - "--with-boost-filesystem=boost_filesystem" 21 - ]; 22 23 enableParallelBuilding = true; 24 25 meta = with stdenv.lib; { 26 homepage = https://vgough.github.io/encfs; 27 - description = "Provides an encrypted filesystem in user-space via FUSE"; 28 - license = licenses.lgpl2; 29 maintainers = with maintainers; [ nckx ]; 30 platforms = with platforms; linux; 31 };
··· 1 + { stdenv, fetchFromGitHub 2 + , cmake, pkgconfig, perl 3 + , gettext, fuse, openssl, tinyxml2 4 + }: 5 6 stdenv.mkDerivation rec { 7 name = "encfs-${version}"; 8 + version = "1.9.1"; 9 10 src = fetchFromGitHub { 11 + sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv"; 12 rev = "v${version}"; 13 repo = "encfs"; 14 owner = "vgough"; 15 }; 16 17 + buildInputs = [ gettext fuse openssl tinyxml2 ]; 18 + nativeBuildInputs = [ cmake pkgconfig perl ]; 19 20 + cmakeFlags = 21 + [ "-DUSE_INTERNAL_TINYXML=OFF" 22 + "-DBUILD_SHARED_LIBS=ON" 23 + "-DINSTALL_LIBENCFS=ON" 24 + ]; 25 26 enableParallelBuilding = true; 27 28 meta = with stdenv.lib; { 29 + description = "An encrypted filesystem in user-space via FUSE"; 30 homepage = https://vgough.github.io/encfs; 31 + license = with licenses; [ gpl3 lgpl3 ]; 32 maintainers = with maintainers; [ nckx ]; 33 platforms = with platforms; linux; 34 };
+3 -1
pkgs/top-level/all-packages.nix
··· 1517 1518 enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; 1519 1520 - encfs = callPackage ../tools/filesystems/encfs { }; 1521 1522 enscript = callPackage ../tools/text/enscript { }; 1523
··· 1517 1518 enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; 1519 1520 + encfs = callPackage ../tools/filesystems/encfs { 1521 + tinyxml2 = tinyxml-2; 1522 + }; 1523 1524 enscript = callPackage ../tools/text/enscript { }; 1525