Commit Graph

5103 Commits

Author SHA1 Message Date
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
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
github-actions[bot]
3f2a4a9dea
Merge master into staging-next 2021-03-28 06:05:31 +00:00
Ryan Mulligan
c657fe2021
Merge pull request #117552 from r-ryantm/auto-update/clojure
clojure: 1.10.2.774 -> 1.10.3.814
2021-03-27 20:34:42 -07:00
github-actions[bot]
bef3b9438a
Merge staging-next into staging 2021-03-27 18:14:11 +00:00
github-actions[bot]
95c24d591a
Merge master into staging-next 2021-03-27 18:14:08 +00:00
Elis Hirwing
2ed44fa49c
Merge pull request #114173 from eyJhb/php-clisupport-false
php: fixed building with cliSupport = false
2021-03-27 17:08:43 +01:00
Jan Tojnar
b3c854b60b
Merge branch 'staging-next' into staging 2021-03-26 07:53:44 +01:00
github-actions[bot]
7c9222212f
Merge master into staging-next 2021-03-25 18:14:01 +00:00
Frederik Rietdijk
4f39a2db4d cling: use python3 2021-03-25 12:00:51 +01:00
R. RyanTM
3b43e447c6 clojure: 1.10.2.774 -> 1.10.3.814 2021-03-25 01:36:59 +00:00
github-actions[bot]
85dc25227c
Merge staging-next into staging 2021-03-24 12:12:00 +00:00
github-actions[bot]
380cb1e995
Merge master into staging-next 2021-03-24 12:11:57 +00:00