Commit Graph
3943 Commits
Author SHA1 Message Date
Jan Tojnar dd78ce1c53 Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
Martin Weinelt 9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02:00
Vladimír Čunát 080cd658ca Merge #121780: treewide meta.maintainers tweaks 2021-05-08 10:47:08 +02:00
Jonathan Ringer 01d801fd72 ccls: fix build 2021-05-08 01:29:18 -07:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
github-actions[bot] 1ae6d3d02f Merge master into staging-next 2021-05-07 18:24:29 +00:00
Vladimír Čunát 73e17a3594 treewide: remove lethalman from meta.maintainers
He hasn't been heard of for years.
2021-05-07 15:36:40 +02:00
Mario Rodas 396e6d75fc Merge pull request #121966 from r-ryantm/auto-update/act
act: 0.2.21 -> 0.2.22
2021-05-07 08:04:19 -05:00
github-actions[bot] e5f4def056 Merge staging-next into staging 2021-05-07 00:46:58 +00:00
R. RyanTM 5ce67d6fa0 act: 0.2.21 -> 0.2.22 2021-05-07 00:28:42 +00:00
Michael Livshin dacdfa874e distcc: 2016-02-24 -> 2021-03-11 2021-05-06 10:43:38 +03:00
Mario Rodas 14281d2154 nimlsp: 0.2.6 -> 0.3.2 2021-05-06 04:20:00 +00:00
github-actions[bot] 68e3ba2b1d Merge staging-next into staging 2021-05-05 00:46:07 +00:00
Cole Helbling 451477e741 hydra-unstable: 2021-04-29 -> 2021-05-03
This incorporates a few more API fixes that have been made to Hydra since the
last bump.
2021-05-04 12:39:17 -07:00
github-actions[bot] 4cbb35eba8 Merge staging-next into staging 2021-05-04 18:21:27 +00:00
Alyssa Ross 8d76ef7355 strace: add myself as maintainer
I've been working on strace a bit recently, so I might have some
useful knowledge if we're ever having problems with it.
2021-05-04 12:14:59 +00:00
github-actions[bot] 5e177b16b1 Merge staging-next into staging 2021-05-03 18:25:49 +00:00
regnat bdc95ab29e hydraUnstable: 2021-03-29 -> 2021-04-29
Required to work with the latest nixUnstable
2021-05-03 16:51:15 +02:00
github-actions[bot] d7882499f8 Merge staging-next into staging 2021-04-30 12:26:14 +00:00
Sandro d7e9d65ea2 Merge pull request #120341 from iFreilicht/master 2021-04-30 13:54:16 +02:00
github-actions[bot] b4766e97ee Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Andrey Kuznetsov 17d9b66346 terraform-ls: 0.15.0 -> 0.16.0 2021-04-30 00:03:35 +03:00
Vladimír Čunát 82bccc2d62 Merge branch 'nixpkgs-unstable' into PR #111431
I'm not really sure about the conflicts in:
	pkgs/development/python-modules/psutil/default.nix

Hydra nixpkgs: ?compare=1666054
2021-04-28 17:13:34 +02:00
github-actions[bot] 655989d7b3 Merge staging-next into staging 2021-04-28 00:15:29 +00:00
Martin Weinelt e0d0444717 tockloader: remove myself from maintainers
Sadly the only device I had that was requiring this was an nRF52840 MDK
USB dongle and I apparently broke its bootloader, so it won't get
recognized anymore.
2021-04-27 20:38:35 +02:00
Martin Weinelt 6fbe7f1bbb tockloader: 1.5.0 -> 1.6.0
Add a small check phase calling the tockloader executable and checking
the version.
2021-04-27 20:38:35 +02:00
github-actions[bot] 97889a52e1 Merge staging-next into staging 2021-04-27 18:14:28 +00:00
Felix Uhl be1392dbd9 stm32cubemx: 6.0.1 -> 6.2.1
Fixes:
STM32CubeMX uses an outdated version of xstream that is not
compatible with JDK16. The derivation uses JDK11 (LTS) explicitly now.
Additionally, the desktop file wasn't generated by copyDesktopItems
before. This is now fixed as well.

Upstream changes:
- Main files moved from . to MX
- JAR file has no .exe extension anymore
- Icon format changed from icns to ico
- There is now a bundled JRE, but we prefer not to use it

Additional changes:
- Move version definition into mkDerivation
2021-04-27 18:23:40 +02:00
Lancelot SIX 279192c950 gdb: 10.1 -> 10.2
See https://sourceware.org/pipermail/gdb/2021-April/049400.html for
release announcement
2021-04-27 10:06:24 +01:00
Maximilian Bosch 86f1c0fb77 strace: 5.11 -> 5.12
ChangeLog: https://github.com/strace/strace/releases/tag/v5.12
2021-04-26 20:19:54 +02:00
github-actions[bot] 8634c6f7d1 Merge staging-next into staging 2021-04-26 00:17:03 +00:00
Anderson Torres b1c9917f71 Merge pull request #120625 from AndersonTorres/quick-modifications
Updates

ftgl: 2.1.3-rc5 -> 2.4.0; 
cimg: 2.9.6 -> 2.9.7; 
dialog: 1.3-2210306 -> 1.3-2210324; 
docutils: 0.16 -> 0.17.1; 
fme: refactor
2021-04-25 18:43:59 -03:00
AndersonTorres 3a7af6de81 dialog: 1.3-2210306 -> 1.3-2210324 2021-04-25 14:38:31 -03:00
github-actions[bot] 1626c4772a Merge staging-next into staging 2021-04-25 12:06:12 +00:00
Frederik Rietdijk c648f7ee2a Merge master into staging-next 2021-04-25 13:54:29 +02:00
Sandro cf628a338d Merge pull request #120092 from ericdallo/bump-clojure-lsp
clojure-lsp: 2021.02.14-19.46.47 -> 2021.04.13-12.47.33
2021-04-25 08:55:36 +02:00
Jan Tojnar c1f851b2ee Merge branch 'staging-next' into staging 2021-04-25 08:22:13 +02:00
github-actions[bot] a956f62ea4 Merge master into staging-next 2021-04-25 06:05:34 +00:00
Evils 4b7ccb3418 stlink: 1.6.0 -> 1.7.0 2021-04-25 07:30:01 +02:00
Eric Dallo 64be38f31f clojure-lsp: 2021.02.14-19.46.47 -> 2021.04.13-12.47.33 2021-04-21 20:52:34 -03:00
github-actions[bot] 7742d40a37 Merge staging-next into staging 2021-04-19 06:05:52 +00:00
github-actions[bot] 36faabcd7c Merge master into staging-next 2021-04-19 06:05:48 +00:00
Sandro 216f56598b Merge pull request #119450 from SCOTT-HAMILTON/inotify-tools
inotify-tools: 3.20.2.2 -> 3.20.11.0
2021-04-19 04:56:59 +02:00
Dmitry BogatovandDmitry Bogatov ef107ba439 checkbashisms: 2.0.0.2 -> 2.21.1 (#119754)
Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc>
2021-04-19 04:56:12 +02:00
SCOTT-HAMILTON 6649c6d75c inotify-tools: 3.20.2.2 -> 3.20.11.0 2021-04-18 16:17:09 +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
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
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
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00