Commit graph

235079 commits

Author SHA1 Message Date
Michael Weiss 5b14758d31
Merge pull request #92920 from primeos/scons
scons: 3.1.2 -> 4.0.0
2020-07-18 13:36:29 +02:00
Michael Weiss 595a36d846
scons.py2: Replace with sconsPackages.scons_3_1_2
Required since SCons 4.0.0 doesn't support Python 2.7 anymore.
2020-07-18 10:48:20 +02:00
Michael Weiss d41cd156d0
scons: 3.1.2 -> 4.0.0 2020-07-18 10:48:13 +02:00
Alyssa Ross e33bed77ce rust: 1.44.1 -> 1.45.0
Thunderbird and Firefox don't build with 1.45.
2020-07-18 05:18:49 +00:00
Jan Tojnar 7dff6d6681
Merge pull request #93166 from jtojnar/cmake-docdir 2020-07-18 06:51:29 +02:00
Florian Klink ab1cbc8515
Merge pull request #91746 from helsinki-systems/upd/nss-3.54
nss: 3.52.1 -> 3.54
2020-07-18 00:01:10 +02:00
Jörg Thalheim b595268537
Merge pull request #87239 from Izorkin/ruby-soname
ruby: fix soname tag
2020-07-17 19:27:45 +01:00
worldofpeace 7d51e48d2f
Merge pull request #93300 from worldofpeace/update-gtk3
gtk3: 3.24.20 -> 3.24.21
2020-07-17 13:34:44 -04:00
zowoq 4c99c5543c go: 1.14.5 -> 1.14.6 2020-07-17 16:17:36 +10:00
Mario Rodas 64b23199ba
Merge pull request #93221 from r-ryantm/auto-update/fly
fly: 6.3.0 -> 6.4.0
2020-07-16 21:48:57 -05:00
Mario Rodas 7c58c7e0a5
Merge pull request #93220 from r-ryantm/auto-update/fluent-bit
fluent-bit: 1.4.6 -> 1.5.0
2020-07-16 21:46:56 -05:00
zowoq 916bc99f2c ffmpeg: 4.3 -> 4.3.1 2020-07-17 09:28:45 +10:00
zowoq 88c720f0bf ffmpeg_3_4: 3.4.7 -> 3.4.8 2020-07-17 09:28:45 +10:00
zowoq 92cfd28d2b ffmpeg_2_8: 2.8.16 -> 2.8.17 2020-07-17 09:28:45 +10:00
zowoq af1b0c92ad go: 1.14.4 -> 1.14.5 2020-07-17 09:28:19 +10:00
Florian Klink ba20bc872f
Merge pull request #93128 from Ma27/fix-rust-build-flags
rust: Fix build flags
2020-07-16 12:47:26 +02:00
R. RyanTM 1e816defe7 fly: 6.3.0 -> 6.4.0 2020-07-16 04:42:06 +00:00
R. RyanTM ab0171b08d fluent-bit: 1.4.6 -> 1.5.0 2020-07-16 04:37:54 +00:00
Jan Tojnar d49b38b73c
Merge pull request #92715 from jtojnar/fix-libinput-commands 2020-07-16 04:58:38 +02:00
Jan Tojnar 812d124fbc
Revert "darktable: Remove $out/share/doc"
This reverts commit 5d7cbc659e.
2020-07-16 04:38:08 +02:00
Jan Tojnar 2596c96f87
Revert "transmission: Remove $out/share/doc"
This reverts commit 25bc56fcb8.
2020-07-16 04:38:08 +02:00
Jan Tojnar 75fdc1ced6
cmake.setupHook: define shareDocName
The docdir flag needs to include `PROJECT_NAME` according to [GNU guidelines]. We are passing
`-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}` but `$shareDocName` was unset.

The `multiple-outputs.sh` setup hook actually only defines `shareDocName` as a local variable
so it was not available for cmake setup hook. Making it global would be of limited usability,
since it primarily tries to extract the project name from configure script.
Additionally, it would not be set because the setup hook defines `setOutputFlags=`,
preventing the function defining `shareDocName` from running. And lastly, the function
would not run for single-output derivations.

Previously, we tried [not disabling `setOutputFlags`] and passing the directory flags
only for multi-output derivations that do not disable `setOutputFlags` but that meant having
two different branches of code, making it harder to check correctness. The multi-output
one did in fact not work due to aforementioned undefined `shareDocName`. It also broke
derivations that set `setOutputFlags=` like [`qtModule` function does] (probably
because some Qt modules have configure scripts incompatible with `configureFlags` defined
by `multiple-outputs.sh` setup hook). For that reason, it was [reverted], putting us back to start.

Let’s try to extract the project name from CMake in the cmake setup hook.

CMake has a `-L` flag for dumping variables but `PROJECT_NAME` did not seem to be among them
when I tested, so I had to resort to parsing the `CMakeLists.txt` file.

The extraction function is limited, it does not deal with

* project name on different line from the `project(` command opening
    - that will just not get matched so we will fall back to
      using the derivation name
* variable interpolation
    - we will just fall back to using derivation name when the extracted
      `project_name` contains a dollar character
* multiple [`project`] commands
    - The command sets `PROJECT_NAME` variable anew with each call, so the
      last `project` call before `include(GNUInstallDirs)` command will be used
      when the included module would [cache the `CMAKE_INSTALL_DOCDIR` variable].
      We will just take the first discovered `project` command for simplicity.
      Hopefully, there are not many projects that use multiple `project` calls
      before including `GNUInstallDirs`.

In either case, we will have some subdirectory so the conflicts will be minimized.

