2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-29 09:04:17 +00:00
Commit Graph

232339 Commits

Author SHA1 Message Date
John Ericson
1085403acd {cc,bintools}-wrapper: Comments no longer spliced
This means we can freely keep the comments up to date without the
penalty of a mass rebuild.
2020-06-30 15:04:10 +00:00
Alyssa Ross
3abe43e22d transmission: install documentation
The risk of collisions is gone now because documentation is correctly
installed into $out/share/doc/transmission instead of $out/share/doc
as before.
2020-06-29 13:56:27 +00:00
Alyssa Ross
10bb0637e4 Revert "darktable: Remove doc directory from output"
This reverts commit 730133e130.

multiple-outputs.sh has been fixed, so documentation is now
corrrrectly installed under $out/share/doc/darktable.

Fixes: https://github.com/NixOS/nixpkgs/pull/72160
Fixes: https://github.com/NixOS/nixpkgs/pull/83248
2020-06-29 13:56:27 +00:00
Alyssa Ross
39fef703bf ghostscript: fix build
This hack is no longer necessary, since multiple-outputs.sh has been
fixed to install docs in the right location.
2020-06-29 13:56:27 +00:00
Alyssa Ross
be1b22538a cmake: only set output paths with multiple outputs
This brings cmake inline with the behaviour used for configure
scripts, defined in multiple-outputs.sh.  It's important because
that setup hook will only set shareDocName if multiple outputs are in
use (and setOutputFlags hasn't been disabled).  So previously,
CMAKE_INSTALL_DOCDIR would be set to $out/share/doc for single-output
derivations, instead of $out/share/doc/$shareDocName, which would
result in collisions.

Since this hook now uses the setOutputFlags variable, I had to remove
the empty assignment of it added in
a714284d8b.

Fixes: https://github.com/NixOS/nixpkgs/issues/82304
2020-06-29 13:56:27 +00:00
Alyssa Ross
1421404d42 stdenv: fix backward multiple outputs conditional
This is supposed to shareDocName to a fallback value if it can't be
determined from looking at the configure script.  But the conditional
checked whether shareDocName was set, rather than if it wasn't.  This
meant that if shareDocName had been detected from a configure script,
it would be immediately overridden by the package name, and if it
couldn't be detected, shareDocName would remain unset.

This resulted in QEMU installing files like $out/share/doc/index.html,
which should of course have been in $out/share/doc/qemu/index.html.

An interesting side effect of this is that, since
9f8751528c when this code was added, the
detected package name has never actually been used for installing
documentation, because it would always be overridden.  So this patch
will actually enable that for the first time, four years later.

Fixes: https://github.com/NixOS/nixpkgs/issues/90486
2020-06-29 13:56:27 +00:00
Vladimír Čunát
d87b595e53
Merge : file: backport patch to fix a regression 2020-06-28 18:31:14 +02:00
Vladimír Čunát
3a78c31d4d
Merge : curl: 7.70.0 -> 7.71.0 (security)
...into staging branch.
2020-06-28 18:05:02 +02:00
Michael Weiss
8f423d094d
Merge pull request from primeos/libva
libva: 2.7.1 -> 2.8.0
2020-06-28 17:44:31 +02:00
Félix Baylac-Jacqué
277dd15beb
curl: 7.70.0 -> 7.71.0
Changelog:
https://daniel.haxx.se/blog/2020/06/24/curl-7-71-0-blobs-and-retries/
2020-06-28 17:35:42 +02:00
Pierre Bourdon
cbb288204d
file: backport patch to fix a 5.39 regression
This bug is causing diffoscope to fail to build with file 5.39.
2020-06-28 11:18:38 +02:00
zowoq
87dbe6d797 buildGoModule: remove trailing whitespace 2020-06-28 11:32:21 +10:00
Bouke van der Bijl
81a8b76b3a go: only set CC when cross-compiling
This avoids he default CC for cgo being hardcoded, when we only want to
overwrite it during compilation.
2020-06-28 11:28:23 +10:00
Matthew Bauer
cee7631c08
Merge pull request from iblech/patch-dsniff2
Unbreak dsniff by partially reverting a commit to libpcap
2020-06-27 19:33:41 -04:00
Jörg Thalheim
ec2d2fe124
Merge pull request from rycee/cargo-shell-completion
cargo: install bash and zsh completion scripts
2020-06-27 22:49:01 +01:00
Robert Helgesson
82daa41e29
cargo: install bash and zsh completion scripts 2020-06-27 21:21:43 +02:00
Jörg Thalheim
c94acd8131
Merge pull request from volth/cpan2nix-2020-06-20 2020-06-27 14:45:46 +01:00
volth
d6c5614def
Merge branch 'staging' into cpan2nix-2020-06-20 2020-06-27 10:41:56 +00:00
Michael Weiss
5efbf76d61
libva: 2.7.1 -> 2.8.0 2020-06-26 15:11:22 +02:00
Frederik Rietdijk
fe9a096f46 Merge staging-next into staging 2020-06-25 20:36:08 +02:00
Frederik Rietdijk
b4a880427e Merge master into staging-next 2020-06-25 20:35:43 +02:00
Frederik Rietdijk
679136e252 Merge staging-next into staging 2020-06-25 20:35:19 +02:00
Maximilian Bosch
7a3be96614
Merge pull request from Frostman/grafana-7.0.4
grafana: 7.0.3 -> 7.0.4
2020-06-25 20:27:44 +02:00
Maximilian Bosch
33f65a5b39
Merge pull request from sikmir/st
st: 0.8.3 -> 0.8.4
2020-06-25 20:16:33 +02:00
Nikolay Korotkiy
15457dc5b8
st: 0.8.3 -> 0.8.4 2020-06-25 20:56:41 +03:00
Daniël de Kok
6b096983f4
Merge pull request from zookatron/sublime-merge
sublime-merge: askpass bug fix
2020-06-25 19:54:14 +02:00
markuskowa
4c50207ceb
Merge pull request from Emantor/topic/glxinfo_eglinfo
glxinfo: add eglinfo binary
2020-06-25 19:42:42 +02:00
Maximilian Bosch
860c5ca4a7
Merge pull request from ckauhaus/secfix-php
php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
2020-06-25 19:28:36 +02:00
Sergey Lukjanov
cb60553664 grafana: 7.0.3 -> 7.0.4 2020-06-25 10:18:25 -07:00
Maximilian Bosch
3232fd93f1
Merge pull request from Frostman/hugo-0.73.0
hugo: 0.72.0 -> 0.73.0
2020-06-25 19:09:39 +02:00
Tim Zook
228cd7fbd7 sublime-merge-dev: 2011 -> 2022 2020-06-25 12:06:31 -05:00
Maximilian Bosch
30e812c6c0
php7{2,3}: intl: fix aarch64 build 2020-06-25 18:27:57 +02:00
Matt Layher
8a3547afe9 maintainers/teams: add mdlayher to golang team
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2020-06-26 01:14:07 +10:00
Anderson Torres
435963c963
Merge pull request from AndersonTorres/create-ytree
ytree: init at 2.02
2020-06-25 12:08:18 -03:00
Dmitry Kalinkin
6488b9670d
Merge pull request from eadwu/nvidia_x11/2020.06
nvidia_x11: 2020.06
2020-06-25 10:58:47 -04:00
Michael Weiss
4dd1dd5623
jekyll: 4.1.0 -> 4.1.1 2020-06-25 16:48:52 +02:00
Tim Steinbach
06f0a0fc27
linux: 5.7.5 -> 5.7.6 2020-06-25 10:30:22 -04:00
Tim Steinbach
5d807cc8d7
linux: 5.4.48 -> 5.4.49 2020-06-25 10:30:17 -04:00
Jörg Thalheim
d7361d7680
Merge pull request from Mic92/gcc-latest 2020-06-25 15:10:07 +01:00
Christian Kauhaus
1d805c99bd php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
Point releases contain several security updates and bugfixes.

Changelog: https://www.php.net/ChangeLog-7.php#7.4.7

Fixes 
2020-06-25 15:41:31 +02:00
Daniël de Kok
80b6b9b706
Merge pull request from Flakebi/amdvlk
amdvlk: init at 2020.Q2.5
2020-06-25 15:17:52 +02:00
Sergey Lukjanov
dcd48593e8 hugo: 0.72.0 -> 0.73.0 2020-06-25 06:03:40 -07:00
adisbladis
37aab787f5
firefox-devedition-bin: 77.0b7 -> 78.0b9 2020-06-25 14:47:10 +02:00
adisbladis
5f057dd755
firefox-beta-bin: 78.0b2 -> 78.0b9 2020-06-25 14:47:09 +02:00
Jörg Thalheim
de35d8cdaa
gcc_latest: add alias
Our gcc version often lacks behind the latest supported version.
To get the latest possible gcc version with all optimization/checks,
this RFC adds an gcc_latest alias.
2020-06-25 13:07:16 +01:00
Frederik Rietdijk
bef20b38ef Merge master into staging-next 2020-06-25 13:48:05 +02:00
Sebastian Neubauer
3ff2165d4d amdvlk: init at 2020.Q2.5 2020-06-25 13:44:45 +02:00
Jörg Thalheim
d35735ae25
Merge pull request from Mic92/python-fixes 2020-06-25 12:34:45 +01:00
Jörg Thalheim
b422dd62ce
python3.pkgs.tempora: no longer compatible with python2 2020-06-25 12:27:54 +01:00
worldofpeace
bdb59380a3
Merge pull request from zowoq/desktop-validation
treewide: remove deprecated value `Application` from makeDesktopItem
2020-06-25 07:09:24 -04:00