Merge pull request #254143 from trofi/shadow-update
shadow: 4.13 -> 4.14.0
This commit is contained in:
commit
d236ed3abd
|
@ -1,9 +1,9 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, runtimeShell, nixosTests, fetchpatch
|
||||
, runtimeShell, nixosTests
|
||||
, autoreconfHook, bison, flex
|
||||
, docbook_xml_dtd_45, docbook_xsl
|
||||
, itstool , libxml2, libxslt
|
||||
, libxcrypt
|
||||
, itstool, libbsd, libxml2, libxslt
|
||||
, libxcrypt, pkg-config
|
||||
, glibcCross ? null
|
||||
, pam ? null
|
||||
, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb
|
||||
|
@ -17,13 +17,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shadow";
|
||||
version = "4.13";
|
||||
version = "4.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shadow-maint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA=";
|
||||
hash = "sha256-zopJevCv7ot8RLp/rSQGKO05eF4FjkLaOEMo9aq9Afo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "su" "dev" "man" ];
|
||||
|
@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
|
|||
autoreconfHook bison flex
|
||||
docbook_xml_dtd_45 docbook_xsl
|
||||
itstool libxml2 libxslt
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ libxcrypt ]
|
||||
buildInputs = [ libbsd libxcrypt ]
|
||||
++ lib.optional (pam != null && stdenv.isLinux) pam
|
||||
++ lib.optional withTcb tcb;
|
||||
|
||||
|
@ -46,11 +47,6 @@ stdenv.mkDerivation rec {
|
|||
./respect-xml-catalog-files-var.patch
|
||||
./runtime-shell.patch
|
||||
./fix-install-with-tcb.patch
|
||||
# Fix HAVE_SHADOWGRP configure check
|
||||
(fetchpatch {
|
||||
url = "https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef.patch";
|
||||
sha256 = "sha256-GJWg/8ggTnrbIgjI+HYa26DdVbjTHTk/IHhy7GU9G5w=";
|
||||
})
|
||||
];
|
||||
|
||||
# The nix daemon often forbids even creating set[ug]id files.
|
||||
|
|
Loading…
Reference in a new issue