Commit Graph

84784 Commits

Author SHA1 Message Date
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
Michele Guerini Rocco
661ebced1b
Merge pull request #93137 from rnhmjoj/uncertain
uncertainties: 3.1.2 -> 3.1.4
2020-07-15 09:19:58 +02:00
Mario Rodas
2c97056db4
Merge pull request #93129 from r-ryantm/auto-update/python2.7-python-dotenv
python27Packages.python-dotenv: 0.13.0 -> 0.14.0
2020-07-14 17:43:42 -05:00
Dmitry Kalinkin
25d3591fd1
ujson: version 3.0.0 requires python 3.5+ 2020-07-14 17:51:08 -04:00
Dmitry Kalinkin
a4c7c2ab30
Merge pull request #92295 from avnik/wine-update
Wine update: 5.11 -> 5.12
2020-07-14 16:35:23 -04:00
R. RyanTM
a794977af3 alembic: 1.7.12 -> 1.7.13 2020-07-14 16:32:56 -04:00
R. RyanTM
30adb1013c python37Packages.azure-core: 1.6.0 -> 1.7.0 2020-07-14 12:31:29 -07:00
rnhmjoj
5718d1927b
uncertainties: 3.1.2 -> 3.1.4 2020-07-14 20:46:47 +02:00
Ryan Mulligan
e72a18da0f
Merge pull request #93054 from r-ryantm/auto-update/intel-media-sdk
intel-media-sdk: 20.1.1 -> 20.2.0
2020-07-14 11:36:02 -07:00
Florian Klink
b0a107335a
Merge pull request #91359 from oxalica/rust-analyzer
rust-analyzer: 2020-06-08 -> 2020-07-13, and fix version display
2020-07-14 18:03:39 +02:00
Thomas Tuegel
7a8bdde4e5
Merge pull request #91571 from NixOS/u/kde
kde-applications: 19.12.3 -> 20.04.1
2020-07-14 10:40:48 -05:00
Thomas Tuegel
ef0a601e13
kdsoap: fix meta attributes 2020-07-14 09:47:18 -05:00
adisbladis
e038a4363a
poetry2nix: 1.9.2 -> 1.10.0 2020-07-14 16:18:39 +02:00
Mario Rodas
e97fdce4e1
Merge pull request #93113 from david-sawatzke/easypdkprog-update
easypdkprog: 1.2 -> 1.3
2020-07-14 09:09:50 -05:00
Mario Rodas
b79571808c
Merge pull request #92991 from r-ryantm/auto-update/openimagedenoise
openimagedenoise: 1.2.1 -> 1.2.2
2020-07-14 09:03:13 -05:00
Mario Rodas
9932552651
Merge pull request #92889 from r-ryantm/auto-update/python2.7-Wand
python27Packages.Wand: 0.6.1 -> 0.6.2
2020-07-14 08:57:58 -05:00
oxalica
26de7b3711
rust-analyzer: disable install check due to #93119 2020-07-14 21:51:50 +08:00
Mario Rodas
3dea1f2f48
Merge pull request #93106 from 06kellyjac/deno_1.2.0
deno: 1.1.3 -> 1.2.0
2020-07-14 08:50:53 -05:00
R. RyanTM
939d26675b python27Packages.python-dotenv: 0.13.0 -> 0.14.0 2020-07-14 13:05:59 +00:00
Georges Dubus
249a368cd7
Merge pull request #87738 from cw789/erlang_update
erlangR23: init at 23.0.2
2020-07-14 14:50:53 +02:00
David Sawatzke
705dbe002d easypdkprog: 1.2 -> 1.3 2020-07-14 14:25:50 +02:00
oxalica
ddacdbc953
rust-analyzer: fix version display and add check 2020-07-14 20:15:55 +08:00
oxalica
c90e6dd06d
rust-analyzer: 2020-06-08 -> 2020-07-13 2020-07-14 20:15:55 +08:00
06kellyjac
1470516da6 deno: 1.1.3 -> 1.2.0 2020-07-14 11:25:24 +00:00
oxalica
1cb300ac2a
rust-analyzer: fix update script and avoid updating nodePackages if possible 2020-07-14 19:02:04 +08:00
Jörg Thalheim
1facbd61b1
Merge pull request #92830 from raboof/nixpkgs-mastodon-bot-init-at-1.0.2 2020-07-14 11:56:20 +01:00
Daniël de Kok
efdbbb02eb
Merge pull request #93065 from r-ryantm/auto-update/libslirp
libslirp: 4.3.0 -> 4.3.1
2020-07-14 06:57:00 +02:00
Ryan Mulligan
6faba433b2
Merge pull request #84973 from glittershark/init-aadict
pythonPackages.{aadict,,globre,pxml}: init at 0.2.3, 0.1.5, 0.2.13 respectively
2020-07-13 20:35:48 -07:00
Ryan Mulligan
c6e7f26bea
Merge pull request #92985 from r-ryantm/auto-update/librealsense
librealsense: 2.35.2 -> 2.36.0
2020-07-13 18:55:16 -07:00
Timo Kaufmann
be4f99d16b
Merge pull request #92697 from xaverdh/jab
jabcode: init at git-2020-05-13
2020-07-14 00:15:14 +02:00
Dominik Xaver Hörl
18ce5dbba4 jabcode: init at git-2020-05-13 2020-07-13 23:26:09 +02:00
Jonas Schievink
720a9358dd nrfutil: 5.2 -> 6.1 2020-07-13 23:25:43 +02:00
Jonas Schievink
d82b7b8690 pc-ble-driver-py: 0.11.4 -> 0.14.2 2020-07-13 23:25:43 +02:00
Jonas Schievink
e1a1b974ed pc-ble-driver: init at 4.1.1
It's a dependency of pc-ble-driver-py, but it's no longer built
alongside it.
2020-07-13 23:25:26 +02:00
Maximilian Bosch
5f44782db4
Merge pull request #93078 from jonringer/expose-yamllint
yamllint: add top-level attribute
2020-07-13 22:52:06 +02:00
Maximilian Bosch
514afd26bc
rustracer: 2.1.30 -> 2.1.33, fix build
ChangeLog: https://github.com/racer-rust/racer/blob/v2.1.33/CHANGELOG.md#2132
Broken build: https://hydra.nixos.org/build/123837796

