Commit graph

49004 commits

Author SHA1 Message Date
Artturin 71cbf3b809 gobject-introspection: use targetOffset to look for libraries for target
fixes it finding the build and target gobject-introspection when it should only find the
target gobject-introspection
2022-07-07 21:18:23 +03:00
Artturin a83d2f7c91 gobject-introspection: cross improvements
gobject-introspection: copy $dev/share/gobj.../tests when cross-compiling

gobject-introspection: add giscanner-ignore-error-return-codes-from-ldd-wrapper patch

polkit-aarch64-unknown-linux-gnu> [102/104] Generating src/polkitagent/PolkitAgent-1.0.gir with a custom command
polkit-aarch64-unknown-linux-gnu> FAILED: src/polkitagent/PolkitAgent-1.0.gir
polkit-aarch64-unknown-linux-gnu> <storepath>-gobject-introspection-wrapped-1.72.0-dev/bin/g-ir-scanner --no-libtool --namespace=PolkitAgent --nsversion=1.0 --warn-all --output src/polkitagent/PolkitAgent-1.0.gir --c-include=polkitagent/polkitagent.h -
D_POLKIT_AGENT_COMPILATION -D_POLKIT_COMPILATION -I/build/source/src/polkitagent -I/build/source/build/src/polkitagent -I/build/source/. -I/build/source/build/. -I/build/source/src/. -I/build/source/build/src/. --filelist=/build/source/build/src/polkitagent/libpolkit-agent-1.so.0.0.0
.p/PolkitAgent_1.0_gir_filelist --include=Gio-2.0 --include-uninstalled=src/polkit/Polkit-1.0.gir --pkg-export=polkit-agent-1 --cflags-begin -DHAVE_CONFIG_H -I/build/source/. -I/build/source/build/. -I/build/source/src/. -I/build/source/build/src/. -I/nix/store/lqncny8acp6hkclsgbfnrb
65i9hscsmn-expat-aarch64-unknown-linux-gnu-2.4.8-dev/include -I<storepath>-glib-aarch64-unknown-linux-gnu-2.72.2-dev/include/gio-unix-2.0 -I<storepath>-glib-aarch64-unknown-linux-gnu-2.72.2-dev/include -I/nix/store/qm1wa
x4c7sgf5h3b6dhspxb5miayjyc9-glib-aarch64-unknown-linux-gnu-2.72.2-dev/include/glib-2.0 -I<storepath>-glib-aarch64-unknown-linux-gnu-2.72.2/lib/glib-2.0/include -I<storepath>-gobject-introspection-aarch64-unknown-linux-gn
u-1.72.0-dev/include/gobject-introspection-1.0 --cflags-end --add-include-path=<storepath>-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0-dev/share/gir-1.0 --add-include-path=/build/source/build/src/polkit -L/build/source/build/src/polkitagent
--library polkit-agent-1 -L/build/source/build/src/polkit -L<storepath>-expat-aarch64-unknown-linux-gnu-2.4.8/lib --extra-library=expat -L<storepath>-glib-aarch64-unknown-linux-gnu-2.72.2/lib --extra-library=gio-2.0 --ex
tra-library=gobject-2.0 --extra-library=glib-2.0 -L<storepath>-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0/lib --extra-library=girepository-1.0 --sources-top-dirs /build/source/subprojects/ --sources-top-dirs /build/source/build/subprojects/
polkit-aarch64-unknown-linux-gnu> g-ir-scanner: link: aarch64-unknown-linux-gnu-gcc -o /build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0 /build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0.o -L. -Wl,-rpath,. -Wl,--no-as-needed -L/build/source/build/src/polkitagent -Wl
,-rpath,/build/source/build/src/polkitagent -L/build/source/build/src/polkit -Wl,-rpath,/build/source/build/src/polkit -L<storepath>-expat-aarch64-unknown-linux-gnu-2.4.8/lib -Wl,-rpath,<storepath>-expat-aarch64-unknown-
linux-gnu-2.4.8/lib -L<storepath>-glib-aarch64-unknown-linux-gnu-2.72.2/lib -Wl,-rpath,<storepath>-glib-aarch64-unknown-linux-gnu-2.72.2/lib -L<storepath>-gobject-introspection-aarch64-unk
nown-linux-gnu-1.72.0/lib -Wl,-rpath,<storepath>-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0/lib -lpolkit-agent-1 -lexpat -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgirepository-1.0 -L<storepath>-glib-aarch64-unknow
n-linux-gnu-2.72.2/lib -lgio-2.0 -lgobject-2.0 -Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0
polkit-aarch64-unknown-linux-gnu> Traceback (most recent call last):
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-gobject-introspection-wrapped-1.72.0-dev/bin/.g-ir-scanner-wrapped", line 99, in <module>
polkit-aarch64-unknown-linux-gnu>     sys.exit(scanner_main(sys.argv))
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-gobject-introspection-wrapped-1.72.0/lib/gobject-introspection/giscanner/scannermain.py", line 646, in scanner_main
polkit-aarch64-unknown-linux-gnu>     shlibs = create_binary(transformer, options, args)
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-gobject-introspection-wrapped-1.72.0/lib/gobject-introspection/giscanner/scannermain.py", line 471, in create_binary
polkit-aarch64-unknown-linux-gnu>     shlibs = resolve_shlibs(options, binary, options.libraries)
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-gobject-introspection-wrapped-1.72.0/lib/gobject-introspection/giscanner/shlibs.py", line 179, in resolve_shlibs
polkit-aarch64-unknown-linux-gnu>     _resolve_non_libtool(options, binary, non_libtool))
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-gobject-introspection-wrapped-1.72.0/lib/go
bject-introspection/giscanner/shlibs.py", line 112, in _resolve_non_libtool
polkit-aarch64-unknown-linux-gnu>     output = subprocess.check_output(args)
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-python3-3.10.5/lib/python3.10/subprocess.py", line 420, in check_output
polkit-aarch64-unknown-linux-gnu>     return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
polkit-aarch64-unknown-linux-gnu>   File "<storepath>-python3-3.10.5/lib/python3.10/subprocess.py", line 524, in run
polkit-aarch64-unknown-linux-gnu>     raise CalledProcessError(retcode, process.args,
polkit-aarch64-unknown-linux-gnu> subprocess.CalledProcessError: Command '['<storepath>-prelink-unstable-2019-06-24/bin/prelink-rtld', '/build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0']' returned non-zero exit status 127.
polkit-aarch64-unknown-linux-gnu> [103/104] Generating src/polkit/Polkit-1.0.typelib with a custom command
polkit-aarch64-unknown-linux-gnu> ninja: build stopped: subcommand failed.

exit status 127

gobject-introspection: this should fix pkgsMusl pkgsStatic

by not putting `/nix/store/iw35xj69w190w7vw17l8mac8srg0vpyz-gobject-introspection-static-x86_64-unknown-linux-musl-1.72.0.drv`

in their dependency tree when gobject-introspection is in
nativeBuildInputs ex .#pkgsStatic.libjxl

gobject-introspection: pc file: use binaries from path instead of a abs path to them

fixes issues in networkmanager and some other packages
```
gi._error.GError: g-invoke-error-quark: Could not locate g_option_error_quark: /nix/store/...-glib-aarch64-unknown-linux-gnu-2.72.2/lib/libglib-2.0.so.0:
cannot open shared object file: No such file or directory (1)
```

see comment

gobject-introspection: propagate gobject-introspection-unwrapped in wrapper

with this it is no longer needed to put gobject-introspection in
buildInputs in addition to nativeBuildInputs
2022-07-07 21:18:23 +03:00
Artturin 10362d7280 librdf_raptor2: 2.0.15 -> unstable-2022-06-06
switches to using cmake and fixes cross-compilation
2022-07-07 17:27:39 +03:00
ajs124 6745a0d63a
Merge pull request #180281 from mweinelt/openssl
openssl_3: 3.0.4 -> 3.0.5; openssl_1_1: 1.1.1p -> 1.1.1q
2022-07-06 17:04:20 +02:00
github-actions[bot] 5a3eeeb9bb
Merge staging-next into staging 2022-07-06 12:02:07 +00:00
github-actions[bot] fc60f033e5
Merge master into staging-next 2022-07-06 12:01:31 +00: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
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
github-actions[bot] 7c1c19b4df
Merge staging-next into staging 2022-07-06 06:02:06 +00:00
github-actions[bot] f475dc6eb4
Merge master into staging-next 2022-07-06 06:01:27 +00:00
R. Ryantm 33cda5786f libvirt: 8.4.0 -> 8.5.0 2022-07-05 18:34:27 -07:00
github-actions[bot] a56995cf80
Merge staging-next into staging 2022-07-06 00:02:58 +00:00
github-actions[bot] c505b8a0b8
Merge master into staging-next 2022-07-06 00:02:20 +00:00
Martin Weinelt 82da6eb46d
openssl_1_1: 1.1.1p -> 1.1.1q
https://www.openssl.org/news/secadv/20220705.txt

Fixes: CVE-2022-2097
2022-07-05 23:14:13 +02:00
Martin Weinelt 1dbf7b45e2
openssl_3: 3.0.4 -> 3.0.5
https://www.openssl.org/news/secadv/20220705.txt

We already acted on the first public disclosure, so this release removes
the previous patch and upgrades to the release including the fix.

Related: CVE-2022-2274
Fixes: CVE-2022-2097
2022-07-05 23:14:10 +02:00
Thomas Tuegel 28560923f2
Merge pull request #179062 from klemensn/baloo-unbreak-service-startup
plasma5Package.baloo: Unbreak kde-baloo.service startup
2022-07-05 13:29:06 -05:00
Kevin Cox 051b5b6a2c
Merge pull request #178171 from milahu/qt6-631
qt6: 6.3.0 -> 6.3.1
2022-07-05 14:22:46 -04:00
github-actions[bot] 4a077da28e
Merge staging-next into staging 2022-07-05 18:01:57 +00:00
github-actions[bot] 060674a777
Merge master into staging-next 2022-07-05 18:01:21 +00:00
Martin Weinelt d2e0e42473
Merge pull request #179620 from Atry/master 2022-07-05 19:14:14 +02:00
Ben Wolsieffer eded0d654c octomap: 1.9.7 -> 1.9.8 2022-07-05 14:09:02 -03:00
Yang, Bo d10999d733 Add knownVulnerabilities to libdwarf 2022-07-05 17:08:50 +00:00
Bernardo Meurer 029ae63283
Merge pull request #180236 from K900/wireplumber-update
wireplumber: 0.4.10 -> 0.4.11
2022-07-05 09:16:38 -07:00
Robert Hensing d2952941ba
Merge pull request #180067 from Artturin/depcmakestring
stdenv: start deprecating non-list cmakeFlags
2022-07-05 15:35:41 +02:00
K900 75ec318b80 wireplumber: 0.4.10 -> 0.4.11 2022-07-05 16:30:29 +03:00
Weijia Wang a53c70b65d a52dec: fix build on aarch64-darwin 2022-07-05 09:01:15 +02:00
Artturin 732f1d8142 treewide: convert string cmakeFlags to list of strings 2022-07-05 04:05:30 +03:00
github-actions[bot] f235128594
Merge staging-next into staging 2022-07-04 18:01:48 +00:00
github-actions[bot] 54d54fd740
Merge master into staging-next 2022-07-04 18:01:14 +00:00
Sergei Trofimovich df304cc773 vxl: 1.17.0-nix1 -> 3.3.2
While at it drop pin to gcc6 and outdated jpeg.
2022-07-04 18:27:14 +01:00
superherointj 4d26010c93
Merge pull request #180063 from helsinki-systems/upd/jose
jose: 10 -> 11
2022-07-04 11:44:21 -03:00
github-actions[bot] 03ce3f8c08
Merge staging-next into staging 2022-07-04 12:12:04 +00:00
Nick Cao 47342c280a
gtk-engine-murrine: move intltool to nativeBuildInputs, set strictDeps 2022-07-04 19:43:53 +08:00
Milan Hauth e45d0464d5 qt6: 6.3.0 -> 6.3.1 2022-07-04 12:59:12 +02:00
Vladimír Čunát 4f6caefe5c
Merge #180095: tracker: use upstream patch instead of disabling test
...into staging-next
2022-07-04 12:33:33 +02:00
Sandro Jäckel 41e24f5f4b
tracker: use upstream patch instead of disabling test 2022-07-04 11:52:27 +02:00
Vladimír Čunát f31f162bbf
tracker: skip broken tests
Upstream confirmed that it's an issue in the tests with sqlite update.
Broken sub-tests could be skipped instead, I suppose, if someone cared.
2022-07-04 08:20:12 +02:00
ajs124 2fcd2a4e77 jose: 10 -> 11
https://github.com/latchset/jose/releases/tag/v11
2022-07-04 02:32:41 +02:00
github-actions[bot] 116e8e939b
Merge staging-next into staging 2022-07-03 18:01:49 +00:00
github-actions[bot] fc65c5c219
Merge master into staging-next 2022-07-03 18:01:12 +00:00
ajs124 73ead110f0
Merge pull request #179574 from helsinki-systems/upd/libwebp
libwebp: 1.2.1 -> 1.2.2
2022-07-03 17:32:58 +02:00
R. Ryantm e18baa0309 gtk4: 4.6.5 -> 4.6.6 2022-07-03 14:15:07 +02:00
Mario Rodas e8200e2c2a
Merge pull request #178906 from marsam/update-grpc
grpc: 1.46.3 -> 1.47.0
2022-07-02 19:45:02 -05:00
github-actions[bot] 5d9e711bfe
Merge master into staging-next 2022-07-03 00:04:21 +00:00
Jan Tojnar 6a7da5b520 geocode-glib: fix installed tests 2022-07-02 20:14:11 +02:00
github-actions[bot] 239c4e701d
Merge master into staging-next 2022-07-02 18:01:29 +00:00
Jan Tojnar f58225ffd4
Merge pull request #179849 from jtojnar/gnome
GNOME updates
2022-07-02 15:07:52 +02:00
github-actions[bot] cc49d572ac
Merge master into staging-next 2022-07-02 12:01:18 +00:00
Bobby Rong 660ac43ff9
Merge pull request #179157 from Vonfry/update/fcitx5-20220626
fcitx5 and its plugins: update
2022-07-02 17:58:52 +08:00
Vladimír Čunát cd0c2b2374
thrift: fix expired certs in tests
https://hydra.nixos.org/build/181721465
2022-07-02 11:00:42 +02:00