Commit Graph

390179 Commits

Author SHA1 Message Date
Artturin eb829035c9 gobject-introspection: do not propagate target gobject-introspection in wrapper
broke modemmanager and some of its deps

libqmi-aarch64-unknown-linux-gnu>   GISCAN   Qmi-1.0.gir
libqmi-aarch64-unknown-linux-gnu> /build/libqmi-1.30.8/src/libqmi-glib/tmp-introspect2d8e4td2/.libs/Qmi-1.0: error while loading shared libraries: libqmi-glib.so.5: cannot open shared object file: No such file or directory
libqmi-aarch64-unknown-linux-gnu> Command '['/nix/store/wr4mjr9gadvwz6c88fgz4ldzn21sxkpz-qemu-7.0.0/bin/qemu-aarch64', '/build/libqmi-1.30.8/src/libqmi-glib/tmp-introspect2d8e4td2/.libs/Qmi-1.0', '--introspect-dump=/build/libqmi-1.30.8/src/libqmi-glib/tmp-introspect2d8e4td2/functions.txt,/build/libqmi-1.30.8/src/libqmi-glib/tmp-introspect2d8e4td2/dump.xml']' returned non-zero exit status 127.
libqmi-aarch64-unknown-linux-gnu> make[4]: *** [/nix/store/jwpcacx8sd4vj0ckk5wxrzn2iwcpp35s-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0-dev/share/gobject-introspection-1.0/Makefile.introspection:156: Qmi-1.0.gir] Error 1
2022-07-12 15:10:40 +03:00
Artturin 1bd8727a4c various: enable gobject-introspection when cross-compiling
and fix cross in some
2022-07-08 03:56:47 +03:00
Artturin bf15263d1c networkmanager: fix cross
copy devdoc and man from native to cross
doc does not have to be copied
2022-07-08 03:56:47 +03:00
Artturin 28ca82a86b libgudev: dont specialcase cross and pull patch
to not have to have vala in both nativeBuildInputs and buildInputs

https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27

> build: let meson handle gir, vala, gtk-doc dependencies
> gnome.generate_gir
> gnome.generate_vapi
> gnome.gtkdoc
>
> all do their own dependency finding in a cross-compilation friendly manner while
> using dependency() with the default options does not
>
> fixes finding vapigen while cross-compiling
2022-07-08 03:56:47 +03:00
Artturin c5d7fc0b3c python310Packages.pygobject3: fix cross 2022-07-07 21:31:10 +03:00
Artturin 31f99a8a28 gst_all_1: don't disable gobject-introspection when cross 2022-07-07 21:30:16 +03:00
Artturin 2cbce6b012 mesonEmulatorHook: check if the target binaries can be executed
this prevents having to bring in the emulator when compiling e.g. pkgsStatic
2022-07-07 21:29:53 +03:00
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
Artturi 958f924c0f Merge pull request #180302 from Artturin/depmesonstring 2022-07-06 20:09:36 +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
Artturi fb6816eae3 Merge pull request #178869 from Artturin/curlies 2022-07-06 17:30:45 +03:00
kilianar e4c43186c4 pkgs/data/icons: use stdenvNoCC where possible
Most icons themes just copy a bunch of files from the source to the
installation directory and therefore work perfectly fine with
stdenvNoCC.
All themes in pkgs/data/icons that still use stdenv after this change
are failing to build with stdenvNoCC.
2022-07-06 10:42:05 -03:00
Artturin c57fb11a50 treewide: convert string mesonFlags to list of strings 2022-07-06 15:24:48 +03:00
Artturin ca2ca8b194 stdenv: start deprecating non-list mesonFlags
the motivation for this is to simplify stdenv and ease the job of
reviewers due to them needing to tell contributors about the defacto
rule that mesonFlags should be a list of strings
2022-07-06 15:23:20 +03: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
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
Alyssa Ross 4195ac320b libtool,libtool_1_5: don't fix libtool
For the same reason we disable shebang patching in these derivations,
we want to disable the patching of libtool scripts stdenv does.

Otherwise, libtool will install scripts into other packages that are
already "fixed", but for the environment libtool was built in.  These
scripts won't be fixed properly by stdenv anymore, because it will
think they were already fixed.

This fixes the build of pkgsStatic.libwebp, which was failing because
its libtool script wasn't being patched properly.

Another problem "fixing" the scripts in the libtool package would
cause is that package tarballs generated on NixOS would contain
libtool scripts that didn't make sense on other distros.

I've tested this change by building pkgsStatic.libwebp, which now
works, as well as by testing the build of the bootstrap files for
mips64el to make sure that didn't regress from 97c43828fb
("fixLibtool(): patch ./configure, add `file` to common-path.nix").
2022-07-06 07:11:26 +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
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
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