diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-02-03 13:07:38 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-02-03 13:14:39 +0100 |
| commit | d6710e3d66c09c0a7485b2079d6e0d01c14faf07 (patch) | |
| tree | c8a3903f5b6eedcd9a4b88828ce30aa4ddf8d6df /pkgs/os-specific/linux/shadow | |
| parent | 4101f1fd18c1414ad3bbf198a038818906fa1e2f (diff) | |
| download | nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.tar nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.tar.gz nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.tar.bz2 nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.tar.lz nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.tar.xz nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.tar.zst nixpkgs-d6710e3d66c09c0a7485b2079d6e0d01c14faf07.zip | |
shadow: 4.2.1 -> 4.4
Diffstat (limited to 'pkgs/os-specific/linux/shadow')
| -rw-r--r-- | pkgs/os-specific/linux/shadow/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e99d7d86bfb..8c91dc43666 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pam ? null, glibcCross ? null }: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2 +, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison +, pam ? null, glibcCross ? null }: let @@ -15,14 +17,20 @@ let in stdenv.mkDerivation rec { - name = "shadow-4.2.1"; + name = "shadow-${version}"; + version = "4.4"; - src = fetchurl { - url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz"; - sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v"; + src = fetchFromGitHub { + owner = "shadow-maint"; + repo = "shadow"; + rev = "${version}"; + sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; + nativeBuildInputs = [autoreconfHook libxslt libxml2 + docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison + ]; patches = [ ./keep-path.patch dots_in_usernames ]; @@ -33,8 +41,15 @@ stdenv.mkDerivation rec { preConfigure = '' export ac_cv_func_setpgrp_void=yes export shadow_cv_logdir=/var/log + ( + head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml" + ) > xmlcatalog + configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog "; ''; + configureFlags = " --enable-man "; + preBuild = assert glibc != null; '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd |