Merge pull request #4092 from ts468/pam_mount

New packages: pam_mount and libHX

+63
+1
lib/maintainers.nix
··· 118 the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; 119 thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; 120 tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; 121 ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; 122 tv = "Tomislav Viljetić <tv@shackspace.de>"; 123 urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
··· 118 the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; 119 thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; 120 tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; 121 + tstrobel = "Thomas Strobel <ts468@cam.ac.uk>"; 122 ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; 123 tv = "Tomislav Viljetić <tv@shackspace.de>"; 124 urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
+29
pkgs/development/libraries/libHX/default.nix
···
··· 1 + { stdenv, fetchurl, autoconf, automake, libtool }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "libHX-3.21"; 5 + 6 + src = fetchurl { 7 + url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz"; 8 + sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v"; 9 + }; 10 + 11 + patches = []; 12 + 13 + buildInputs = [ autoconf automake libtool ]; 14 + 15 + preConfigure = '' 16 + sh autogen.sh 17 + ''; 18 + 19 + meta = { 20 + homepage = http://libhx.sourceforge.net/; 21 + longDescription = '' 22 + libHX is a C library (with some C++ bindings available) that provides data structures 23 + and functions commonly needed, such as maps, deques, linked lists, string formatting 24 + and autoresizing, option and config file parsing, type checking casts and more. 25 + ''; 26 + maintainers = [ stdenv.lib.maintainers.tstrobel ]; 27 + platforms = stdenv.lib.platforms.linux; 28 + }; 29 + }
+29
pkgs/os-specific/linux/pam_mount/default.nix
···
··· 1 + { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "pam_mount-2.14"; 5 + 6 + src = fetchurl { 7 + url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz"; 8 + sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg"; 9 + }; 10 + 11 + buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; 12 + 13 + preConfigure = "sh autogen.sh --prefix=$out"; 14 + 15 + makeFlags = "DESTDIR=$(out)"; 16 + 17 + # Probably a hack, but using DESTDIR and PREFIX makes everything work! 18 + postInstall = '' 19 + cp -r $out/$out/* $out 20 + rm -r $out/nix 21 + ''; 22 + 23 + meta = { 24 + homepage = http://pam-mount.sourceforge.net/; 25 + description = "PAM module to mount volumes for a user session"; 26 + maintainers = [ stdenv.lib.maintainers.tstrobel ]; 27 + platforms = stdenv.lib.platforms.linux; 28 + }; 29 + }
+4
pkgs/top-level/all-packages.nix
··· 5432 5433 libharu = callPackage ../development/libraries/libharu { }; 5434 5435 libibmad = callPackage ../development/libraries/libibmad { }; 5436 5437 libibumad = callPackage ../development/libraries/libibumad { }; ··· 7901 pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; 7902 7903 pam_login = callPackage ../os-specific/linux/pam_login { }; 7904 7905 pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; 7906
··· 5432 5433 libharu = callPackage ../development/libraries/libharu { }; 5434 5435 + libHX = callPackage ../development/libraries/libHX { }; 5436 + 5437 libibmad = callPackage ../development/libraries/libibmad { }; 5438 5439 libibumad = callPackage ../development/libraries/libibumad { }; ··· 7903 pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; 7904 7905 pam_login = callPackage ../os-specific/linux/pam_login { }; 7906 + 7907 + pam_mount = callPackage ../os-specific/linux/pam_mount { }; 7908 7909 pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; 7910