summary refs log tree commit diff
path: root/pkgs/os-specific/linux/shadow
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-12-03 08:26:27 -0600
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-12-05 10:27:22 +0100
commit734132e55ff334980da7b603f81a8f2bd520d56d (patch)
tree94c849e7b5319481f52c7c9168bf84188f03f192 /pkgs/os-specific/linux/shadow
parentc555684c6d55ae8082d298553471022b15be8dcc (diff)
downloadnixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.tar
nixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.tar.gz
nixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.tar.bz2
nixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.tar.lz
nixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.tar.xz
nixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.tar.zst
nixpkgs-734132e55ff334980da7b603f81a8f2bd520d56d.zip
shadow: 4.7 -> 4.8
Diffstat (limited to 'pkgs/os-specific/linux/shadow')
-rw-r--r--pkgs/os-specific/linux/shadow/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index f810270a29e..c2547ce262a 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.7";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
     rev = version;
-    sha256 = "0a7g9k83igfid8pybqpk6fracmz2q021isn2by3994p4hhh3s327";
+    sha256 = "05a636dqxip09l5jjrrs30lvwq6xkhjrdgjbbj3bg6b6z7hc67qk";
   };
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@@ -38,12 +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
-      # Allow building with itstool
-      # https://github.com/shadow-maint/shadow/pull/184
-      (fetchpatch {
-        url = https://github.com/shadow-maint/shadow/commit/6c6c8d3a33bba32277e1ed46f55df1e6dbc914b7.patch;
-        sha256 = "0xfr1mrfv5xsmri6l7ycbpz3qhs4vf3fyci4kwpffi3icsfjn557";
-      })
     ];
 
   # The nix daemon often forbids even creating set[ug]id files.