gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "coreutils.passthru.binlore: fix chcon/runcon"

Browse Source 
Now that the "--with-selinux" option works, this is no longer needed.

This reverts commit 213240c7e4.
This commit is contained in:
Michael Daniels
2026-02-06 20:48:10 -05:00
parent 504699df98
commit 2a525c0971
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils/default.nix
+7 -15
View File
@@ -235,27 +235,19 @@ stdenv.mkDerivation (finalAttrs: {
#
# binlore only spots exec in runcon on some platforms (i.e., not
# darwin; see comment on inverse case below)
binlore.out = binlore.synthesize finalAttrs.finalPackage (
''
execer can bin/{chroot,env,install,nice,nohup,sort,split,stdbuf,timeout}
execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
''
+ optionalString selinuxSupport ''
execer can bin/runcon
execer cannot bin/chcon
''
);
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
'';
}
// optionalAttrs (singleBinary == false) {
# binlore only spots exec in runcon on some platforms (i.e., not
# darwin; I have a note that the behavior may need selinux?).
# hard-set it so people working on macOS don't miss cases of
# runcon until ofBorg fails.
binlore.out = binlore.synthesize finalAttrs.finalPackage (
optionalString selinuxSupport ''
execer can bin/runcon
''
);
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
execer can bin/runcon
'';
};
meta = {