Commit graph

283522 commits

Author SHA1 Message Date
Pierre Bourdon e432e78d1c glib: fix docs cross compilation (again)
Do not depend on host gtk-doc when cross compiling (we do not use it
there), and document why we need a host gtk-doc in the first place.
2021-04-17 15:26:18 +02:00
Peter Hoeg 2534314225 plasma-wayland-protocols: 1.1.1 -> 1.2.1 2021-04-17 15:56:58 +08:00
Peter Hoeg 247faaf47f plasma5: 5.21.3 -> 5.21.4 2021-04-17 15:56:58 +08:00
Martin Weinelt 2a2f1b4025
Merge pull request #118990 from TredwellGit/ffmpeg
ffmpeg: 4.3.2 -> 4.4
2021-04-17 02:55:34 +02:00
John Ericson e87d88d86c
Merge pull request #119625 from sternenseemann/binutils-force-prefix
binutils-unwrapped, gcc, gdb: force targetPrefix if cross compiling
2021-04-16 17:36:20 -04:00
sternenseemann e75c5353bb gdb: always set --program-prefix and pass --target
This makes the targetPrefix always conform to nixpkgs' expectations
instead of relying on the autotools build system to figure it out
correctly (which is also inconsistent across versions).

See also ca9be0511b.
2021-04-16 22:56:39 +02:00
sternenseemann acdc783418 gcc*: always force --program-prefix and pass --target
Don't rely on gcc detecting from the passed platforms which prefix to
use, but always specify the prefix nixpkgs expects (or doesn't). This
allows us to work around problems where the configure script would add
prefix where nixpkgs doesn't expect one (if `--target` was specified,
but the same as `--host`) or doesn't add one if nixpkgs expects one (if
`--target` and `--host` are the same, but we are actually cross
compiling, but the relevant parts of the platform are not encoded into
the platform config.

See also ca9be0511b.
2021-04-16 22:54:05 +02:00
Jörg Thalheim 625fc39c2f
Merge pull request #117780 from cmacrae/fix/spacebar
spacebar: fix builds on macOS Big Sur
2021-04-16 18:12:46 +01:00
Calum MacRae 28192c446c
spacebar: fix builds on macOS Big Sur 2021-04-16 17:19:17 +01:00
Calum MacRae 2c82907da4
apple-sdk: generate SkyLight framework outputs 2021-04-16 17:19:17 +01:00
Calum MacRae 914c604a01
apple-sdk: fix PrivateFrameworks symlinks
With the absence of these symlinks, private frameworks aren't exposed
to the linker.
2021-04-16 17:19:17 +01:00
sternenseemann ca9be0511b binutils-unwrapped: force targetPrefix if cross compiling
The binutils build system checks by itself if it is building a cross
toolchain or not and prepends or omits a targetPrefix accordingly. This
means that we can always pass target via configureTargets.

However the binutils build system and our bintools wrapper disagree over
whether we are building a cross toolchain or not sometimes since cross
compilation can be relatively subtle in nixpkgs. For example every use
of crossOverlays will make nixpkgs build a cross toolchain even though
localSystem == crossSystem. The cross infrastructure is also used to
build native binaries with a different stdenv (musl instead of glibc,
clang instead of gcc). In all of these cases stdenv.hostPlatform.config
== stdenv.targetPlatform.config, causing binutils to not prepend a
target prefix. At the same time stdenv.hostPlatform !=
stdenv.targetPlatform causing the bintools wrapper to expect a target
prefix, thus building an incomplete set of bintools. This is why
currently pkgsCross.gnu64 and pkgsCross.musl64 aren't working.

The solution is quite simple however: If we detect that we are building
a cross toolchain in the binutils-unwrapped expression, we force the
targetPrefix with --programprefix and fulfill the expectations of the
bintools wrapper at the same time.

Tested (on x86_64-linux):

* pkgsCross.musl64.hello
* pkgsCross.aarch64-multiplatform.hello
* pkgs.hello

Still not working is pkgsCross.gnu64, since
x86_64-unknown-linux-gnu-stage-final-gcc gets confused about targets
now, so bootstrapping the stdenv fails. Since this wasn't working
previously anyways, it's proably fine to fix this separately.
2021-04-16 17:12:45 +02:00
Alyssa Ross f8db5c60f3 giflib_4_1: remove
Everything still using this builds fine without it.
2021-04-16 14:06:10 +00:00
Alyssa Ross e459db3f81 glsurf: fix license
The README says GPL 2 or any later version, not LGPL.
2021-04-16 14:06:10 +00:00
Alyssa Ross 70e33e3ae3 glsurf: use current giflib
This requires bumping the version of camlimages used by glsurf to a
version that supports current giflib.  The most recent versions of
camlimages (even of 4.x) don't support ocaml 4.01 any more, so I've
upgraded to 4.1.2 here, the last version that supports ocaml 4.01 (and
which happily supports current giflib).
2021-04-16 14:06:10 +00:00
Alyssa Ross 6e3b5fd046 libungif: remove in favour of giflib
libungif was merged into giflib in 2006, and hasn't been updated
since.  All non-broken packages still using it build fine with giflib.

