Commit graph

289802 commits

Author SHA1 Message Date
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
sternenseemann 91cba7b0a9 llvmPackages_{10,11,12}.compiler-rt: install resource txts to $out/share
7869d16545 changed how resource files are
installed. Likely by accident, now some of the resource files are
installed to $dev/include instead of $out/share. This causes the cc
wrapper's resource-root to miss those files from compiler-rt as they are
in a different place than expected.

This commit fixes all instances of this incorrect installation for
llvmPackages_10, 11 and 12 which are the only llvm package sets which
link ${targetLlvmLibraries.compiler-rt.out}/share to the resource-root.

For the other llvm package set this will likely also need to be fixed,
but it doesn't have to have immediate urgency and doing it in two steps
allows us to (hopefully) fix the chromium build without causing a darwin
stdenv rebuild.

The full fix can be found in #123103 and should probably be included in
the next staging-next rotation.
2021-05-15 17:40:24 +02:00
github-actions[bot] ec10b0958d
Merge master into staging-next 2021-05-15 12:25:33 +00:00
Devin Singh 5d176f3c20 vimPlugins.vim-clap: fix hash 2021-05-15 14:16:19 +02:00
Devin Singh 18355b4748 trouble.nvim: lsp-trouble.nvim -> trouble.nvim 2021-05-15 14:16:19 +02:00
Gabriel Ebner 838e396944
Merge pull request #123081 from stephank/fix-elan-darwin
elan: fix darwin build
2021-05-15 13:26:12 +02:00
Pamplemousse 83d907fd76 python3Packages.pwntools: 4.3.1 -> 4.5.0
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-05-15 12:19:59 +02:00
Pamplemousse 4f77a0e08e python3Packages.colored-traceback: init at 0.3.0
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-05-15 12:19:59 +02:00
Matthias Beyer 7f3e435bdf zellij: 0.8.0 -> 0.10.0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: William Casarin <jb55@jb55.com>
Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210514095219.13010-1-mail@beyermatthias.de%3E
2021-05-15 19:11:02 +09:00
Stéphan Kochen acf640be7b elan: fix darwin build 2021-05-15 12:02:46 +02:00
DavHau 282576e2ef
python3Packages.pika: enable tests (#122170) 2021-05-15 12:02:26 +02:00
Vladimír Čunát 13295e7f55
Merge #123068: mplayer: fix build failure with ffmpeg 4.4 2021-05-15 11:13:12 +02:00
Vladimír Čunát 77549f4b75
wlroots_0_12: fixup build with ffmpeg-4.4
-Werror=deprecated-declarations is nice upstream but not in distro.
https://nix-cache.s3.amazonaws.com/log/cfmk2qkvck88qc002bvxzgsb2zc5b1h2-wlroots-0.12.0.drv
2021-05-15 11:07:47 +02:00
Vincenzo Mantova 3d385c7894
perlPackages.TextBibTeX: use lib instead of lib64 on aarch64 (#122567) 2021-05-15 10:04:35 +02:00
Fabian Affolter 8599a6c417
Merge pull request #123071 from emmanuelrosa/zhf-taglib-extras
taglib-extras: add missing dependency zlib
2021-05-15 09:56:47 +02:00
Martin Weinelt d47f3f1e88
Merge pull request #123043 from TredwellGit/linux 2021-05-15 09:46:31 +02:00
Vladimír Čunát 4e8fa08311
Revert "lua51Packages.luxio: fix build"
This reverts commit 322ec24acd.
After the parent commit we don't need to fix individual lua users.
2021-05-15 09:37:32 +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
Zane van Iperen 960cd68773
mplayer: fix build failure with ffmpeg 4.4
Backport SVN revision 38199.
2021-05-15 17:28:37 +10:00
Jonathan Ringer 322ec24acd lua51Packages.luxio: fix build 2021-05-15 00:27:53 -07:00
lewo ef95fa40e9
Merge pull request #122772 from nlewo/gremlin-3.5
gremlin-console: 3.4.10 -> 3.5.0
2021-05-15 09:18:34 +02:00
Emmanuel Rosa 281c5413df taglib-extras: add missing dependency zlib
This change adds zlib as a dependency to address the error:

```
/nix/store/5xyjd2qiily84lcv2w2grmwsb8r1hqpr-binutils-2.35.1/bin/ld: cannot find -lz
collect2: error: ld returned 1 exit status
make[2]: *** [taglib-extras/CMakeFiles/tag-extras.dir/build.make:208:
taglib-extras/libtag-extras.so.1.0.0] Error 1
make[1]: *** [CMakeFiles/Makefile2:154:
taglib-extras/CMakeFiles/tag-extras.dir/all] Error 2
make: *** [Makefile:149: all] Error 2
builder for
'/nix/store/w1ac3b6v5yfblbnqzyxa6y4738frlmvr-taglib-extras-1.0.1.drv'
failed with exit code 2
```

ZHF: #122042
2021-05-15 14:15:09 +07:00
Antoine Eiche a4ae041a22 gremlin-console: 3.4.10 -> 3.5.0 2021-05-15 08:59:18 +02:00
Jonathan Ringer 537a1940e8
staging-next: lua5: fix eval, add lib.so.patch 2021-05-14 23:38:34 -07:00
Fabian Affolter a2c3ea5bf8
Merge pull request #123042 from fabaff/fix-dendropy
python3Packages.dendropy: 4.4.0 -> 4.5.1
2021-05-15 08:25:55 +02:00
github-actions[bot] c48794dcef
Merge master into staging-next 2021-05-15 06:22:22 +00:00
Jonathan Ringer 0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Aaron Andersen fc63be7ac8
Merge pull request #122658 from aanderse/httpd-reload
nixos/httpd: provide a stable path stable path to the configuration f…
2021-05-14 23:50:43 -04:00
Aaron Andersen d9868214a3
Merge pull request #122672 from r-ryantm/auto-update/kodi-inputstream-ffmpegdirect
kodiPackages.inputstream-ffmpegdirect: 1.21.2 -> 1.21.3
2021-05-14 23:24:52 -04:00
Aaron Andersen 695e45f1df
Merge pull request #122673 from r-ryantm/auto-update/kodi-pvr-iptvsimple
kodiPackages.pvr-iptvsimple: 7.6.2 -> 7.6.4
2021-05-14 23:24:32 -04:00
Aaron Andersen 460f8def67
Merge pull request #122255 from aanderse/kodi
kodi: 19.0 -> 19.1
2021-05-14 23:21:08 -04:00
Ryan Mulligan 72948af15b
Merge pull request #122826 from r-ryantm/auto-update/kubernetes
kubernetes: 1.21.0 -> 1.21.1
2021-05-14 14:45:54 -07:00
TredwellGit b9bb51497d linux/hardened/patches/5.4: 5.4.118-hardened1 -> 5.4.119-hardened1 2021-05-14 21:41:11 +00:00
TredwellGit bd4e82b585 linux/hardened/patches/5.11: 5.11.20-hardened1 -> 5.11.21-hardened1 2021-05-14 21:41:10 +00:00
TredwellGit 8cf62ea50a linux/hardened/patches/5.10: 5.10.36-hardened1 -> 5.10.37-hardened1 2021-05-14 21:41:09 +00:00
TredwellGit b2f61fde52 linux: 5.4.118 -> 5.4.119 2021-05-14 21:40:48 +00:00
TredwellGit 1f0dc90f1a linux: 5.12.3 -> 5.12.4 2021-05-14 21:40:41 +00:00
TredwellGit f861540ac2 linux: 5.11.20 -> 5.11.21 2021-05-14 21:40:34 +00:00
TredwellGit b9cf39ce34 linux: 5.10.36 -> 5.10.37 2021-05-14 21:40:26 +00:00
Stéphan Kochen 2ff319e055
findomain: fix darwin build (#123019) 2021-05-14 17:36:55 -04:00
Stéphan Kochen f91dcdd7b5
copper: broken on darwin (#123030) 2021-05-14 17:35:55 -04:00
Fabian Affolter 90e41651fa python3Packages.dendropy: 4.4.0 -> 4.5.1 2021-05-14 23:35:34 +02:00
Stéphan Kochen 6b666af734
code-minimap: fix darwin build (#123031) 2021-05-14 17:34:22 -04:00
Stéphan Kochen bb24db68aa
dmtx-utils: fix darwin build (#123033) 2021-05-14 17:34:07 -04:00
Stéphan Kochen 4bfa8bdd46
ecpdap: fix darwin build (#123035) 2021-05-14 17:33:51 -04:00
Stéphan Kochen 2adca7ae14
cd-hit: fix darwin build (#123026) 2021-05-14 17:27:16 -04:00
sternenseemann 104af4aafa inspircd: run configure phase hooks 2021-05-14 23:02:20 +02:00