cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

shadow: 4.13 -> 4.14.0

Browse source 
Changes: https://github.com/shadow-maint/shadow/releases/tag/4.14.0
This commit is contained in:
Sergei Trofimovich 2023-09-09 02:20:22 +01:00
parent e009fad56f
commit dde4c871e1
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/os-specific/linux/shadow/default.nix
View file

@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, runtimeShell, nixosTests, fetchpatch , runtimeShell, nixosTests
, autoreconfHook, bison, flex , autoreconfHook, bison, flex
, docbook_xml_dtd_45, docbook_xsl , docbook_xml_dtd_45, docbook_xsl
, itstool , libxml2, libxslt , itstool, libbsd, libxml2, libxslt
, libxcrypt , libxcrypt, pkg-config
, glibcCross ? null , glibcCross ? null
, pam ? null , pam ? null
, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb , withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb
@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "shadow"; pname = "shadow";
version = "4.13"; version = "4.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shadow-maint"; owner = "shadow-maint";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA="; hash = "sha256-zopJevCv7ot8RLp/rSQGKO05eF4FjkLaOEMo9aq9Afo=";
}; };
outputs = [ "out" "su" "dev" "man" ]; outputs = [ "out" "su" "dev" "man" ];
@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
autoreconfHook bison flex autoreconfHook bison flex
docbook_xml_dtd_45 docbook_xsl docbook_xml_dtd_45 docbook_xsl
itstool libxml2 libxslt itstool libxml2 libxslt
pkg-config
]; ];
buildInputs = [ libxcrypt ] buildInputs = [ libbsd libxcrypt ]
++ lib.optional (pam != null && stdenv.isLinux) pam ++ lib.optional (pam != null && stdenv.isLinux) pam
++ lib.optional withTcb tcb; ++ lib.optional withTcb tcb;
@ -46,11 +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 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. # The nix daemon often forbids even creating set[ug]id files.