From 66dbde4002b8ee64dd060ab06f9ecfbff9f2dd13 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 15 Sep 2014 11:55:23 +0200 Subject: [PATCH 1/2] New packages: pam_mount and libHX Add pam_mount package. Integration into NixOS is still missing. --- pkgs/development/libraries/libHX/default.nix | 29 ++++++++++++++++++++ pkgs/os-specific/linux/pam_mount/default.nix | 29 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/libHX/default.nix create mode 100644 pkgs/os-specific/linux/pam_mount/default.nix diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix new file mode 100644 index 000000000000..fb837748852f --- /dev/null +++ b/pkgs/development/libraries/libHX/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libHX-3.21"; + + src = fetchurl { + url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz"; + sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v"; + }; + + patches = []; + + buildInputs = [ autoconf automake libtool ]; + + preConfigure = '' + sh autogen.sh + ''; + + meta = { + homepage = http://libhx.sourceforge.net/; + description = '' + libHX is a C library (with some C++ bindings available) that provides data structures + and functions commonly needed, such as maps, deques, linked lists, string formatting + and autoresizing, option and config file parsing, type checking casts and more. + ''; + maintainers = []; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix new file mode 100644 index 000000000000..3a525d6d6aa0 --- /dev/null +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }: + +stdenv.mkDerivation rec { + name = "pam_mount-2.14"; + + src = fetchurl { + url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz"; + sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg"; + }; + + buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + + preConfigure = "sh autogen.sh --prefix=$out"; + + makeFlags = "DESTDIR=$(out)"; + + # Probably a hack, but using DESTDIR and PREFIX makes everything work! + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + + meta = { + homepage = http://pam-mount.sourceforge.net/; + description = "PAM module to mount volumes for a user session."; + maintainers = []; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d02ce6d9e5d7..659d51cb07c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5307,6 +5307,8 @@ let libharu = callPackage ../development/libraries/libharu { }; + libHX = callPackage ../development/libraries/libHX { }; + libical = callPackage ../development/libraries/libical { }; libicns = callPackage ../development/libraries/libicns { }; @@ -7742,6 +7744,8 @@ let pam_login = callPackage ../os-specific/linux/pam_login { }; + pam_mount = callPackage ../os-specific/linux/pam_mount { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; pam_usb = callPackage ../os-specific/linux/pam_usb { }; From 7e4c24af7afa0dfd5807b299ab3df62c91f77a92 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 15 Sep 2014 12:30:19 +0200 Subject: [PATCH 2/2] Fix description in pam_mount and libHX. Add tstrobel as maintainer. --- lib/maintainers.nix | 1 + pkgs/development/libraries/libHX/default.nix | 4 ++-- pkgs/os-specific/linux/pam_mount/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a6c41bbe17f1..9f06f92941e1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -117,6 +117,7 @@ the-kenny = "Moritz Ulrich "; thoughtpolice = "Austin Seipp "; tomberek = "Thomas Bereknyei "; + tstrobel = "Thomas Strobel "; ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; urkud = "Yury G. Kudryashov "; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index fb837748852f..31dfe6085ee1 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { meta = { homepage = http://libhx.sourceforge.net/; - description = '' + longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting and autoresizing, option and config file parsing, type checking casts and more. ''; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 3a525d6d6aa0..05438c6945ce 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://pam-mount.sourceforge.net/; - description = "PAM module to mount volumes for a user session."; - maintainers = []; + description = "PAM module to mount volumes for a user session"; + maintainers = [ stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; }; }