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

Merge pull request #68078 from dtzWill/update/shadow-4.7

Browse Source 
shadow: 4.6 -> 4.7
This commit is contained in:
Will Dietz 2019-10-07 18:21:50 -05:00 committed by GitHub
commit 37e7f09f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/shadow/default.nix
View File

@ -19,13 +19,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "shadow"; pname = "shadow";
version = "4.6"; version = "4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shadow-maint"; owner = "shadow-maint";
repo = "shadow"; repo = "shadow";
rev = version; rev = version;
sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82"; sha256 = "0a7g9k83igfid8pybqpk6fracmz2q021isn2by3994p4hhh3s327";
}; };
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
# Obtain XML resources from XML catalog (patch adapted from gtk-doc) # Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch ./respect-xml-catalog-files-var.patch
dots_in_usernames dots_in_usernames
# Check for correct DocBook version during configure
# https://github.com/shadow-maint/shadow/pull/162
(fetchpatch {
url = "https://github.com/shadow-maint/shadow/commit/47797ca6654f79e3de854a6c69db2bdb0516db08.patch";
sha256 = "1zn8f6fd26gj5sh60099xqc7mjwgbbkkic5xfigvxa4b90vm8fd7";
})
]; ];
# The nix daemon often forbids even creating set[ug]id files. # The nix daemon often forbids even creating set[ug]id files.