Commit Graph

15804 Commits

Author SHA1 Message Date
github-actions[bot]
f42b75df03
Merge staging-next into staging 2021-04-18 18:10:40 +00:00
github-actions[bot]
b57b2b362c
Merge master into staging-next 2021-04-18 18:10:37 +00:00
Sandro
73bee54402
Merge pull request #119801 from ck3d/sumneko-lua-lsp-1.20.2
sumneko-lua-language-server: 1.16.0 -> 1.20.2
2021-04-18 19:50:07 +02:00
Christian Kögler
da68011064 sumneko-lua-language-server: 1.16.0 -> 1.20.2 2021-04-18 19:23:04 +02:00
yvt
bcb8079a93
spin: enable darwin support (#119809) 2021-04-18 12:59:03 -04:00
Robert Scott
41dbd1095b
Merge pull request #119485 from r-ryantm/auto-update/doctl
doctl: 1.58.0 -> 1.59.0
2021-04-18 17:27:23 +01:00
Sandro
58d4e340be
Merge pull request #119600 from LeSuisse/re2c-2.1.1-staging 2021-04-17 21:07:06 +02:00
github-actions[bot]
33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
github-actions[bot]
8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
Pavol Rusnak
a15305e07b
Merge pull request #119720 from prusnak/https
treewide: use https for github URIs
2021-04-17 18:10:13 +02:00
Sandro
c39dfe8717
Merge pull request #119655 from 06kellyjac/conftest
conftest: 0.23.0 -> 0.24.0
2021-04-17 18:09:43 +02:00
Pavol Rusnak
29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Jörg Thalheim
b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
github-actions[bot]
f620e30ca4
Merge master into staging-next 2021-04-17 00:15:03 +00:00
Pavol Rusnak
317ddc352c
Merge pull request #119578 from TredwellGit/electron
electron_12: 12.0.2 -> 12.0.4 & electron_11: 11.4.1 -> 11.4.3 & electron_10: 10.4.2 -> 10.4.3
2021-04-17 00:23:48 +02: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
06kellyjac
e288f5b7c9 conftest: 0.23.0 -> 0.24.0 2021-04-16 20:11:38 +01:00
Peter Simons
a09a5943b2
Merge pull request #118923 from NixOS/haskell-updates
Update Haskell package set to Stackage Nightly 2021-04-06 (plus other fixes)
2021-04-16 20:25:16 +02:00
github-actions[bot]
6a0f49f240
Merge master into staging-next 2021-04-16 18:13:19 +00: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
Sandro
d7ffdde842
Merge pull request #119613 from happysalada/update_wrangler
wrangler: 1.15.0 -> 1.16.0
2021-04-16 15:44:26 +02:00
Alyssa Ross
53b88f966e bmake: add setupHook
With this change,

    nativeBuildInputs = [ bmake ];

will cause bmake to be used instead of GNU make, but with the usual
stdenv API.  Packages using bmake will no longer need to implement
their own {build,check,dist}Phase.
2021-04-16 12:56:48 +00:00
happysalada
d2c4c7ab8b wrangler: 1.15.0 -> 1.16.0 2021-04-16 21:37:59 +09:00
Thomas Gerbet
995ecddd9a re2c: 1.3 -> 2.1.1
Release notes:
https://re2c.org/releases/release_notes.html#release-2-1-1
2021-04-16 11:03:18 +02:00
Martin Weinelt
cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
TredwellGit
55853a8e9c electron_10: 10.4.2 -> 10.4.3
https://github.com/electron/electron/releases/tag/v10.4.3
2021-04-15 21:42:10 +00:00
TredwellGit
af8be16988 electron_11: 11.4.1 -> 11.4.3
https://github.com/electron/electron/releases/tag/v11.4.2
https://github.com/electron/electron/releases/tag/v11.4.3
2021-04-15 21:40:40 +00:00
TredwellGit
e91e8bcdf2 electron_12: 12.0.2 -> 12.0.4
https://github.com/electron/electron/releases/tag/v12.0.3
https://github.com/electron/electron/releases/tag/v12.0.4
2021-04-15 21:38:28 +00: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
zowoq
575af60b3d skopeo: 1.2.2 -> 1.2.3
https://github.com/containers/skopeo/releases/tag/v1.2.3
2021-04-16 06:18:20 +10:00
github-actions[bot]
dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
github-actions[bot]
9c190d28df
Merge master into staging-next 2021-04-15 12:06:13 +00:00
Dmitry Ivankov
08fc7507ce cargo-raze: 0.2.10 -> 0.12.0 2021-04-15 13:28:21 +02:00
R. RyanTM
13ff90fa44 fly: 7.1.0 -> 7.2.0 2021-04-15 02:16:50 -04:00
R. RyanTM
d7ace3d09e doctl: 1.58.0 -> 1.59.0 2021-04-14 23:12:20 +00:00
Martin Weinelt
7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Pavol Rusnak
81d784ffaf
Merge pull request #119457 from ethancedwards8/master
godot: clean up code
2021-04-14 22:44:31 +02:00
Ethan Edwards
ba656985fb
godot: clean up code 2021-04-14 16:28:57 -04:00
Sascha Grunert
4973dc73f6 buildah: 1.20.0 -> 1.20.1
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-04-15 06:18:00 +10:00
github-actions[bot]
eb8e023674
Merge master into staging-next 2021-04-14 18:11:01 +00:00
Sandro
7b037c94cc
Merge pull request #119327 from ruuda/butane-0.11.0
butane: 0.10.0 -> 0.11.0
2021-04-14 19:19:01 +02:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Lorenz Leutgeb
b0ed229aad gradle: Pin pkgs to Gradle 6 that fail with 7 2021-04-14 00:06:02 +02:00
Lorenz Leutgeb
da62033a9a gradle: 7-rc-2 -> 7, bumping latest 6.8.3 -> 7 2021-04-13 19:31:01 +02:00
Samir Talwar
42e029e48f
geckodriver: 0.26.0 -> 0.29.1 (#119164) 2021-04-13 16:05:07 +02:00
Ruud van Asseldonk
dfed0ea560 butane: 0.10.0 -> 0.11.0
This package was formerly known as the "Fedora CoreOS Config Transpiler"
(fcct). Release 0.11.0 renames it to "Butane", but aside from this it's
just the next release of the same project.
2021-04-13 14:26:29 +02:00
Sandro
262c722ee7
Merge pull request #119278 from marsam/update-universal-ctags
universal-ctags: 5.9.20201206.0 -> 5.9.20210411.0
2021-04-13 13:20:26 +02:00
Robert Schütz
650553aa9b
Merge pull request #117873 from fabaff/apkid
apkid: init at 2.1.1, python3Packages.yara-python: init at 4.0.5
2021-04-13 09:54:27 +02:00
Vladimír Čunát
cf5cca58d3
Merge #119255: staging-next + conflict resolution -> staging 2021-04-13 09:35:49 +02:00
Ana Hobden
fc43a7fa4d probe-run: init at 0.2.1
Signed-off-by: Ana Hobden <operator@hoverbear.org>
2021-04-13 00:27:44 -07:00