b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
nixpkgs/pkgs/tools/system
History
Alyssa Ross fd78240ac8
treewide: use lib.getLib for OpenSSL libraries 
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
..
acct tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
acpica-tools acpica-tools: 20210930 -> 20211217 2021-12-29 02:53:08 +08:00
actkbd tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
amtterm pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
at treewide: fix double quoted strings in meta.description 2021-01-24 19:56:59 +07:00
augeas pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
auto-cpufreq auto-cpufreq: 1.7.0 -> 1.7.1 2021-10-18 12:27:19 +00:00
awstats awstats: 7.7.0 -> 7.8.0 2021-04-17 16:37:29 +02:00
bar tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
bfs bfs: 2.3 -> 2.3.1 2022-01-23 22:29:47 +00:00
bottom bottom: 0.6.6 -> 0.6.8 2022-02-03 09:09:11 +10:00
bpytop Treewide: fix wrong declaration of Apache License 2.0 2022-01-02 15:23:43 +01:00
btop btop: 1.2.4 -> 1.2.5 2022-03-06 02:15:18 +00:00
chase pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
clinfo clinfo: enable on darwin 2021-11-08 17:44:04 -08:00
cm-rgb treewide: remove danieldk as maintainer from a set of packages 2021-09-12 14:42:12 +00:00
collectd Merge pull request #158353 from symphorien/collectd-xen-insecure-master 2022-02-09 19:13:10 +00:00
colorls treewide: add final newline 2021-01-22 07:18:04 +10:00
confd
consul-template consul-template: 0.27.2 -> 0.28.0 2022-03-04 03:46:48 +00:00
cron tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
ctop ctop: 0.7.6 -> 0.7.7 2022-03-23 11:00:10 +01:00
daemon daemon: 0.7.1 -> 0.8 2021-03-08 08:47:10 +00:00
daemonize daemonize: switch to fetchFromGitHub 2021-10-24 15:09:37 +02:00
das_watchdog das_watchdog: switch to fetchFromGitHub 2022-03-14 19:32:08 +01:00
datefudge datefudge: work correctly even if GNU date is not in PATH (#94045) 2021-11-01 21:15:50 +01:00
dcfldd tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
dd_rescue treewide: remove all updateWalker/downloadURLRegexp 2022-01-26 21:46:08 +01:00
ddrescue ddrescue: 1.25 -> 1.26 2022-01-25 03:20:04 +01:00
ddrescueview tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
ddrutility treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
dfc pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
di treewide: remove all updateWalker/downloadURLRegexp 2022-01-26 21:46:08 +01:00
disk-filltest treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
dog tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
efibootmgr treewide: reenable LTO on i686 2021-11-05 22:16:50 -07:00
efivar efivar: fix LTO build 2021-11-05 23:32:46 -07:00
envconsul treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
evemu treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
facter facter: 3.14.16 -> 3.14.17 2021-05-01 14:03:04 +00:00
fakechroot fakechroot: Add tests.nixos-etc 2022-01-30 09:01:27 +01:00
fakeroot fakeroot: 1.23 -> 1.27 2022-02-06 17:22:13 +01:00
fancy-motd fancy-motd: unstable-2021-07-04 -> unstable-2021-07-15 2021-07-16 00:06:29 +02:00
fcron fcron: 3.3.0 -> 3.3.1 2021-12-21 12:04:43 +00:00
fdisk tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
fio fio: add missing six dependency 2022-01-08 00:43:07 +01:00
foreman foreman: add more platform support 2021-09-25 19:11:55 +02:00
foremost treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
freeipmi freeipmi: 1.6.8 -> 1.6.9 2022-02-11 18:44:41 +00:00
gdmap tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
gdu gdu: add maintainer 2022-02-20 10:48:12 +10:00
gkraken gkraken: init at 1.1.6 2021-10-03 12:42:55 +02:00
go-audit go-audit: 1.0.0 -> 1.1.1 2022-02-12 08:50:58 +00:00
gohai treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
goreman goreman: 0.3.9 -> 0.3.11 (#163805) 2022-03-19 14:33:03 +01:00
gotop gotop: 4.1.2 -> 4.1.3 2022-02-15 09:01:51 +01:00
gptfdisk gptfdisk: fix build against upcoming ncurses-6.3 2021-11-28 22:10:27 +00:00
gptman gptman: 0.8.2 -> 0.8.3 2022-01-11 21:35:02 +01:00
gt5 tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
hardinfo pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
hardlink treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
hiera-eyaml treewide: add final newline 2021-01-22 07:18:04 +10:00
honcho honcho: 1.0.1 -> 1.1.0, fix the package 2021-10-31 11:44:38 -06:00
hostctl hostctl: update description 2022-03-18 10:19:33 +01:00
htop htop: 3.1.1 -> 3.1.2 2021-12-07 03:48:08 +00:00
hwinfo hwinfo: 21.78 -> 21.80 2021-12-31 02:26:46 +00:00
idle3tools tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
illum illum: 0.4 -> 0.5 2021-09-23 07:59:40 +02:00
incron tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
inxi inxi: Remove myself as maintainer 2021-04-17 18:59:41 +02:00
ioping treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
ior mpi: use mpi attribute consistently as the default MPI implementations 2021-01-23 12:15:13 +01:00
ipmitool ipmitool: cleanup 2021-07-29 14:42:11 +02:00
ipmiutil treewide: remove *.upstream files from updateWalker 2022-01-26 21:46:07 +01:00
java-service-wrapper java-service-wrapper: 3.5.48 -> 3.5.49 2022-02-22 22:37:57 +01:00
journalwatch treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
jsvc jsvc: init at 1.2.4 2021-04-26 13:43:12 -07:00
jump jump: 0.30.1 -> 0.40.0 2021-01-22 13:38:36 +00:00
kmon kmon: 1.5.5 -> 1.6.0, clarify license 2021-11-05 16:20:10 -04:00
krakenx
ledmon pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
loadwatch loadwatch: cleanup 2021-07-29 14:43:04 +02:00
localtime localtime: 2017-11-07 -> 2021-11-23 2021-12-08 15:23:03 +00:00
logcheck logcheck: fix license 2021-05-01 09:06:59 +10:00
logrotate nixos tests: add logrotate test 2022-02-13 07:29:40 +09:00
lr maintainer-list.nix: replace vikanezrimaya's github username 2022-03-01 07:54:57 +03:00
lshw maintainers: drop phreedom 2021-12-19 07:30:50 +01:00
mcron tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
memtester treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
minijail minijail: enableParallelBuilding 2021-08-17 17:42:41 +00:00
mlc treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
monit treewide: use lib.getLib for OpenSSL libraries 2022-03-30 15:10:00 +00:00
mq-cli treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
nats-top nats-top: 0.4.0 -> 0.5.0 2022-03-23 22:57:25 +00:00
natscli natscli: 0.0.29 -> 0.0.30 2022-03-12 12:57:03 +01:00
netdata netdata: fix protobuf support 2022-02-28 04:59:55 +01:00
nkeys nkeys: init at 0.3.0 2021-04-05 14:10:04 +02:00
nq nq: fix tq 2021-05-28 11:24:52 -07:00
nvtop nvtop: 1.1.0 -> 1.2.2 2021-08-17 10:38:02 -07:00
opencl-info opencl-info: cleanup 2021-07-29 14:44:36 +02:00
openipmi openipmi: 2.0.31 -> 2.0.32 2021-12-01 23:44:16 +03:00
openseachest openseachest: init at 21.06.21 2021-10-19 17:21:42 +03:00
pciutils tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
pcstat pcstat: 2017-05-28 -> 0.0.1 2022-02-28 10:19:59 +01:00
plan9port plan9port: add DarwinTools to buildInputs on darwin 2021-11-30 15:59:43 -08:00
procodile treewide: add final newline 2021-01-22 07:18:04 +10:00
proot proot: 5.2.0 -> 5.3.0 (#157582) 2022-02-01 22:12:06 -05:00
ps_mem python,pythonPackages: make aliases 2022-01-16 18:39:59 +00:00
psensor pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
psstop pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
r10k treewide: add final newline 2021-01-22 07:18:04 +10:00
retry maintainers: add gfrascadorio 2021-05-19 15:20:47 -06:00
rocm-smi rocm-smi: 5.0.0 -> 5.0.2 2022-03-14 12:01:33 +01:00
rofi-systemd treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
rowhammer-test rowhammer-test: cleanup 2021-07-29 14:44:59 +02:00
rsyslog rsyslog: 8.2112.0 -> 8.2202.0 2022-02-20 12:33:49 +00:00
runit pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
s-tui treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
s6 skawarePackages: Winter 2021-2022 release 2021-12-25 13:03:14 +01:00
s6-rc skawarePackages: Winter 2021-2022 release 2021-12-25 13:03:14 +01:00
safe-rm safe-rm: 0.12 -> 1.1.0 2021-05-23 21:38:00 +02:00
safecopy tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
setserial pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
sg3_utils sg3_utils: 1.46r862 -> 1.47 2022-01-02 19:52:51 +01:00
skeema skeema: init at 1.7.0 2022-02-20 01:29:41 +00:00
sleuthkit sleuthkit: 4.11.0 -> 4.11.1 2022-01-01 23:32:57 +01:00
smartmontools Drop myself from meta.maintainers for most packages. 2021-10-14 11:01:27 +02:00
snooze snooze: 0.4 -> 0.5 2021-03-14 05:06:45 -04:00
socklog treewide: fix double quoted strings in meta.description 2021-01-24 19:56:59 +07:00
stress tools/system: replace name with pname&version 2021-07-28 16:42:26 +02:00
stress-ng stress-ng: 0.13.08 -> 0.13.09 2021-12-21 20:22:05 +01:00
stressapptest stressapptest: init at 1.0.9 2021-02-17 23:11:59 +01:00
suid-chroot treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
supervise pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
symlinks symlinks: switch to fetchFromGitHub 2021-10-24 15:10:14 +02:00
syslog-ng syslogng: 3.35.1 -> 3.36.1 2022-03-11 02:22:50 +00:00
syslog-ng-incubator python,pythonPackages: make aliases 2022-01-16 18:39:59 +00:00
systemd-journal2gelf treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
taskspooler taskspooler: init at 1.0 2021-06-23 14:07:54 +02:00
testdisk pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
thermald thermald: disable -Werror 2022-03-02 22:08:38 -06:00
thinkfan thinkfan: 1.3.0 -> 1.3.1 2022-02-08 07:18:28 +00:00
throttled throttled: 0.8 -> 0.9.2 2021-08-19 19:26:35 +00:00
tm tm: cleanup 2021-07-05 20:14:04 +02:00
tp-auto-kbbl tp-auto-kbbl: init at 0.1.5 2021-10-01 13:12:58 +02:00
tre-command treewide: fix cargoSha256/cargoHash 2021-05-08 00:36:37 -07:00
tree tree: fix build on darwin/others 2021-11-14 11:18:53 -05:00
ts tools/system: replace name with pname&version 2021-07-28 16:42:26 +02:00
tuptime Merge pull request #156134 from r-ryantm/auto-update/tuptime 2022-01-22 07:00:07 -08:00
uefitool uefitool.new-engine: A58 -> A59 2021-10-20 01:39:45 +02:00
undaemonize tools/system: replace name with pname&version 2021-07-28 16:42:26 +02:00
uptimed uptimed: 0.4.5 -> 0.4.6 2022-01-01 23:37:24 +01:00
uroboros uroboros: init at 20210304-9bed95b 2021-03-05 08:22:59 +01:00
vbetool treewide: update permanent url redirects 2021-01-30 21:48:57 +01:00
vboot_reference lzma: deprecate alias 2021-04-04 19:49:52 +02:00
which which: replace name with pname&version 2021-07-27 16:57:58 +02:00
wslu wslu: init at 3.2.3 2021-05-20 09:40:04 -07:00
wsmancli various: cleanup of 'inherit version;' 2021-07-16 00:17:12 +02:00
xe
yeshup treewide: with stdenv.lib; in meta -> with lib; 2021-01-11 10:38:22 +01:00
zenith zenith: use buildFeatures 2021-11-16 08:11:46 -05:00