Commit Graph

3964 Commits

Author SHA1 Message Date
github-actions[bot]
c10600230e
Merge staging-next into staging 2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next 2021-05-15 18:30:28 +00:00
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
Jan Tojnar
b529210997 dfeet: 0.3.15 → 0.3.16 2021-05-14 16:36:52 +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
Kira Bruneau
3bd456e4b4 ccache: 4.2.1 → 4.3 2021-05-10 18:11:25 -04: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
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 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
John Ericson
82ca81cd62
Merge pull request #111988 from thefloweringash/darwin-platform-versions
Darwin platform versions
2021-04-12 11:40:16 -04:00
Jörg Thalheim
56d3864ef5
Merge pull request #118963 from r-ryantm/auto-update/ccls
ccls: 0.20201219 -> 0.20210330
2021-04-12 14:08:25 +01:00
Mario Rodas
122cc5fc33 universal-ctags: 5.9.20201206.0 -> 5.9.20210411.0 2021-04-12 04:20:00 +00:00
Sandro
e49de5e298
Merge pull request #118878 from Emantor/bump/usbsdmux
usbsdmux: 0.1.8 -> 0.2.0
2021-04-12 00:47:13 +02:00
Kira Bruneau
dbeee74085 ccache: enable test.modules on Darwin
test.modules now passes on Darwin
2021-04-11 14:33:16 -04:00
Kira Bruneau
26f66129f8 ccache: 4.2 -> 4.2.1 2021-04-11 14:05:14 -04:00
Andrew Childs
2316ada93f luarocks: use targetPlatform.darwinMinVersion as default 2021-04-11 09:47:10 +09:00
Andrew Childs
6605fadc68 bintools-wrapper: default platform versions for darwin
Instead of always supplying flags, apply the flags as defaults. Use
clang's native flags instead of lifting the linker flags from binutils
with `-Wl,`.

If a project is using clang to drive linking, make clang do the right
thing with MACOSX_DEPLOYMENT_TARGET. This can be overridden by command
line arguments. This will cause modern clang to pass
`-platform_version 10.12 0.0.0`, since it doesn't know about the SDK
settings. Older versions of clang will pass down `-macos_version_min`
flags with no sdk version.

At the linker layer, apply a default value for anything left
ambiguous. If nothing is specified, pass a full
`-platform_version`. If only `-macos_version_min` is specified, then
lock down the sdk_version explicitly with `-sdk_version`. If a min
version and sdk version is passed, do nothing.
2021-04-11 09:47:09 +09:00
R. RyanTM
822c94a557 openfpgaloader: 0.2.5 -> 0.2.6 2021-04-10 17:24:56 +00:00
R. RyanTM
5131723e93 ccls: 0.20201219 -> 0.20210330 2021-04-10 06:19:39 +00:00
Rouven Czerwinski
56fc7c44db usbsdmux: 0.1.8 -> 0.2.0 2021-04-09 17:42:28 +02:00
Jan Tojnar
c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Fabian Affolter
63a46019c6
Merge pull request #118190 from r-ryantm/auto-update/act
act: 0.2.20 -> 0.2.21
2021-04-06 10:45:49 +02:00
Robert Scott
42368bf521
Merge pull request #118559 from r-ryantm/auto-update/terracognita
terracognita: 0.6.2 -> 0.6.3
2021-04-05 22:31:54 +01:00
R. RyanTM
b58b77a164 terracognita: 0.6.2 -> 0.6.3 2021-04-05 06:08:23 +00:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Sandro Jäckel
33a395f195
yacc: deprecate alias
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
github-actions[bot]
3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Frederik Rietdijk
f812cdd3b8 kconfig-frontends: use python3 2021-04-03 17:06:11 +02:00
Frederik Rietdijk
9029840dc8 jscoverage: use python3 2021-04-03 17:06:11 +02:00
Frederik Rietdijk
34c23dbb42 global: use python3 2021-04-03 17:06:07 +02:00
Frederik Rietdijk
58579c642a gede: use python3 2021-04-03 17:06:07 +02:00
github-actions[bot]
74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Robert Scott
d535600060
Merge pull request #117242 from OPNA2608/update/libftdi1-1.5/21.05
libftdi1: 1.4 -> 1.5
2021-04-03 00:17:38 +01:00
github-actions[bot]
b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Ben Siraphob
1d2e7637b6
strace: assert isLinux to avoid eval error on darwin (#114974)
libunwind.supportsHost is not available on darwin because it uses a different libunwind package (https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-source-releases/default.nix#L270) and changing the stdenv is a big overkill.
2021-04-02 20:03:31 +02:00
github-actions[bot]
636e58e31b
Merge staging-next into staging 2021-04-02 00:21:46 +00:00
Vladimír Čunát
d601532dfc
intltool: fix fetchurl invocation 2021-04-01 22:50:21 +02:00
R. RyanTM
dac29576af act: 0.2.20 -> 0.2.21 2021-04-01 04:49:19 +00:00