Sergei Trofimovich 2024-06-13 22:13:31 +01:00
parent 5ebfc39212
commit 21ad4b3a71

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch { lib, stdenv, fetchFromGitHub
, runtimeShell, nixosTests , runtimeShell, nixosTests
, autoreconfHook, bison, flex , autoreconfHook, bison, flex
, docbook_xml_dtd_45, docbook_xsl , docbook_xml_dtd_45, docbook_xsl
@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "shadow"; pname = "shadow";
version = "4.14.6"; version = "4.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shadow-maint"; owner = "shadow-maint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-+klU1a0cSgHPwZkDnbCSjKnBUKIm2Z3OGUvR/zrqQxo="; hash = "sha256-GAwwpyIN5qWSIapjGFfOxPbOx5G6//fEbTpPmkXh6uA=";
}; };
outputs = [ "out" "su" "dev" "man" ]; outputs = [ "out" "su" "dev" "man" ];
@ -47,13 +47,6 @@ stdenv.mkDerivation rec {
./respect-xml-catalog-files-var.patch ./respect-xml-catalog-files-var.patch
./runtime-shell.patch ./runtime-shell.patch
./fix-install-with-tcb.patch ./fix-install-with-tcb.patch
# Fix build against `clang-16` and upcoming `gcc-14`:
# https://github.com/shadow-maint/shadow/pull/857
(fetchpatch {
name = "fix-implicit-getdef_bool.patch";
url = "https://github.com/shadow-maint/shadow/commit/5abe0811b880208600f646356549b7e5cad89060.patch";
hash = "sha256-XqvVv8mYY58uXJBKRwncHQRSI45PUkp3dQNn44gzezU=";
})
]; ];
# The nix daemon often forbids even creating set[ug]id files. # The nix daemon often forbids even creating set[ug]id files.