Commit Graph

3910 Commits

Author SHA1 Message Date
github-actions[bot]
78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Vladimír Čunát
c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Vladimír Čunát
0023f45705
Merge #111431: autoconf: 2.70 -> 2.71 (into staging) 2021-05-14 18:29:05 +02:00
WilliButz
64f46d44d4
Merge pull request #122732 from Ma27/jiq
jiq: init at 0.7.1
2021-05-14 14:06:55 +02:00
Ivan Babrou
07e4cbde16 autogen: fix compilation on aarch64-darwin 2021-05-13 19:08:47 -07:00
github-actions[bot]
b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Martin Weinelt
a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Andrey Kuznetsov
29ff6e85f4
terraform-ls: 0.16.0 -> 0.16.2 2021-05-12 18:18:11 +03:00
Maximilian Bosch
026b5c14ee
jiq: init at 0.7.1 2021-05-12 16:13:05 +02:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Robin Gloster
1f566d9164
Merge pull request #120581 from lsix/gdb-10.2
gdb: 10.1 -> 10.2
2021-05-09 14:25:19 -05:00
github-actions[bot]
450e66080b
Merge master into staging-next 2021-05-09 18:23:01 +00:00
Sandro
d928699980
Merge pull request #121969 from marsam/update-nimlsp
nimlsp: 0.2.6 -> 0.3.2
2021-05-09 15:40:59 +02:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Jonathan Ringer
76ab96811b creduce: fix llvm build 2021-05-08 18:13:45 -07:00
Jonathan Ringer
88beb7d77e cvis: fix llvm build 2021-05-08 18:13:45 -07:00
R. RyanTM
177dc3e845 global: 6.6.5 -> 6.6.6 2021-05-08 15:19:06 -07:00
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