See <http://giflib.sourceforge.net/history.html>.
2021-04-16 14:06:10 +00:00
Alyssa Ross 451d9d6f8e fbv: fix build with giflib; clarify license
libungif was merged into giflib in 2006, and hasn't been updated
since.
2021-04-16 14:06:10 +00:00
Alyssa Ross a2a5b1d6e7 imlib: fix build with giflib; clarify license
libungif was merged into giflib in 2006, and hasn't been updated
since.
2021-04-16 14:06:10 +00:00
Alyssa Ross 6694363a3a swftools: mark insecure; clarify license
Fixes: https://github.com/NixOS/nixpkgs/issues/90991
2021-04-16 14:06:10 +00:00
Alyssa Ross b1037225ef infoqscraper: mark broken 2021-04-16 14:06:10 +00:00
Jeff Mitchell 5b9a6f10f8
protobuf: 3.15.7 -> 3.15.8 (#119574) 2021-04-15 19:36:01 -05:00
Kasper fc141a889d
libselinux: fix build with musl (#119472)
Co-authored-by: Kasper Gałkowski <kpg@posteo.net>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-15 23:18:51 +02:00
John Ericson 38c8ae9bbe
Merge pull request #117914 from Mindavi/cross/gtk-doc-json-glib
gtk-doc + json-glib: fix cross-compilation
2021-04-15 16:39:02 -04:00
Alyssa Ross 93d0f1c237 netbsd.libc: fix build 2021-04-15 03:55:50 +00:00
Alyssa Ross 314aa175d3 netbsd: bison -> byacc
These are only mostly compatible, and libc won't build with bison.
2021-04-15 03:55:50 +00:00
John Ericson b60fc42130 Merge remote-tracking branch 'upstream/master' into staging 2021-04-15 03:16:06 +00:00
Alyssa Ross 3b5b199012 netbsd.statHook: init
This fixes the build of various NetBSD programs on Linux,
e.g. netbsd.statHook.
2021-04-15 02:59:26 +00:00
Thomas Bereknyei c906464396 bash-my-aws: add runtime dependencies
wrap PATH to provide runtime utilities
2021-04-14 22:43:37 -04:00
Thomas Bereknyei ca373323f1 cosmopolitan: init at 0.3
Apply suggestions from code review

Co-authored-by: Louis Bettens <lourkeur@users.noreply.github.com>
2021-04-14 22:40:46 -04:00
John Ericson 9eee6b3daf
Merge pull request #119494 from Ericson2314/libbsd-split-output
libbsd: Separate `out`, `dev`, and `man` outputs
2021-04-14 21:24:41 -04:00
LeSuisse dcdf30a78a
htmldoc: 1.8.29 -> 1.9.11 (#119226)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-15 02:37:46 +02:00
figsoda 2f6a9bb297 nixos/programs/fish: add shellAbbrs config 2021-04-14 17:37:14 -07:00
Martin Weinelt a64b9f2b10
Merge pull request #119270 from austinbutler/weasyprint-pango-fix 2021-04-15 02:21:59 +02:00
github-actions[bot] e7adc44bb8
Merge staging-next into staging 2021-04-15 00:15:31 +00:00
github-actions[bot] 90a28c8ec1
Merge master into staging-next 2021-04-15 00:15:29 +00:00
Austin Butler 902bef491b python3Packages.weasyprint: fix failing build 2021-04-14 17:08:49 -07:00
Ryan Mulligan bb9d0c3038
Merge pull request #119462 from r-ryantm/auto-update/MIDIVisualizer
MIDIVisualizer: 6.3 -> 6.4
2021-04-14 16:15:16 -07:00
sternenseemann 715fc0d6cc fcft: add me to maintainers 2021-04-15 01:02:46 +02:00
sternenseemann 4384264739 fcft: 2.3.2 -> 2.3.3
https://codeberg.org/dnkl/fcft/releases/tag/2.3.3
2021-04-15 01:02:46 +02:00
Martin Weinelt 7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Martin Weinelt 85cf6bed94
Merge pull request #119464 from r-ryantm/auto-update/alertmanager-irc-relay
alertmanager-irc-relay: 0.3.0 -> 0.3.1
2021-04-15 01:00:00 +02:00
Martin Weinelt 5931dfb4f2
Merge pull request #118937 from fabaff/systembridge
python3Packages.systembridge: init at 1.1.1
2021-04-15 00:57:29 +02:00
Martin Weinelt 2bf07e4307
Merge pull request #119481 from fabaff/bump-pulsectl
python3Packages.pulsectl: 20.5.1 -> 21.3.4
2021-04-15 00:54:04 +02:00
Michael Weiss 14ec94a2fe
chromiumBeta: 90.0.4430.70 -> 90.0.4430.72 2021-04-15 00:53:04 +02:00
Martin Weinelt 13a24e043a
Merge pull request #119478 from fabaff/bump-mcstatus
python3Packages.mcstatus: 5.1.2 -> 5.1.4
2021-04-15 00:44:55 +02:00
Michael Weiss 96e4c599de
Merge pull request #119401 from primeos/chromium
chromium: 89.0.4389.114 -> 89.0.4389.128
2021-04-15 00:40:44 +02:00
Artur Taranchiev b2681434a1
todofi.sh: init at 1.0.0 (#119334)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-15 00:34:50 +02:00
Fabian Affolter a8d5046e5b python3Packages.pulsectl: 20.5.1 -> 21.3.4 2021-04-15 00:34:31 +02:00
Martin Weinelt 4825e07357
Merge pull request #119466 from fabaff/bump-spotipy
python3Packages.spotipy: 2.17.1 -> 2.18.0
2021-04-15 00:31:35 +02:00
Martin Weinelt 6284c64636
Merge pull request #119475 from fabaff/bump-twitterapi
python3Packages.twitterapi: 2.6.10 -> 2.7.1
2021-04-15 00:31:01 +02:00