public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20057 from joachifm/encfs

Browse Source 
encfs: 1.8.1 -> 1.9.1
This commit is contained in:
Tim Steinbach 2016-11-01 11:17:16 -04:00 committed by GitHub
commit ba9c422caa
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/tinyxml-2/default.nix
View File

@ -1,15 +1,22 @@
{ stdenv, fetchurl, cmake }: { stdenv, fetchFromGitHub, cmake }:
let version = "3.0.0";
in stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tinyxml-2-${version}"; name = "tinyxml-2-${version}";
src = fetchurl { version = "4.0.1";
url = "https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz";
sha256 = "0ispg7ngkry8vhzzawbq42y8gkj53xjipkycw0rkhh487ras32hj"; src = fetchFromGitHub {
repo = "tinyxml2";
owner = "leethomason";
rev = version;
sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = { meta = {
description = "A simple, small, efficient, C++ XML parser";
homepage = http://www.grinninglizard.com/tinyxml2/index.html;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.zlib;
}; };
} }

25
pkgs/tools/filesystems/encfs/default.nix
View File

@ -1,31 +1,34 @@
{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl { stdenv, fetchFromGitHub
, pkgconfig, rlog }: , cmake, pkgconfig, perl
, gettext, fuse, openssl, tinyxml2
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "encfs-${version}"; name = "encfs-${version}";
version = "1.8.1"; version = "1.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv";
rev = "v${version}"; rev = "v${version}";
repo = "encfs"; repo = "encfs";
owner = "vgough"; owner = "vgough";
}; };
buildInputs = [ boost fuse openssl rlog ]; buildInputs = [ gettext fuse openssl tinyxml2 ];
nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig perl ];
configureFlags = [ cmakeFlags =
"--with-boost-serialization=boost_wserialization" [ "-DUSE_INTERNAL_TINYXML=OFF"
"--with-boost-filesystem=boost_filesystem" "-DBUILD_SHARED_LIBS=ON"
"-DINSTALL_LIBENCFS=ON"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An encrypted filesystem in user-space via FUSE";
homepage = https://vgough.github.io/encfs; homepage = https://vgough.github.io/encfs;
description = "Provides an encrypted filesystem in user-space via FUSE"; license = with licenses; [ gpl3 lgpl3 ];
license = licenses.lgpl2;
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };

4
pkgs/top-level/all-packages.nix
View File

@ -1517,7 +1517,9 @@ in
enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
encfs = callPackage ../tools/filesystems/encfs { }; encfs = callPackage ../tools/filesystems/encfs {
tinyxml2 = tinyxml-2;
};
enscript = callPackage ../tools/text/enscript { }; enscript = callPackage ../tools/text/enscript { };