Commit graph

5172 commits

Author SHA1 Message Date
FliegendeWurst 9e16b3b579 renpy: ffmpeg_3 -> ffmpeg 2021-05-18 09:42:58 +02:00
David 9f4878daca fix lfe 2021-05-18 05:40:58 +09:00
Sandro 981d89bddc
Merge pull request #123041 from thiagokokada/bump-babashka
babashka: 0.4.0 -> 0.4.1
2021-05-17 19:09:35 +02:00
Michael Raskin 5e9437ef57
Merge pull request #123289 from OPNA2608/fix/supertuxkart-darwin/21.05
superTuxKart: Build on Darwin
2021-05-16 22:59:10 +00:00
R. RyanTM f867062ef9 erlangR21: 21.3.8.22 -> 21.3.8.23 2021-05-17 07:58:15 +09:00
Stéphan Kochen 873996595c acl2: fix darwin build 2021-05-16 14:59:44 -07:00
OPNA2608 dfb2d52a78 angelscript: Make Darwin-compatible 2021-05-16 21:45:55 +02:00
github-actions[bot] b484cef365
Merge master into staging-next 2021-05-16 01:00:58 +00:00
Stéphan Kochen e957b3c5b8 evcxr: fix darwin build 2021-05-15 12:35:47 -07:00
Alyssa Ross 665732d877 lua: fix linkage
This fixes a couple of problems:

 * Lua 5.1 doesn't have SYSLIBS, so wasn't being linked with any
   libraries.

 * SYSLIBS doesn't include -lm, so we had to add that manually to
   pkgconfig.  LIBS includes -lm, so we don't need that hack any more.
2021-05-15 09:33:46 -07:00
Alyssa Ross 1758c0ac65 lua5_4: fix eval
This patch was removed in 34f8d7e15a ("lua: one dso patch to rule
them all"), and the reference to it in lua5_4 was removed at the time,
but it seems to have found its way back somehow (probably through a
merge?).

(cherry picked from commit 5b278213a2)
2021-05-15 09:33:46 -07:00
Alyssa Ross 3f5ecec613 Revert "staging-next: lua5: fix eval, add lib.so.patch"
This reverts commit 537a1940e8.

This patch was deliberately removed in 34f8d7e15a ("lua: one dso
patch to rule them all").  The correct fix is to remove the reference
to it that was reintroduced, rather than re-adding the patch.
2021-05-15 09:33:46 -07:00
Alyssa Ross 399223fdf7 Revert "lua5_*: tweak linking libraries"
This reverts commit 539ad4f811.

The correct fix here is to fix our addition to the Makefile.
2021-05-15 09:33:46 -07:00
Vladimír Čunát 539ad4f811
lua5_*: tweak linking libraries
All liblua.so were missing a library or two;
I'm not sure if there's a better way to add them.  Check:
ldd -r ./result/lib/liblua.so
2021-05-15 09:36:05 +02:00
Jonathan Ringer 537a1940e8
staging-next: lua5: fix eval, add lib.so.patch 2021-05-14 23:38:34 -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
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
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
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
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
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