Commit Graph

389926 Commits

Author SHA1 Message Date
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
sternenseemann
a5c867d9fe libschrift: 0.10.1 -> 0.10.2 2022-07-06 10:32:04 -03:00
Jiajie Chen
0c0cb9dbe5 musescore: 2.1 -> 3.6.2.548020600 on darwin
- Release: https://github.com/musescore/MuseScore/releases/tag/v3.6.2
- Bump musescore to 3.6.2.548020600
- Update download url
- Change license to gpl3
2022-07-06 10:29:27 -03:00
Charlotte Van Petegem
1d5a0c0f4a mu: 1.8.3 -> 1.8.5
https://github.com/djcb/mu/releases/tag/v1.8.5
2022-07-06 21:18:07 +08:00
Bart Brouns
452c0ddf8a cardinal: 22.04 -> 22.06 2022-07-06 09:44:02 -03:00
Sandro
50cfe85316
Merge pull request #176144 from hardselius/jsonnet-language-server-0.7.2
jsonnet-language-server: init at 0.7.2
2022-07-06 14:36:36 +02:00
Tom Siewert
72e26a9f5b
hcloud: 1.29.5 -> 1.30.0
* hcloud: 1.29.5 -> 1.30.0

* hcloud: add fish to shell autocompletion

Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com>
2022-07-06 09:28:46 -03:00
Martin Weinelt
e25d5905ec
Merge pull request #180250 from dotlambda/levenshtein-0.18.2
python310Packages.levenshtein: 0.18.1 -> 0.18.2
2022-07-06 13:24:41 +02:00
rewine
8ef7523c8e
pineapple-pictures: init at 0.6.1 (#178583)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-07-06 11:28:26 +02:00
Jan Tojnar
0f9289e1b2
Merge pull request #157342 from magnetophon/networkmanager_dmenu
networkmanager_dmenu: 1.6.0 -> 2.1.0
2022-07-06 11:13:25 +02:00
Sandro
45e12964fe
Merge pull request #163630 from wentasah/trace-cmd-3.0
trace-cmd: 2.9.7 -> 3.1.1
2022-07-06 10:56:30 +02:00
Sandro
1fe9c408a2
Merge pull request #179939 from WeebSorceress/frece
frece: init at 1.0.6
2022-07-06 10:44:24 +02:00
Sandro
3f3d93e673
Merge pull request #179139 from vs49688/phonon
libsForQt5.phonon-backend-gstreamer: backport fix for https://bugs.kde.org/show_bug.cgi?id=445196
2022-07-06 10:41:15 +02:00
Robert Schütz
ec9ce3c94b python310Packages.levenshtein: 0.18.1 -> 0.18.2
https://github.com/maxbachmann/Levenshtein/releases/tag/v0.18.2
2022-07-06 08:29:32 +00:00
Robert Schütz
07f1d6bab7 python310Packages.rapidfuzz: 2.1.0 -> 2.1.2
https://github.com/maxbachmann/RapidFuzz/blob/v2.1.2/CHANGELOG.md
2022-07-06 08:29:32 +00:00
Robert Schütz
ed40dba171 python310Packages.jarowinkler: 1.0.5 -> 1.1.0
https://github.com/maxbachmann/JaroWinkler/releases/tag/v1.1.0
2022-07-06 08:29:25 +00:00
Arthur Gautier
934a622f7e qemu-utils: ensure we cut off qemu dependency 2022-07-06 07:13:29 +00:00
Arthur Gautier
fef6723f9b qemu-utils: remove qemu dependency
qemu-utils was pulling qemu which is a 900MB dependency. By removing
reference to it (unneeded), we're saving space on our deployments.
qemu-utils is a dependency of cloud-utils
2022-07-06 07:13:29 +00:00
Sergei Trofimovich
195c7143d9
Merge pull request #180146 from trofi/update-vxl-away-from-gcc6
vxl: 1.17.0-nix1 -> 3.3.2
2022-07-06 08:11:06 +01:00
Sergei Trofimovich
79f0470dc2
Merge pull request #180090 from trofi/drop-cuda-from-xmr-stak
xmr-stak: drop gcc6 requrement (and cuda support)
2022-07-06 08:10:15 +01:00
Sergei Trofimovich
d3c3db6a08
Merge pull request #180288 from trofi/mars-fix-libtdc++-clash
mars: fix build on gcc-10
2022-07-06 08:09:45 +01:00
Fabian Affolter
83f5b54b2e
Merge pull request #180298 from r-ryantm/auto-update/crlfsuite
crlfsuite: 2.0 -> 2.1.1
2022-07-06 09:08:21 +02:00
Fabian Affolter
75f3ce1821
Merge pull request #180303 from r-ryantm/auto-update/python3.10-skodaconnect
python310Packages.skodaconnect: 1.1.20 -> 1.1.21
2022-07-06 09:07:21 +02:00
Justin Bedő
e120ef6a5a
Merge pull request #180294 from NixOS/r-updates
R 4.2.0 -> 4.2.1 and bump package set
2022-07-06 15:43:09 +10:00
superherointj
3b1cbcc92b
ocamlPackages.yaml: 3.0.0 -> 3.1.0 (#180139)
ocamlPackages.ppx_deriving_yaml: 0.1.0 -> 0.1.1
2022-07-06 07:21:03 +02:00
Anderson Torres
6e6cabc4b8
Merge pull request #180306 from AndersonTorres/MISC
xosview: updates
2022-07-06 01:54:00 -03:00
R. Ryantm
25c4a062c6 puddletag: 2.1.1 -> 2.2.0 2022-07-06 12:49:53 +08:00
AndersonTorres
f4b885df97 xosview2: remove spurious doCheck = false 2022-07-06 01:28:12 -03:00
AndersonTorres
c2c8e8fdd2 xosview: init at 1.23 2022-07-06 01:28:11 -03:00
AndersonTorres
4066f82a4d all-packages.nix: cosmetic formatting of some comments 2022-07-06 01:28:11 -03:00
R. Ryantm
bf35d80187 python310Packages.skodaconnect: 1.1.20 -> 1.1.21 2022-07-06 03:19:05 +00:00
Timothy DeHerrera
a27f1085d7
Merge pull request #179566 from Kiskae/patch-1
nvidia_x11: 515.48.07 → 515.57
2022-07-05 18:57:45 -07:00
R. Ryantm
17c42e33b0 crlfsuite: 2.0 -> 2.1.1 2022-07-06 01:47:29 +00:00
R. Ryantm
069be5d427 python310Packages.ics: 0.7 -> 0.7.1 2022-07-05 18:36:21 -07:00
R. Ryantm
41e0ebb94d python310Packages.pytest-test-utils: 0.0.6 -> 0.0.7 2022-07-05 18:36:13 -07:00
R. Ryantm
14a8462418 python310Packages.islpy: 2022.1.2 -> 2022.2 2022-07-05 18:35:58 -07:00
R. Ryantm
33cda5786f libvirt: 8.4.0 -> 8.5.0 2022-07-05 18:34:27 -07:00
R. Ryantm
2f12a8d2b8 python310Packages.pygmt: 0.6.1 -> 0.7.0 2022-07-05 18:29:28 -07:00
R. Ryantm
42db1e66f3 python310Packages.yq: 2.14.0 -> 3.0.2 2022-07-05 18:27:03 -07:00
R. Ryantm
597db2e3b4 python310Packages.spacy-transformers: 1.1.6 -> 1.1.7 2022-07-05 18:22:47 -07:00
R. Ryantm
00b2db645c python310Packages.vispy: 0.10.0 -> 0.11.0 2022-07-05 18:20:58 -07:00
Kevin Cox
0b257763d2
Merge pull request #180135 from kevincox/redis-save
nixos.redis: Fix disabling of RDB persistence.
2022-07-05 20:58:27 -04:00
Martin Weinelt
6b511e4312
Merge pull request #179842 from LibreCybernetics/update-mypy 2022-07-06 01:51:28 +02:00
rdk31
8558ab08b6 vscode-extensions.ms-python.vscode-pylance: 2022.6.30 -> 2022.7.11 2022-07-05 20:28:41 -03:00
rdk31
14af83b82a vscode-extensions.ms-python.vscode-pylance: 2022.1.5 -> 2022.6.30 2022-07-05 20:28:41 -03:00
Azat Bahawi
aeb97834a8 werf: 1.2.117 -> 1.2.120 2022-07-05 20:23:16 -03:00
José Romildo Malaquias
0e60ec3f1a
Merge pull request #179804 from romildo/upd.mate-tweak
mate.mate-tweak: 22.04.4 -> 22.04.8
2022-07-05 20:22:00 -03:00
Martin Weinelt
c3c8278543
Merge pull request #180290 from mweinelt/fixes 2022-07-06 01:08:53 +02:00
Martin Weinelt
6785b339cc
python3Packages.gradient_statsd: propagate chardet 2022-07-06 00:57:49 +02:00
José Romildo Malaquias
0738126ae5
Merge pull request #179740 from romildo/fix.generic-updater
generic-updater: fix nix edit command line
2022-07-05 19:47:24 -03:00