[GNU guidelines]: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html#index-docdir
[not disabling `setOutputFlags`]: be1b22538a
[`qtModule` function  does]: https://github.com/NixOS/nixpkgs/pull/12740
[reverted]: https://github.com/NixOS/nixpkgs/pull/92298
[`PROJECT_NAME`]: https://cmake.org/cmake/help/v3.18/variable/PROJECT_NAME.html
[`project`]: https://cmake.org/cmake/help/v3.18/command/project.html
[cache the `CMAKE_INSTALL_DOCDIR` variable]: 92e30d576d/Modules/GNUInstallDirs.cmake (L298-L299)
2020-07-16 04:38:07 +02:00
Dmitry Kalinkin 166a71a6ae
arrow-cpp: fix eval, enable linking against zstd_shared
This is a second part for #93203.
2020-07-15 22:36:07 -04:00
Dmitry Kalinkin 9173beb67d
Merge branch 'staging-next' into staging 2020-07-15 22:28:18 -04:00
Dmitry Kalinkin e8cf168c80
Merge branch 'master' into staging-next 2020-07-15 22:23:51 -04:00
Dmitry Kalinkin 992db90c4c
Merge pull request #93203 from veprbl/pr/arrow-cpp_zstd_link_static
arrow-cpp: fix darwin build by linking against libzstd_static
2020-07-15 22:15:43 -04:00
Mario Rodas 178de8429d
Merge pull request #92802 from misuzu/rednose-macos
pythonPackages.rednose: fix build on macOS
2020-07-15 20:24:47 -05:00
R. RyanTM bc241042f9 python27Packages.kazoo: 2.7.0 -> 2.8.0 2020-07-15 18:13:39 -07:00
R. RyanTM 8fb0db8474 python27Packages.pytelegrambotapi: 3.7.1 -> 3.7.2 2020-07-15 18:13:00 -07:00
Cassidy Dingenskirchen 6d44f37c94 pythonPackages.discordpy: 1.3.3 -> 1.3.4 2020-07-15 18:12:43 -07:00
Daniël de Kok 777bcfd337 python3Packages.spacy: 2.3.1 -> 2.3.2
Changelog:

https://github.com/explosion/spaCy/releases/tag/v2.3.2
2020-07-15 18:10:31 -07:00
R. RyanTM a466225b57 python27Packages.wurlitzer: 2.0.0 -> 2.0.1 2020-07-15 18:05:57 -07:00
R. RyanTM 285a93d89b python37Packages.python3-openid: 3.1.0 -> 3.2.0 2020-07-15 18:04:11 -07:00
R. RyanTM 3f909b6a17 python27Packages.uamqp: 1.2.8 -> 1.2.9 2020-07-15 18:02:10 -07:00
Lancelot SIX 9db754433c pythonPackages.django: 2.2.13 -> 2.2.14
See https://docs.djangoproject.com/en/2.2/releases/2.2.14/ for release
information
2020-07-15 17:46:21 -07:00
Lancelot SIX cfdf467458 python3Packages.celery: 4.4.4 -> 4.4.6 2020-07-15 17:42:12 -07:00
Nikolay Korotkiy af9aa5af7c python3Packages.gpxpy: 1.3.5 -> 1.4.2 2020-07-15 17:23:05 -07:00
Jonathan Ringer a83d217703 onnxruntime: enable lto 2020-07-15 17:09:30 -07:00
Dmitry Kalinkin 4ae8a4977b
arrow-cpp: fix darwin build by linking against libzstd_static
The enableShared=false override will need to be reverted on staging.
2020-07-15 19:45:22 -04:00
Nikolay Korotkiy 4af55b773f
routino: enable on darwin (#93085) 2020-07-16 00:38:40 +02:00
worldofpeace 80a3c332a4 gtk3: 3.24.20 -> 3.24.21 2020-07-15 15:31:24 -04:00
Martin Weinelt b314827afd
Merge pull request #93184 from mvnetbiz/hass-pychromecast
home-assistant: pin PyChromecast
2020-07-15 21:26:47 +02:00
Maximilian Bosch d2694d936e
rustPlatform: don't install artifacts modified by checkPhase
While the artifacts from `buildPhase` should be used for testing as
well, it should be avoided that those are modified during `checkPhase`.

This can happen if a package is built e.g. with special
`cargoBuildFlags` that don't apply to the `checkPhase`. In that case, a
binary would be installed into `$out` without those flags since
`checkPhase` overrides the binary in the `target`-directory.

This patch copies the state of `target/release` into a temporary
location at the end of the `buildPhase` and installs the results from
that temporary directory into `$out` while `checkPhase` can continue
using the configured build-dir.

cc #91689
Closes #93119
Closes #91191
2020-07-15 20:08:30 +02:00
Alyssa Ross 7d0f8355b3 bitlbee-mastodon: 1.4.3 -> 1.4.4 2020-07-15 18:02:57 +00:00
Alyssa Ross 66bccac913 bitlbee: propagate glib dependency
bitlbee.pc requires glib, so all packages that depend on bitlbee will
also depend on glib.
2020-07-15 18:02:23 +00:00
Timo Kaufmann e3acb2485a
Merge pull request #90061 from mcbeth/spigot
spigot: init at 20200101
2020-07-15 19:31:02 +02:00
ajs124 487373fb2c nss: 3.52.1 -> 3.54 2020-07-15 19:08:51 +02:00
Jeffrey McBeth a15778c1e0 spigot: init at 20200101 2020-07-15 12:58:51 -04:00
Daniël de Kok d2754e07bb
Merge pull request #92914 from danieldk/rocm-opencl
rocm-opencl-icd: init at 3.5.0
2020-07-15 18:55:53 +02:00
Daniël de Kok 43d57ad350
Merge pull request #93183 from edibopp/oneshot-update
oneshot: 1.1.0 → 1.1.3
2020-07-15 17:40:09 +02:00