about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/shadow
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-10-07 18:10:54 -0500
committerWill Dietz <w@wdtz.org>2019-10-07 18:10:54 -0500
commitea04f6a71896facc185ddca72e6960a6eb4f425f (patch)
tree1d1858e9577b80c1996c1572f7fe8177735e95c4 /pkgs/os-specific/linux/shadow
parentff8ca925b1ff4d32f98ad78aa1d727b23275c4cb (diff)
downloadnixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.tar
nixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.tar.gz
nixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.tar.bz2
nixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.tar.lz
nixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.tar.xz
nixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.tar.zst
nixlib-ea04f6a71896facc185ddca72e6960a6eb4f425f.zip
shadow: 4.6 -> 4.7
https://github.com/shadow-maint/shadow/releases/tag/4.7
Diffstat (limited to 'pkgs/os-specific/linux/shadow')
-rw-r--r--pkgs/os-specific/linux/shadow/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index b4c5c0bac841..1a38b804888a 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "shadow";
-  version = "4.6";
+  version = "4.7";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
     rev = version;
-    sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82";
+    sha256 = "0a7g9k83igfid8pybqpk6fracmz2q021isn2by3994p4hhh3s327";
   };
 
   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)
       ./respect-xml-catalog-files-var.patch
       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.