Commit graph

73979 commits

Author SHA1 Message Date
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
Artturi fb6816eae3
Merge pull request #178869 from Artturin/curlies 2022-07-06 17:30:45 +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
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
Sandro 1fe9c408a2
Merge pull request #179939 from WeebSorceress/frece
frece: init at 1.0.6
2022-07-06 10:44:24 +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
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
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
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
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
Sergei Trofimovich 336cc1683a mars: fix build on gcc-10
Without the change build fails due to gcc-11/gcc-10 libstdc++ mix:

    [100%] Linking CXX executable ../../marsshooter
    ld: .../libsfml-graphics.so.2.5.1: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29'
    collect2: error: ld returned 1 exit status
2022-07-05 23:43:14 +01:00
Thiago Kenji Okada 770e59d084
Merge pull request #179906 from fortuneteller2k/discord-fix-override
discord: fix override
2022-07-05 21:24:55 +01:00
Ashish SHUKLA 183b236eef nebula: 1.5.2 -> 1.6.0 2022-07-05 17:08:40 -03:00
wozeparrot a2012c49fc
hyprpaper: init at unstable-2022-07-04 (#180192) 2022-07-05 22:29:34 +03:00
fortuneteller2k af7323d1a8 discord: fix override 2022-07-05 18:47:41 +00:00
github-actions[bot] 14ba82064f
Merge staging-next into staging 2022-07-05 12:02:49 +00:00
github-actions[bot] 0c17a445aa
Merge master into staging-next 2022-07-05 12:02:09 +00:00
Fabian Affolter 6300cde545
Merge pull request #180142 from 06kellyjac/kubescape
kubescape: 2.0.158 -> 2.0.160
2022-07-05 08:21:14 +02:00
Fabian Affolter ce1a6a9fc9
Merge pull request #180137 from fabaff/dulwich-bump
python310Packages.dulwich: 0.20.43 -> 0.20.44, dvc: 2.10.2 -> 2.12.0
2022-07-05 08:11:20 +02:00
github-actions[bot] 4742aa3457
Merge staging-next into staging 2022-07-05 06:02:01 +00:00
github-actions[bot] c0b8d5d7b9
Merge master into staging-next 2022-07-05 06:01:19 +00:00
Anderson Torres 0c873dc3a2
Merge pull request #179888 from DamienCassou/offpunk
offpunk: init at 1.4
2022-07-04 22:17:56 -03:00
github-actions[bot] a2c59bc13f
Merge staging-next into staging 2022-07-05 00:02:54 +00:00
github-actions[bot] 2b746ce766
Merge master into staging-next 2022-07-05 00:02:22 +00:00
zowoq 6a9e4bd161 vimv-rs: init at 1.7.5 2022-07-05 09:16:30 +10:00
Fabian Affolter 29a77fc1ad python310Packages.dvc-data: init at 0.0.18 2022-07-04 20:16:02 +02:00
Fabian Affolter d9d731345e python310Packages.dvc-objects: init at 0.0.18 2022-07-04 20:16:02 +02: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
06kellyjac 17a62d74b7 kubescape: 2.0.158 -> 2.0.160 2022-07-04 17:32:11 +01:00
github-actions[bot] 03ce3f8c08
Merge staging-next into staging 2022-07-04 12:12:04 +00:00
github-actions[bot] 33b3f971a7
Merge master into staging-next 2022-07-04 12:11:13 +00:00
tricktron ac8fadc7f3
colima: 0.4.2 -> 0.4.4 (#179522)
* colima: use updated Makefile in build and install phases

* colima: use lima-unwrapped

* colima: fix dynamic version

* colima: 0.4.2 -> 0.4.3

* colima: delete .git folder in postfetch when `leaveDotGit = true`

Otherwise it may lead to non-deterministic behaviour.

Co-authored-by: j-k <dev@j-k.io>

* colima: do not override default buildGoModule phases

The colima Makefile does more or less the same as the `buildGoModule`
implementation. Instead of overriding it and using the Makefile
directly, we reproduce the behaviour desired behaviour by customising
env variables, e.g. `ldflags` and `subPackages`.

Co-authored-by: j-k <dev@j-k.io>

* colima: use `buildGoModule = buildGo118Module;`

Co-authored-by: j-k <dev@j-k.io>

* colima: update meta.description

Co-authored-by: j-k <dev@j-k.io>

* colima: set `CGO_ENABLED = 1` to make VPN connections work

See https://github.com/abiosoft/colima/issues/358

* colima: 0.4.3 -> 0.4.4

* colima: define all ldflags in preConfigure

Co-authored-by: Atemu <Atemu@users.noreply.github.com>

* colima: add version test

* colima: add meta.mainProgram and meta.platforms

* colima: remove unused runCommand input

Co-authored-by: j-k <dev@j-k.io>

* colima: cleanup meta

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* colima: drop meta.platforms

because we use the default value of `platforms.darwin ++
platforms.linux`

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Atemu <Atemu@users.noreply.github.com>

* Update pkgs/applications/virtualization/colima/default.nix

Co-authored-by: j-k <dev@j-k.io>
Co-authored-by: Atemu <Atemu@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-07-04 13:28:02 +02:00
Sandro 025f00750d
Merge pull request #179809 from sudosubin/check-jsonschema
check-jsonschema: init at 0.16.2
2022-07-04 13:13:43 +02:00
Sandro aac9ff65da
Merge pull request #179992 from ranfdev/edgedb
edgedb: init at unstable-2022-06-27
2022-07-04 12:52:03 +02:00
Juan Ibiapina 62e5acd0a7
ruby: Expose generic builder (#173390)
To avoid duplicating the ruby compilation code, this change exposes two
functions `mkRubyVersion` and `mkRuby`, which can be used in an overlay
to build any past or current ruby version.

An example overlay:
```nix
self: super:

{
  ruby_2_7_6 = super.mkRuby {
    version = super.mkRubyVersion "2" "7" "6" "";
    sha256 = "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877";
  };

  ruby_3_1_2 = super.mkRuby {
    version = super.mkRubyVersion "3" "1" "2" "";
    sha256 = "0gm84ipk6mrfw94852w5h7xxk2lqrxjbnlwb88svf0lz70933131";
  };
}
```
2022-07-04 11:57:06 +02:00
Sergei Trofimovich a5ce71d4e8 xmr-stak: drop gcc6 requrement (and cuda support)
[ 86%] Building CXX object CMakeFiles/xmrstak_opencl_backend.dir/xmrstak/backend/amd/minethd.cpp.o
    nvcc fatal   : Unsupported gpu architecture 'compute_30'
    CMake Error at xmrstak_cuda_backend_generated_cuda_extra.cu.o.Release.cmake:220 (message):
      Error generating
      /build/source/build/CMakeFiles/xmrstak_cuda_backend.dir/xmrstak/backend/nvidia/nvcc_code/./xmrstak_cuda_backend_generated_cuda_extra.cu.o
    nvcc fatal   : Unsupported gpu architecture 'compute_30'
    make[2]: *** [CMakeFiles/xmrstak_cuda_backend.dir/build.make:84: CMakeFiles/xmrstak_cuda_backend.dir/xmrstak/backend/nvidia/nvcc_code/xmrstak_cuda_backend_generated_cuda_extra.cu.o] Error 1

CUDA support is broken for a while. Let's drop it along with gcc6 requirement.
2022-07-04 10:27:24 +01:00
Sergei Trofimovich 2e37f787c9
Merge pull request #180086 from trofi/fix-archimedes-off-gcc6
archimedes: use latest toolchain, not gcc-6
2022-07-04 08:49:35 +01:00
Sergei Trofimovich 8aaed36df3 archimedes: use latest toolchain, not gcc-6
Without the change archimedes fails to build with latest toolchains as:

    ld: archimedes.c:(.text+0xdac7): undefined reference to `rnd'
    ld: archimedes.c:(.text+0xdeab): undefined reference to `rnd'
    ld: archimedes.c:(.text+0xdf13): undefined reference to `rnd'
    ld: archimedes.c:(.text+0xe3ef): undefined reference to `rnd'
    ld: archimedes.o:archimedes.c:(.text+0xe456): more undefined references to `rnd' follow
    ld: archimedes.o: in function `EMC':
    archimedes.c:(.text+0xf11b): undefined reference to `creation'
    ld: archimedes.c:(.text+0xf5f5): undefined reference to `creation'
    ld: archimedes.c:(.text+0xf826): undefined reference to `creation'
    ld: archimedes.c:(.text+0xf9ce): undefined reference to `creation'

The change happens to fix build against clang as well.
2022-07-04 08:20:07 +01:00
Vincent Laporte e69aee3280 ocamlPackages.io-page: 2.3.0 → 2.4.0
ocamlPackages.mirage-block: 2.0.1 → 3.0.0
ocamlPackages.mirage-block-ramdisk: disable tests
ocamlPackages.mirage-block-unix: 2.12.1 → 2.14.1
ocamlPackages.mirage-unix: 4.0.0 → 4.0.1
ocamlPackages.vchan: 6.0.0 → 6.0.1
ocamlPackages.wodan-unix: mark as broken
2022-07-04 09:10:59 +02:00
Rick van Schijndel c14d2c45e9
Merge pull request #178145 from AtilaSaraiva/deepwave
deepwave: init at 0.0.11
2022-07-04 08:35:33 +02:00
github-actions[bot] d0d975c8c9
Merge staging-next into staging 2022-07-04 00:05:36 +00:00
github-actions[bot] a653bbaea6
Merge master into staging-next 2022-07-04 00:05:02 +00:00
Ryan Burns 3854cf7eeb
Merge pull request #173127 from aidalgol/teensy-udev-rules
teensy-udev-rules: init at version 2022-05-15
2022-07-03 14:05:07 -07:00
Damien Cassou 31c1463343
offpunk: init at 1.4 2022-07-03 20:59:27 +02:00
github-actions[bot] 116e8e939b
Merge staging-next into staging 2022-07-03 18:01:49 +00:00