Commit Graph
283503 Commits
Author SHA1 Message Date
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
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
Jeff MitchellandGitHub 5b9a6f10f8 protobuf: 3.15.7 -> 3.15.8 (#119574) 2021-04-15 19:36:01 -05:00
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 EricsonandGitHub 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 Bereknyeiandtomberek c906464396 bash-my-aws: add runtime dependencies
wrap PATH to provide runtime utilities
2021-04-14 22:43:37 -04:00
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 EricsonandGitHub 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
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
figsodaandCole Helbling 2f6a9bb297 nixos/programs/fish: add shellAbbrs config 2021-04-14 17:37:14 -07:00
Martin WeineltandGitHub a64b9f2b10 Merge pull request #119270 from austinbutler/weasyprint-pango-fix 2021-04-15 02:21:59 +02:00
github-actions[bot]andGitHub e7adc44bb8 Merge staging-next into staging 2021-04-15 00:15:31 +00:00
github-actions[bot]andGitHub 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 MulliganandGitHub bb9d0c3038 Merge pull request #119462 from r-ryantm/auto-update/MIDIVisualizer
MIDIVisualizer: 6.3 -> 6.4
2021-04-14 16:15:16 -07:00
sternenseemannandsterni 715fc0d6cc fcft: add me to maintainers 2021-04-15 01:02:46 +02:00
sternenseemannandsterni 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 WeineltandGitHub 7cf67850c0 Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Martin WeineltandGitHub 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 WeineltandGitHub 5931dfb4f2 Merge pull request #118937 from fabaff/systembridge
python3Packages.systembridge: init at 1.1.1
2021-04-15 00:57:29 +02:00
Martin WeineltandGitHub 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 WeineltandGitHub 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 WeissandGitHub 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
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 WeineltandGitHub 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 WeineltandGitHub 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
Fabian Affolter e4c44d2d2b python3Packages.mcstatus: 5.1.2 -> 5.1.4 2021-04-15 00:24:48 +02:00
Fabian Affolter 22747baca0 python3Packages.twitterapi: 2.6.10 -> 2.7.1 2021-04-15 00:14:04 +02:00
John EricsonandJohn Ericson 4689d19e35 libbsd: Separate out, dev, and man outputs 2021-04-14 21:52:36 +00:00
Fabian Affolter 5cdcb6d174 python3Packages.spotipy: 2.17.1 -> 2.18.0 2021-04-14 23:48:38 +02:00
John EricsonandGitHub 6802c2e2ce Merge pull request #119465 from alyssais/fetchcvs
fetch{cvs,svn}: Hack around splicing annoyance
2021-04-14 17:47:27 -04:00
Fabian Affolter a8aa77b5db python3Packages.systembridge: init at 1.1.1 2021-04-14 23:42:35 +02:00
Alyssa Ross 2dba1df37e Revert "netbsd: take fetchcvs from buildPackages to fix eval"
This reverts commit 6dff63294a.

We have a more general fix now, so don't need this any more.
2021-04-14 21:38:23 +00:00
John EricsonandAlyssa Ross 0cbf687e07 fetch{cvs,svn}: Hack around splicing annoyance
If too many things don't eval because of cycles or whatever, splicing
breaks down.
2021-04-14 21:37:30 +00:00
Pascal BachandGitHub 3aec774aaa Merge pull request #119381 from samuela/upkeep-bot/vscode-1.55.2-1618359022
vscode: 1.55.0 -> 1.55.2
2021-04-14 23:34:42 +02:00
SandroandGitHub 7e281bea44 Merge pull request #119459 from nagy/pikepdf
python3Packages.pikepdf: 2.8.0 -> 2.11.1
2021-04-14 23:24:14 +02:00
Pascal BachandGitHub dcb26988bd Merge pull request #119458 from nagy/ocrmypdf
ocrmypdf: 11.6.0 -> 11.7.3
2021-04-14 23:17:06 +02:00
SandroandGitHub c4aedcb169 Merge pull request #119455 from Stunkymonkey/numix-master 2021-04-14 23:12:38 +02:00
4e88135f84 aws-azure-login: init at 3.3.0 (#110634)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-14 23:08:31 +02:00
R. RyanTM 040dd2c8fa alertmanager-irc-relay: 0.3.0 -> 0.3.1 2021-04-14 21:07:57 +00:00
R. RyanTM 00da8a0281 MIDIVisualizer: 6.3 -> 6.4 2021-04-14 21:00:37 +00:00
Pavol RusnakandGitHub 5fd77b2c73 Merge pull request #119112 from squalus/darwin-scummvm
scummvm: support darwin
2021-04-14 22:48:47 +02:00
Pavol RusnakandGitHub 81d784ffaf Merge pull request #119457 from ethancedwards8/master
godot: clean up code
2021-04-14 22:44:31 +02:00
Felix Buehler e083280f1d numix-icon-theme-square: 20.09.19 -> 21.04.14 2021-04-14 22:41:33 +02:00