R. RyanTM
1f5baa4bf8
erlang: 23.3.4 -> 23.3.4.1
2021-05-23 16:47:31 +09:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Sandro Jäckel
0197f1dc41
pythonPackages: Add aliases 🎉
2021-05-22 15:02:50 -07:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/shells/ion/default.nix
pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
R. RyanTM
16f2ed30d2
clojure: 1.10.3.822 -> 1.10.3.839
2021-05-20 14:52:49 -07:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
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
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07: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]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00: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
github-actions[bot]
c10600230e
Merge staging-next into staging
2021-05-15 18:30:31 +00: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 34f8d7e15a5b278213a2
2021-05-15 09:33:46 -07:00
Alyssa Ross
3f5ecec613
Revert "staging-next: lua5: fix eval, add lib.so.patch"
...
This reverts commit 537a1940e834f8d7e15a
2021-05-15 09:33:46 -07:00
Alyssa Ross
399223fdf7
Revert "lua5_*: tweak linking libraries"
...
This reverts commit 539ad4f811
2021-05-15 09:33:46 -07:00
github-actions[bot]
49ec716c04
Merge staging-next into staging
2021-05-15 12:25:36 +00:00
Alyssa Ross
5b278213a2
lua5_4: fix eval
...
This patch was removed in 34f8d7e15a
2021-05-15 12:47:06 +02: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
github-actions[bot]
78ae7ac75e
Merge staging-next into staging
2021-05-15 06:22:25 +00:00
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#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
