1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 03:25:02 +00:00
Commit graph

5215 commits

Author SHA1 Message Date
Robert T. McGibbon 2e55b7301b pytestCheckHook: improve disabledTestPaths whitespace handling 2021-05-14 21:59:55 -07:00
Jonathan Ringer 0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Thiago Kenji Okada f047930992 babashka: 0.4.0 -> 0.4.1 2021-05-14 18:18:14 -03:00
Konstantin Alekseev feb867f2fd
lua-5.4: fix build on darwin (#123028) 2021-05-14 16:38:50 -04:00
Vladimír Čunát c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Vladimír Čunát 55282bd6f6
lua5_1: fixup a recent regression
Commit 57832e625c (PR #119860) switched to using SYSCFLAGS,
but lua 5.1 calls it MYCFLAGS.  We noticed due to broken luarocks build:
https://hydra.nixos.org/build/142663274
2021-05-14 22:08:38 +02:00
Domen Kožar 74562c88c9
Merge pull request #122941 from bobrik/ivan/msse-x86
python2: only pass -msse2 on x86_64-darwin, not any darwin
2021-05-14 20:01:20 +02:00
Ivan Babrou 51f6036e41 python2: only pass -msse2 on x86_64-darwin, not any darwin 2021-05-14 09:15:03 -07:00
zowoq 004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
happysalada 580d6f6951 erlang: 23.3.2 -> 23.3.4 2021-05-14 15:25:00 +09:00
github-actions[bot] bf5d8bb531
Merge master into staging-next 2021-05-14 00:58:11 +00:00
Justin Wood 7500267ed9 ErlangR24: init at 24.0
Update configure options

The configure script now needs to be told about the headers and the
actual lib files separately.

Remove extra whitespace
2021-05-13 11:48:19 -07:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
github-actions[bot] 61fa3fdde8
Merge master into staging-next 2021-05-10 18:28:17 +00:00
Sandro 5b50bab958
Merge pull request #122277 from thiagokokada/bump-babashka 2021-05-10 19:18:43 +02:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
github-actions[bot] f4d69ad1f2
Merge master into staging-next 2021-05-10 06:20:28 +00:00
Ben Siraphob a4ba4770fb falcon: 2013-09-19 -> unstable-2018-10-23 2021-05-10 00:03:10 +07:00
Jonathan Ringer 2171463a0f cling: fix llvm build 2021-05-08 18:13:45 -07:00
Thiago Kenji Okada 73c19f6682 babashka: 0.3.5 -> 0.4.0 2021-05-08 21:19:19 -03:00
Jan Tojnar dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
github-actions[bot] 6d46d8a9b9
Merge master into staging-next 2021-05-08 18:22:46 +00:00
Thomas Gerbet 9c6dd168d7 falcon: fix the build 2021-05-08 10:31:28 -07: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] b4416b52c5
Merge master into staging-next 2021-05-08 00:46:50 +00:00
Stefan Frijters c16380b5b4 gnuapl: Fix build
One instance of this error/warning comes up during the build.
According to the comment in the code they know what they are doing,
so this can be ignored.
2021-05-07 14:44:01 -07:00
github-actions[bot] 1ae6d3d02f
Merge master into staging-next 2021-05-07 18:24:29 +00:00
ajs124 cd609e7a1c
Merge pull request #117094 from helsinki-systems/drop/spidermonkey_1_8_5
spidermonkey_1_8_5: drop
2021-05-07 18:55:49 +02:00
John Ericson a3e54cb582 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-06 15:48:25 -04:00
John Ericson 470640e7fe treewide: Do a number of no-op cleanups for cross and darwin
I am taking the non-invasive parts of #110914 to hopefully help out with #111988.

In particular:

 - Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
   a proper `callPackage`.

 - Adjust Darwin `stdenv`'s overlays keeping things from the previous
   stage to not stick around too much.

 - Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
   closer to a unified LLVM and GCC bootstrap.
2021-05-06 11:17:26 -04:00
Jan Tojnar d9f177eb4d
Merge branch 'staging-next' into staging
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <1bdda029cd>
- apparmor rules rewritten <b280e64078>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
2021-05-06 08:42:50 +02:00
Robin Gloster d3ba49889a
Merge pull request #121180 from helsinki-systems/upd/php
php: 7.3.23, 8.0.5, 7.4.18
2021-05-05 17:07:07 -05:00
Maximilian Bosch f233562967
evcxr: 0.8.1 -> 0.9.0
ChangeLog: https://github.com/google/evcxr/blob/v0.9.0/RELEASE_NOTES.md#version-090
2021-05-05 22:39:22 +02:00
github-actions[bot] 5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
ajs124 09d29bd784 spidermonkey_1_8_5: drop 2021-05-03 15:44:10 +02:00
Thomas Gerbet 3266b763ea mujs: 1.1.1 -> 1.1.2
https://git.ghostscript.com/?p=mujs.git;a=log;h=1.1.2
The fix for the use-after-free included in this release might have a
security impact.
2021-05-02 11:00:09 +02:00
Mario Rodas 92bff24dc1
Merge pull request #119506 from marsam/ruby-disable-jit
ruby: build without jit by default
2021-05-01 21:56:15 -05:00
github-actions[bot] e6037ce5fe
Merge staging-next into staging 2021-05-02 00:58:46 +00:00
Patrick Hilhorst 38499a3b08
j: 901f -> 902b 2021-05-01 21:58:31 +02:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
ajs124 faec9cb0e5 php80: 8.0.3 -> 8.0.5 2021-04-30 02:57:04 +02:00
ajs124 e6626a3ae0 php74: 7.4.16 -> 7.4.18 2021-04-30 02:57:04 +02:00
ajs124 68c650d0f4 php73: 7.3.27 -> 7.3.28 2021-04-30 02:57:04 +02:00
Ryan Mulligan 14cfc9dba3
Merge pull request #121035 from r-ryantm/auto-update/jruby
jruby: 9.2.16.0 -> 9.2.17.0
2021-04-28 19:42:50 -07:00
R. RyanTM 6fec0dfca0 jruby: 9.2.16.0 -> 9.2.17.0 2021-04-28 14:27:39 +00:00
github-actions[bot] ce47d859f6
Merge staging-next into staging 2021-04-28 12:06:40 +00:00
R. RyanTM 377bda4b75 erlang: 23.3.1 -> 23.3.2 2021-04-28 18:19:46 +09:00
Kim Lindberger 3bed46e4b9
Merge pull request #114175 from eyJhb/php-phpdbg-disable
php: fixed not being able to disable phpdbgSupport
2021-04-28 10:46:47 +02:00
github-actions[bot] 70093bbd44
Merge staging-next into staging 2021-04-28 06:05:49 +00:00
R. RyanTM 3516b56859 joker: 0.16.0 -> 0.17.1 2021-04-28 01:00:59 -04:00
R. RyanTM dacb5ba294 janet: 1.15.4 -> 1.15.5 2021-04-27 23:38:41 -04:00
github-actions[bot] 97889a52e1
Merge staging-next into staging 2021-04-27 18:14:28 +00:00
Sandro ce90673437
Merge pull request #120725 from jlesquembre/clojure
clojure: 1.10.3.814 -> 1.10.3.822
2021-04-27 14:10:10 +02:00
José Luis Lafuente dea924ccf8
clojure: 1.10.3.814 -> 1.10.3.822 2021-04-26 13:36:11 +02:00
github-actions[bot] 0d97d9f23b
Merge staging-next into staging 2021-04-23 00:15:42 +00:00
github-actions[bot] 481a9bc47c
Merge master into staging-next 2021-04-23 00:15:39 +00:00
Thiago Kenji Okada 5478f50c10 babashka: 0.3.1 -> 0.3.5 2021-04-22 11:37:37 -03:00
Andrew Childs f16053c34d rubygems: 3.1.3 -> 3.2.16 2021-04-21 13:23:53 +09:00
Alyssa Ross 25d4f0d334
lua: use stdenv.cc.targetPrefix
This evaluates to an empty string when not cross compiling, so by
using this instead of stdenv.hostPlatform.config we can eliminate a
conditional.
2021-04-19 16:58:32 +00:00
Alyssa Ross 8abdf1db65
lua: don't try to -ldl -lm on non-Linux OSes
On other OSes, like NetBSD, these are part of libc.  Fortunately, the
Lua Makefile already knows about this, and has a SYSLIBS variable we
can use for this.
2021-04-19 16:58:29 +00:00
Alyssa Ross 34f8d7e15a
lua: one dso patch to rule them all
We do this same patch in three different ways for four different Lua
versions, even though the structure of the Makefile barely changes
between releases.  We can easily consolidate this by just modifying
the Makefile ourselves instead of using patches (Makefiles are very
amenable to this).
2021-04-19 16:58:26 +00:00
Alyssa Ross 936b27b5d4
lua: support non-Linux non-Darwin operating systems 2021-04-19 13:05:06 +00:00
Alyssa Ross 57832e625c
lua: don't always set LUA_USE_LINUX
This is supposed to be automatically set by Lua's Makefile if PLAT is
set appropriately, but it was being overridden by us overridding
CFLAGS.  Setting it manually was a hack.  The correct thing to do was
to make sure SYSCFLAGS (where Lua's Makefile puts LUA_USE_LINUX) was
still included in our custom CFLAGS.
2021-04-19 12:57:35 +00:00
Martin Weinelt cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
Thomas Gerbet 54ac23c6b9 mujs: 1.0.9 -> 1.1.1 2021-04-15 10:18:55 +02:00
Vladimír Čunát cf5cca58d3
Merge #119255: staging-next + conflict resolution -> staging 2021-04-13 09:35:49 +02:00
Anderson Torres fea3171893
Merge pull request #118403 from dotlambda/CVE-2021-23336
python27: fix CVE-2021-23336
2021-04-12 18:44:52 -03:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
David Leslie a7b54d9016
erlang: add updateScript and update versions (#118831)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-12 19:59:37 +02:00
Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
github-actions[bot] bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
Alexander Bantyev 4fcc1eda6b
Merge pull request #118595 from dlesl/update-erlang
erlangR23: 23.2.6 -> 23.3.1
2021-04-08 13:29:58 +03:00
github-actions[bot] 0ba1008684
Merge master into staging-next 2021-04-08 06:05:39 +00:00
Mario Rodas e4650171af
Merge pull request #118684 from lugray/update-ruby_3_0
ruby_3_0: 3.0.0 -> 3.0.1
2021-04-07 21:02:45 -05:00
github-actions[bot] 1d48804dab
Merge master into staging-next 2021-04-07 12:06:23 +00:00
Sandro b219457ac0
Merge pull request #117333 from OPNA2608/fix/supercollider-wrapping/21.05
supercollider: fix Qt wrapping
2021-04-07 10:31:19 +02:00
Mario Rodas 83612c3f98 ruby_2_7: 2.7.2 -> 2.7.3
https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-7-3-released/
2021-04-07 04:20:00 +00:00
Mario Rodas 3d7c1202df ruby_2_6: 2.6.6 -> 2.6.7
https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-6-7-released/
2021-04-07 04:20:00 +00:00
github-actions[bot] 8610c0abbd
Merge staging-next into staging 2021-04-07 12:06:26 +00:00
Lisa Ugray 7ed8d11dc4 ruby_3_0: 3.0.0 -> 3.0.1 2021-04-06 15:34:39 -04:00
Jan Tojnar 70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Jan Tojnar c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Sandro 2514c93a4f
Merge pull request #118303 from siriobalmelli-foss/upgrade/wasmer
wasmer: 0.17.0 -> 1.0.2
2021-04-05 17:13:52 +02:00
David e067a4c91f erlangR23: 23.2.6 -> 23.3.1 2021-04-05 15:17:10 +02:00
Frederik Rietdijk f310134dec python39: 3.9.3 -> 3.9.4 2021-04-05 10:54:26 +02:00
Sandro Jäckel 3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Frederik Rietdijk 09147517ea buildPythonPackage: avoid recursion
Sometimes an infinite recursion error shows up.
2021-04-03 17:56:14 +02:00
Frederik Rietdijk 4f02e12f8a python2Packages: separate extension 2021-04-03 17:49:42 +02:00
Robert Schütz fa410ea633 python27: fix CVE-2021-23336
From the archive `python-gentoo-patches-2.7.18_p8.tar.xz` found at
https://dev.gentoo.org/~mgorny/dist/python/, I copied
`0024-3.6-bpo-42967-only-use-as-a-query-string-separator-G.patch`.
2021-04-03 15:10:01 +02:00
Sirio Balmelli 5ead7d9343
wasmer: 0.17.0 -> 1.0.2
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2021-04-03 11:37:23 +02:00
Frederik Rietdijk 9e83f91bb1 python39: 3.9.2 -> 3.9.3 2021-04-03 10:29:11 +02:00
Frederik Rietdijk d754c20366 python38: 3.8.8 -> 3.8.9 2021-04-03 10:29:10 +02:00
github-actions[bot] b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Sandro 96f62260a9
Merge pull request #118131 from alyssais/ruby
ruby: remove myself as maintainer/CODEOWNER
2021-04-02 18:51:18 +02:00
Eric Dallo 1092aa59b5
babashka: 0.2.10 -> 0.3.1 2021-04-02 12:14:26 -03:00
github-actions[bot] 85e9b4acf4
Merge staging-next into staging 2021-04-01 12:06:32 +00:00
Sandro 356e52c844
Merge pull request #117116 from kolaente/update/flutter 2021-04-01 13:48:07 +02:00
Mario Rodas 6852f66506 ruby: disable jit by default
Building Ruby with jit by default includes clang in its closure, hence
causing a large closure size.

Ruby jit support is optional, and is only enabled at runtime through the
`--jit` flag, hence it should not cause any regression.
2021-04-01 04:20:00 +00:00
Alyssa Ross 53f49682ee
ruby: remove myself as maintainer/CODEOWNER
It's been at least a year since I kept up to date with Ruby, and I
don't think I really have anything left to offer Nixpkgs in terms of
Ruby expertise.
2021-03-31 09:27:35 +00:00
github-actions[bot] ea21c98571
Merge staging-next into staging 2021-03-28 06:05:34 +00:00