Commit Graph

234908 Commits

Author SHA1 Message Date
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
Jan Tojnar
5788f7173e
Merge branch 'master' into staging-next 2020-07-15 09:25:28 +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
dc1c3f3203
Merge pull request #93120 from marsam/update-kbs2
kbs2: 0.1.1 -> 0.1.2
2020-07-14 17:44:52 -05: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
Mario Rodas
c08ef800bb
Merge pull request #93143 from tobim/mpd/0.21.25
mpd: 0.21.23 -> 0.21.25
2020-07-14 17:40:04 -05:00
José Romildo Malaquias
50de229ca5
Merge pull request #92671 from r-ryantm/auto-update/yaru
yaru-theme: 20.04.7 -> 20.10.1
2020-07-14 19:16:52 -03:00
Dmitry Kalinkin
25d3591fd1
ujson: version 3.0.0 requires python 3.5+ 2020-07-14 17:51:08 -04:00
Maximilian Bosch
f0cfc7eba9
Merge pull request #92954 from etu/composer-update
php.packages.composer: 1.10.6 -> 1.10.8
2020-07-14 23:31:54 +02:00
José Romildo Malaquias
6b18a48255
Merge pull request #92541 from r-ryantm/auto-update/qt5ct
qt5ct: 0.41 -> 1.0
2020-07-14 18:16:51 -03:00
Michele Guerini Rocco
406e29d427
Merge pull request #93135 from claudiiii/update-riot-web
riot-web: 1.6.7 -> 1.6.8
2020-07-14 22:55:55 +02:00
Michele Guerini Rocco
4a2749b089
Merge pull request #93138 from rnhmjoj/bdf2psf
bdf2psf: 1.195 -> 1.196
2020-07-14 22:42:16 +02: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
adisbladis
25bc56fcb8
transmission: Remove $out/share/doc
This is a very common path that often collides with other packages.
2020-07-14 22:03:14 +02:00
adisbladis
5d7cbc659e
darktable: Remove $out/share/doc
This is a very common path that often collides with other packages.
2020-07-14 22:03:14 +02:00
adisbladis
29c38efa84
firefox-bin: 78.0.1 -> 78.0.2 2020-07-14 22:03:14 +02:00
adisbladis
8b893ecde1
firefox-devedition-bin: 78.0b9 -> 79.0b7 2020-07-14 22:03:14 +02:00
adisbladis
e97bd70624
firefox-beta-bin: 79.0b2 -> 79.0b7 2020-07-14 22:03:14 +02:00
adisbladis
11acd8b30e
firefox-bin: Work around bug in upstream SHA sums files 2020-07-14 22:03:13 +02:00
adisbladis
f84cd5f8aa
firefox-bin: Switch to sha256 sums in update scripts
There is no extra security properties provided by sha512, they are
just bigger.
2020-07-14 22:03:01 +02:00
Tobias Mayer
292c914f03
mpd: 0.21.23 -> 0.21.25 2020-07-14 21:58:16 +02:00
Marek Mahut
87eb9e334a
Merge pull request #89668 from mmilata/lnd-0.10.1
lnd: 0.10.0 -> 0.10.3, enable same features as upstream
2020-07-14 21:54:44 +02:00
Marek Mahut
36ff726444
Merge pull request #92831 from fuwa0529/update-wownero
wownero: 0.8.0.0 -> 0.8.0.1
2020-07-14 21:51:19 +02:00
Marek Mahut
33d763deb1
Merge pull request #93132 from rnhmjoj/monero
monero: 0.16.0.0 -> 0.16.0.1
2020-07-14 21:50:11 +02:00
Graham Christensen
0c10b75288
Merge pull request #93110 from grahamc/systemd-executable
stage-2: parameterized systemd executable
2020-07-14 15:45:00 -04:00
R. RyanTM
30adb1013c python37Packages.azure-core: 1.6.0 -> 1.7.0 2020-07-14 12:31:29 -07:00
rnhmjoj
6eae3bc430
bdf2psf: 1.195 -> 1.196 2020-07-14 21:11:28 +02:00
rnhmjoj
5718d1927b
uncertainties: 3.1.2 -> 3.1.4 2020-07-14 20:46:47 +02:00
Florian Klink
e99389a942
Merge pull request #93001 from aanderse/gitolite
nixos/gitolite: provision data directory only before service begins
2020-07-14 20:40:35 +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
b6c53e3ac5
Merge pull request #92791 from johanot/ceph-15
ceph: 14.2.10 -> 15.2.4
2020-07-14 20:10:23 +02:00
Graham Christensen
64dd9c1d6a
stage-2: parameterized systemd executable
This lets users do sneaky things before systemd starts, and
permanently affect the environment in which systemd runs. For example,
we could start systemd in a non-default network namespace by setting
the systemdExecutable to a wrapper script containing:

    #!/bin/sh
    ip netns add virtual
    touch /var/run/netns/physical
    mount -o bind /proc/self/ns/net /var/run/netns/physical
    exec ip netns exec virtual systemd

_note: the above example does literally work, but there are unresolved
problems with udev and dhcp._
2020-07-14 13:18:14 -04:00
worldofpeace
97054ce880
Merge pull request #93089 from jtojnar/debug-gnome-tests
nixosTests.gnome3: enable debug mode
2020-07-14 12:43:56 -04:00
rnhmjoj
e39d0ad473
monero: 0.16.0.0 -> 0.16.0.1 2020-07-14 18:38:44 +02: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
adisbladis
abdb935291
Merge pull request #93124 from adisbladis/poetry2nix-1_10_0
poetry2nix: 1.9.2 -> 1.10.0
2020-07-14 17:15:02 +02: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
Matej Urbas
2f355e776b
pkgs.terraform: add terraform-provider-shell 1.6.0 (#93069) 2020-07-14 14:05:39 +00:00
Mario Rodas
3871c773ef
Merge pull request #92822 from r-ryantm/auto-update/opkg
opkg: 0.4.2 -> 0.4.3
2020-07-14 09:04:45 -05:00
Mario Rodas
10bc0f7b8f
Merge pull request #92835 from r-ryantm/auto-update/powerstat
powerstat: 0.02.23 -> 0.02.24
2020-07-14 09:03:34 -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
4dc95223ed
Merge pull request #92960 from r-ryantm/auto-update/vttest
vttest: 20200420 -> 20200610
2020-07-14 09:02:09 -05:00
Mario Rodas
ba2b0b4806
Merge pull request #92995 from r-ryantm/auto-update/pshs
pshs: 0.3.3 -> 0.3.4
2020-07-14 09:01:48 -05:00
Mario Rodas
7c534e5f44
Merge pull request #92898 from r-ryantm/auto-update/radarr
radarr: 0.2.0.1480 -> 0.2.0.1504
2020-07-14 08:59:57 -05:00
Mario Rodas
026a809387
Merge pull request #93093 from r-ryantm/auto-update/pmacct
pmacct: 1.7.3 -> 1.7.5
2020-07-14 08:58:14 -05:00