Commit Graph

50683 Commits

Author SHA1 Message Date
Jan Tojnar
819fe6a918 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/data/icons/papirus-icon-theme/default.nix
2022-07-08 20:21:39 +02:00
superherointj
f65b415ffc
Merge pull request #180714 from superherointj/package-fioctl-0.26
fioctl: 0.25 -> 0.26
2022-07-08 13:05:25 -03:00
Kylie McClain
042b615344 s6-rc: 0.5.3.1 -> 0.5.3.2 2022-07-08 13:57:48 +00:00
Kylie McClain
058866f0f8 s6-networking: 2.5.1.0 -> 2.5.1.1 2022-07-08 13:57:48 +00:00
Kylie McClain
f655451d81 s6-dns: 2.3.5.3 -> 2.3.5.4 2022-07-08 13:57:48 +00:00
Kylie McClain
c2a481725d s6-portable-utils: 2.2.4.0 -> 2.2.5.0 2022-07-08 13:57:48 +00:00
Kylie McClain
0fa78fc25d s6: 2.11.1.0 -> 2.11.1.2 2022-07-08 13:57:48 +00:00
Kylie McClain
a28a389ab2 execline: 2.8.3.0 -> 2.9.0.1 2022-07-08 13:57:48 +00:00
superherointj
f2311c50f7 fioctl: 0.25 -> 0.26 2022-07-08 10:23:43 -03:00
Sandro
aa0897dedf
Merge pull request #180680 from r-ryantm/auto-update/exoscale-cli
exoscale-cli: 1.57.0 -> 1.58.0
2022-07-08 14:03:38 +02:00
Sandro
59f47422c9
Merge pull request #180688 from dramaturg/remove_dramaturg
exoscale-cli: remove myself from maintainers
2022-07-08 14:01:33 +02:00
Sebastian Krohn
94348d6854 exoscale-cli: remove myself from maintainers 2022-07-08 12:48:21 +02:00
R. Ryantm
527425c2d8 exoscale-cli: 1.57.0 -> 1.58.0 2022-07-08 09:52:09 +00:00
github-actions[bot]
2b26752329
Merge staging-next into staging 2022-07-08 06:01:53 +00:00
github-actions[bot]
f08a2153bf
Merge master into staging-next 2022-07-08 06:01:15 +00:00
Lassulus
1963015a7c
Merge pull request #172372 from Yarny0/tsm-client
tsm-client: 8.1.14.0 -> 8.1.15.0 & fix patching rpath with autoPatchelf
2022-07-08 03:51:14 +02:00
Anderson Torres
a5884d468a
Merge pull request #180132 from catap/wipefreespace
wipefreespace: init at 2.5
2022-07-07 22:26:28 -03:00
Anderson Torres
5c6b4f0a38
Merge pull request #180225 from jiegec/hdfview-darwin
Add darwin support for hdfview
2022-07-07 22:24:49 -03:00
github-actions[bot]
527a304ac4
Merge staging-next into staging 2022-07-08 00:03:17 +00:00
github-actions[bot]
e1123916d6
Merge master into staging-next 2022-07-08 00:02:37 +00:00
Martin Weinelt
39c35c48b8
Merge pull request #178671 from r-ryantm/auto-update/esphome 2022-07-08 01:01:45 +02:00
Bruno Bigras
17d97257e5 yggdrasil: 0.4.3 -> 0.4.4 2022-07-07 17:32:11 -05:00
R. Ryantm
14dbf57ee7 esphome: 2022.6.0 -> 2022.6.2 2022-07-07 22:28:53 +00:00
Fabian Affolter
ed28768304
Merge pull request #180412 from fabaff/grype-bump
grype: 0.40.1 -> 0.41.0, syft: 0.49.0 -> 0.50.0
2022-07-08 00:03:46 +02:00
Yarny0
4f4aa9685a tsm-client: 8.1.14.0 -> 8.1.15.0
IBM's "Authorized Program Analysis Report"s
(something like release notes):

https://www.ibm.com/support/pages/node/6590857

README:

https://www.ibm.com/support/pages/node/6593819

Security Bulletins:

https://www.ibm.com/support/pages/node/6596379 (CVE-2021-35550, CVE-2021-35603)
https://www.ibm.com/support/pages/node/6596741 (CVE-2022-22478, CVE-2022-22474)
https://www.ibm.com/support/pages/node/6596399 (CVE-2022-0778)
2022-07-07 19:22:30 +02:00
Martin Weinelt
1c4ee228e2 Merge remote-tracking branch 'origin/staging-next' into staging 2022-07-07 19:20:35 +02:00
Yarny0
1ed9ba08f1 tsm-client: fix patching rpath with autoPatchelf
Since commit
7b9fd5d1c9
tsm-client no longer produces working binaries
(discovered with bisection).
Instead, calling the command line client `dsmc`
just produces the error

