github-actions[bot]
e061b757fe
Merge master into staging-next
2021-05-24 06:24:12 +00:00
happysalada
7e26b2a455
elixir: remove unused setup hook
2021-05-24 10:14:44 +09:00
happysalada
79118eb657
elixir: format: group inherit
2021-05-24 10:14:44 +09:00
happysalada
58a66f0160
elixir: nixpkgs-fmt
2021-05-24 10:14:44 +09:00
happysalada
aa86fdcf85
elixir: default to 1.12; init 1.12
2021-05-24 10:14:17 +09:00
github-actions[bot]
a8835232ec
Merge master into staging-next
2021-05-24 01:00:29 +00:00
Doron Behar
71acbedaaa
Merge pull request #123984 from doronbehar/pkg/octave/withPackages
...
octave.buildEnv: Handle better no packages situation
2021-05-23 19:58:43 +00:00
github-actions[bot]
e9fa1eeaf7
Merge master into staging-next
2021-05-23 12:26:48 +00:00
R. RyanTM
1f5baa4bf8
erlang: 23.3.4 -> 23.3.4.1
2021-05-23 16:47:31 +09:00
Doron Behar
351187d848
octave.buildEnv: Handle better no packages situation
...
Use `rm -f` for *.tar.gz files so the command won't fail in case there
aren't any packages.
Create the `$out/.octave_packages` file before iterating the packages.
2021-05-23 09:19:18 +03:00
Jonathan Ringer
b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next
2021-05-22 19:23:14 -07: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
Andrew Brooks
b7b9680e66
tcl: update maintainers
...
When I reached out to vrthra / Rahul Gopinath about this PR, he
indicated that he no longer has the time to serve as tcl maintainer
and suggested that I take on the responsibility.
2021-05-21 15:18:31 -05:00
Andrew Brooks
4b5d85bf44
tcl: use double square brackets consistently in tcl package hook
2021-05-21 15:18:30 -05:00
Andrew Brooks
927251e781
tcl: avoid readonly local in package hook
...
If a path with a space were added to TCLLIBPATH, _addToTclLibPath
would attempt to mutate the tclPkg local and fail.
2021-05-21 15:18:29 -05:00
Andrew Brooks
ca4b34f09e
tcl: combine inherit expressions
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-21 15:18:27 -05:00
Andrew Brooks
e22fe366af
tcl: fix TCLLIBPATH edge cases in tcl package hook
...
TCLLIBPATH was not actually extended if a package's path was a substring
of a package already on the path. This commit fixes that behavior.
Additionally, '--prefix' is now used in place of '--set', as the latter
was found to break tkremind from the remind package.
2021-05-21 15:18:26 -05:00
Andrew Brooks
9571f53665
tclreadline: simplify package with tcl.mkTclDerivation
2021-05-21 15:18:04 -05:00
Andrew Brooks
c6ca1ba9c7
tcl: Add tclPackageHook and mkTclDerivation
...
Implement tclPackageHook, a setup hook that adjusts TCLLIBPATH to include the
paths of any installed Tcl packages, propagates that TCLLIBPATH to
anti-dependencies, and wraps any installed binaries to set their TCLLIBPATH.
Additionally, implement a makePythonPackage-style mkDerivation wrapper to use
reasonable defaults for Tcl packages and use tclPackageHook.
2021-05-21 15:18:03 -05:00
Mario Rodas
dadbf69b76
Merge pull request #123748 from baloo/baloo/rubygems/tmpdir
...
rubygems: ensure temporary directories are cleaned up
2021-05-21 03:56:38 -05:00
github-actions[bot]
76337e9ea4
Merge staging-next into staging
2021-05-21 06:22:12 +00: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
Arthur Gautier
7b48454121
rubygems: ensure temporary directories are cleaned up
...
see #123718
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-05-20 20:51:41 +00:00
github-actions[bot]
0a0c0a9fb9
Merge staging-next into staging
2021-05-20 18:36:04 +00: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
Eduardo Sánchez Muñoz
4aee58ec96
pythonPackages.buildPythonPackage: enable verbose output with pyproject
...
This makes the build log more useful
2021-05-19 12:16:15 -07:00
github-actions[bot]
99a3061e9f
Merge staging-next into staging
2021-05-18 18:36:38 +00: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
R. RyanTM
4cb9549496
chibi: 0.9.1 -> 0.10
2021-05-17 13:35:12 -07: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 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
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
("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?).
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