Please note that I intentionally didn't bump to `2.1.35` since it
requires nightly features. `2.1.33` is the latest version which supports
our current `rustc`-version (1.44.1) on nixpkgs `master`.

Closes #89481
2020-07-13 22:46:22 +02:00
Michael Weiss
aa166e7703
python3Packages.mysql-connector: 8.0.20 -> 8.0.21 2020-07-13 22:41:10 +02:00
Florian Klink
20be1467ed
Merge pull request #93067 from Luflosi/nextpnr-fix-macos
nextpnr: fix build on macOS
2020-07-13 22:17:49 +02:00
Sirio Balmelli
1666b03bf7 python3Packages.biplist: init at 1.0.3
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2020-07-13 12:04:45 -07:00
Sirio Balmelli
1e529449e8 python3Packages.mac_alias: init at 2.0.7
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2020-07-13 12:03:17 -07:00
Drew Risinger
7e8d919787 python3Packages.pygogo: init at 0.13.2 2020-07-13 11:13:03 -07:00
Drew Risinger
c8e496ecc5 pythonPackages.pkutils: init at 1.1.1 2020-07-13 11:13:03 -07:00
Jonathan Ringer
dda3d9dc12 ovito: mark broken
```
    Add the installation prefix of "Qt5Core" to CMAKE_PREFIX_PATH or set
    "Qt5Core_DIR" to a directory containing one of the above files.  If
    "Qt5Core" provides a separate development package or SDK, be sure it has
    been installed.
```
2020-07-13 11:05:44 -07:00
Jonathan Ringer
2ff62aa34f
python3Packages.yamllint: add joringer as maintainer 2020-07-13 10:49:32 -07:00
Thomas Tuegel
3a732bb263
kdsoap: init at 1.9.0 2020-07-13 12:38:02 -05:00
Thomas Tuegel
2855e9b77f
kcmutils: remove obsolete patch 2020-07-13 11:26:47 -05:00
Maximilian Bosch
ad2fc0b16d
Merge pull request #93068 from Luflosi/batinfo-linux-only
batinfo: limit build to Linux
2020-07-13 17:53:58 +02:00
Daniel Șerbănescu
8958237f38 gtk-sharp3: fixed build and removed broken flag. 2020-07-13 16:27:37 +02:00
Luflosi
97c8c99f1d
batinfo: limit build to Linux
According to the README of batinfo, it runs only on Linux-based operating systems.
2020-07-13 15:58:13 +02:00
Daniël de Kok
9730290b77
Merge pull request #92939 from RaghavSood/mage/1.10.0
mage: 1.9.0 -> 1.10.0
2020-07-13 15:56:40 +02:00