> error while loading shared libraries: libtsmxerces-depdom.so.28: cannot open shared object file: No such file or directory

Output of `ldd $out/dsmc`

> linux-vdso.so.1 (0x00007ffd89f70000)
> libgsk8ssl_64.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/local/ibm/gsk8_64/lib64/libgsk8ssl_64.so (0x0000791c8eb34000)
> libgsk8iccs_64.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/local/ibm/gsk8_64/lib64/libgsk8iccs_64.so (0x0000791c8e9b7000)
> libgsk8km_64.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/local/ibm/gsk8_64/lib64/libgsk8km_64.so (0x0000791c8e791000)
> libxmlutil-8.1.13.0.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/opt/tivoli/tsm/client/api/bin64/libxmlutil-8.1.13.0.so (0x0000791c8e675000)
> libcrypt.so.1 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libcrypt.so.1 (0x0000791c8e639000)
> libpthread.so.0 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libpthread.so.0 (0x0000791c8e619000)
> libdl.so.2 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libdl.so.2 (0x0000791c8e614000)
> libstdc++.so.6 => /nix/store/ndnqiz3nnifj1blhg9q626xlmkqq1nmh-gcc-10.3.0-lib/lib/libstdc++.so.6 (0x0000791c8e43f000)
> libgpfs.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/opt/tivoli/tsm/client/api/bin64/libgpfs.so (0x0000791c8e22a000)
> libdmapi.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/opt/tivoli/tsm/client/api/bin64/libdmapi.so (0x0000791c8e020000)
> librt.so.1 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/librt.so.1 (0x0000791c8e015000)
> libm.so.6 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libm.so.6 (0x0000791c8ded4000)
> libgcc_s.so.1 => /nix/store/ndnqiz3nnifj1blhg9q626xlmkqq1nmh-gcc-10.3.0-lib/lib/libgcc_s.so.1 (0x0000791c8deba000)
> libc.so.6 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libc.so.6 (0x0000791c8dce5000)
> libgsk8cms_64.so => /nix/store/i21g0x44g336ag8rkx0dgndb9v4w2xhk-tsm-client-8.1.13.3-unwrapped/local/ibm/gsk8_64/lib64/libgsk8cms_64.so (0x0000791c8d78d000)
> /nix/store/4s21k8k7p1mfik0b33r2spq5hq7774k1-glibc-2.33-108/lib/ld-linux-x86-64.so.2 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib64/ld-linux-x86-64.so.2 (0x0000791c8f074000)
> libtsmxerces-depdom.so.28 => not found
> libtsmxerces-c.so.28 => not found

Output of `ldd $out/lib/libtsmxerces-depdom.so.28`

> linux-vdso.so.1 (0x00007fff69388000)
> libpthread.so.0 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libpthread.so.0 (0x000078f150454000)
> libtsmxerces-c.so.28 => not found
> libstdc++.so.6 => /nix/store/ndnqiz3nnifj1blhg9q626xlmkqq1nmh-gcc-10.3.0-lib/lib/libstdc++.so.6 (0x000078f15027f000)
> libm.so.6 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libm.so.6 (0x000078f15013e000)
> libgcc_s.so.1 => /nix/store/ndnqiz3nnifj1blhg9q626xlmkqq1nmh-gcc-10.3.0-lib/lib/libgcc_s.so.1 (0x000078f150124000)
> libc.so.6 => /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib/libc.so.6 (0x000078f14ff4d000)
> /nix/store/qjgj2642srlbr59wwdihnn66sw97ming-glibc-2.33-123/lib64/ld-linux-x86-64.so.2 (0x000078f150601000)

The commit given above rewrote the `autoPatchelfHook`.
The new hook still calls `patchelf` to actually
modify binary files, but the discovery of
shared libraries apparently got changed.

Thorough investigation of all `patchelf` calls in the
old and new autoPatchelfHook showed that all files are
treated equally up the the files

* $out/opt/tivoli/tsm/client/api/bin64/libtsmxerces-depdom.so.28.0
* $out/opt/tivoli/tsm/client/api/bin64/libxmlutil-8.1.13.0.so

where the new autoPatchelf implementation replaced `$out/lib`
with `$out/opt/tivoli/tsm/client/api/bin64` in the rpath.

