Commit Graph
248667 Commits
Author SHA1 Message Date
zowoq 9198310fc6 kepubify: 3.1.3 -> 3.1.4 2020-07-16 14:12:00 +10:00
Dmitry Kalinkin a598665c4c motion: add meta.platforms 2020-07-15 23:48:07 -04:00
Dmitry Kalinkin f84294c787 motion: switch ffmpeg_3 to ffmpeg 2020-07-15 23:47:54 -04:00
Dmitry Kalinkin 7dd1a199db motion: 4.3.0 -> 4.3.1 2020-07-15 23:47:20 -04:00
zowoq ea3d6dddd8 go_1_13: 1.13.12 -> 1.13.13 2020-07-16 13:00:58 +10:00
Jan Tojnar d49b38b73c Merge pull request #92715 from jtojnar/fix-libinput-commands 2020-07-16 04:58:38 +02:00
zowoq 3bfa73bbe8 go_1_15: go: only set CC when cross-compiling
81a8b76b3a
2020-07-16 12:50:33 +10: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`]: https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a
[`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]: https://github.com/Kitware/CMake/blob/92e30d576d66ac05254bba0f0ff7d655947beb0f/Modules/GNUInstallDirs.cmake#L298-L299
2020-07-16 04:38:07 +02:00
R. RyanTM 466562c3e0 cargo-expand: 0.6.0 -> 0.6.4 2020-07-16 02:38:04 +00: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
Patrick Gaskin 752ea30951 kepubify: Update my GitHub username 2020-07-16 12:26:11 +10:00
Dmitry Kalinkin e8cf168c80 Merge branch 'master' into staging-next 2020-07-15 22:23:51 -04:00
zowoq db5bf52c7c podman: update repo 2020-07-16 12:21:46 +10:00
zowoq 3f322a8732 crun: 0.14 -> 0.14.1 2020-07-16 12:18:25 +10: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
zowoq 34ee9bfe7c conmon: 2.0.18 -> 2.0.19 2020-07-16 12:12:34 +10:00
zowoq 1b84dbfdd9 slirp4netns: 1.1.2 -> 1.1.4 2020-07-16 12:12:19 +10:00
Dmitry Kalinkin c184c87571 pythonPackages.numexpr: fix darwin build by refactoring checkPhase
This fixes a following error on python 3.8:

FileNotFoundError: [Errno 2] No such file or directory: '/nix/store/0s7kw66pav5c7bi38lb0gznxnxz31a1n-python3.8-numexpr-2.7.1/<stdin>'
2020-07-15 22:11:43 -04:00
zowoq 805f7676bc Revert "nixos/podman: use cgroupfs for rootless crun test"
This reverts commit 033ba9c73d.
2020-07-16 12:11:09 +10:00
R. RyanTM 4484ee57f9 bdf2sfd: 1.1.2 -> 1.1.3 2020-07-16 01:47:17 +00: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
R. RyanTM f16d6a7304 antibody: 6.0.1 -> 6.1.0 2020-07-16 01:11:42 +00: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
claudiiii a705201e1d element-desktop, element-web: init at 1.7.0 2020-07-15 22:39:34 +02:00
Vladyslav M 6eefefe1aa elvish: 0.13.1 -> 0.14.0 2020-07-15 23:09:10 +03:00
Milan Pässler 1a5f3d133d Revert "nixos/jicofo: use ExecStart instead of script"
This reverts commit d3a26a5ecd.
Using ServiceConfig.ExecStart instead of script lead to the content not
being executed in a shell anymore, which broke the secrets being read
from a file and passed as a command line parameter.
2020-07-15 21:41:29 +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
Thomas Tuegel ee036bc025 krunner: upstream patch for deprecated virtual method 2020-07-15 13:54:44 -05:00
Thomas Tuegel f0d158fd88 kdeFrameworks: set version attribute 2020-07-15 13:54:26 -05:00
Robert Scott ede2e00c9f cpython: expose gdb libpython.py
used together with cpython's debugging symbols, this allows inspection of
the python stack of cpython programs in gdb. this file is a little
different from the rest of the python output by this package, in that it's
not intended to be run by the current python being built, instead by the
python being used by the gdb in question, which could be very different.
therefore placed in its own, but hopefully logical & predictable location.
2020-07-15 19:39:19 +01: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