I failed to see *why* the new algorithm does
that, or if that might be considered a bug.
The `tsm-client` package has some confusing symlink
structure which certainly might confuse `autoPatchelfHook`.

The following ideas to "restore" the old behaviour
of `autoPatchelfHook` failed to produce a working package:
* add "$out" or "${placeholder "out"}" to `runtimeDependencies`
* use `addAutoPatchelfSearchPath` with `$out/lib` or
  another so-file-containing directory

The commit at hand fixes the issue by directly adding `$out/lib`
to the rpath of all shared libraries in that directory.
This has to be done *after* `autoPatchelf` got executed.
To accomplish this, we disable auto-calling `autoPatchelf`
(it would run after `postFixup`) and instead call it
manually in `postFixup`, just before we patch the rpath by hand.
2022-07-07 19:05:28 +02:00
Vladimír Čunát
c869aa9ac9
Merge branch 'master' into staging-next
The purpose is to integrate the usual Haskell rebuild.
2022-07-07 18:50:02 +02:00
Sandro
9b45da9a60
Merge pull request #180172 from PedroHLC/unzip-no-lchmod
unzip: no-lchmod build flag
2022-07-07 16:40:04 +02:00
Sandro
077717dc4f
Merge pull request #180227 from SuperSandro2000/goreleaser
goreleaser: 1.9.2 -> 1.10.1
2022-07-07 16:32:48 +02:00
Sandro
ed474bf685
Merge pull request #176139 from jsoo1/jsoo1/limitcpu 2022-07-07 15:53:23 +02:00
Kevin Cox
1b47a92ce4
Merge pull request #178057 from risicle/ris-native-source-provenance-servers-tools-2
treewide/servers,shells,tools: add `sourceType` for more packages
2022-07-07 09:18:24 -04:00
superherointj
2ab39ba855
Merge pull request #180461 from r-ryantm/auto-update/chafa
chafa: 1.10.3 -> 1.12.3
2022-07-07 09:25:25 -03:00
Jan Tojnar
d910a8b8a5 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/data/icons/zafiro-icons/default.nix
2022-07-07 14:24:09 +02:00
github-actions[bot]
312ad6d25c
Merge master into staging-next 2022-07-07 12:01:23 +00:00
R. Ryantm
d7997beea2 dsp: 1.8 -> 1.9 2022-07-07 09:37:16 +00:00
R. Ryantm
3014367d9e btop: 1.2.7 -> 1.2.8 2022-07-07 11:31:32 +02:00
R. Ryantm
1b967531ec chafa: 1.10.3 -> 1.12.3 2022-07-07 08:45:52 +00:00
Rick van Schijndel
1087022693
Merge pull request #180386 from sikmir/foma
foma: fix cross-compilation
2022-07-07 08:29:41 +02:00
github-actions[bot]
a9e0051c3f
Merge master into staging-next 2022-07-07 06:01:20 +00:00
superherointj
9bb2ef1532
Merge pull request #180354 from onny/barman
barman: 2.17 -> 3.0.0
2022-07-06 22:48:54 -03:00
superherointj
53e411ba28
Merge pull request #180396 from techknowlogick/boundbump
boundary: 0.9.0 -> 0.9.1
2022-07-06 22:44:45 -03:00
superherointj
3bcf4864f0
Merge pull request #180416 from r-ryantm/auto-update/aws-iam-authenticator
aws-iam-authenticator: 0.5.7 -> 0.5.9
2022-07-06 22:38:04 -03:00
R. Ryantm
47955687cc aws-iam-authenticator: 0.5.7 -> 0.5.9 2022-07-07 00:55:39 +00:00
superherointj
e8bd76819f
Merge pull request #176200 from aaronjheng/git-town
git-town: use buildGoModule
2022-07-06 21:54:47 -03:00
Aaron Jheng
2128994aaa
git-town: use buildGoModule 2022-07-07 00:39:29 +00:00
github-actions[bot]
c0b6f4c121
Merge master into staging-next 2022-07-07 00:02:29 +00:00
Fabian Affolter
05ba257137
Merge pull request #179419 from fabaff/gitleaks-bump
gitleaks: 8.8.8 -> 8.8.10
2022-07-07 01:12:11 +02:00
Fabian Affolter
134d3cee2e gitleaks: 8.8.10 -> 8.8.11 2022-07-07 00:42:01 +02:00
Fabian Affolter
2cec3ce26b syft: 0.49.0 -> 0.50.0 2022-07-07 00:29:54 +02:00