Commit Graph

12275 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
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
adisbladis
e038a4363a
poetry2nix: 1.9.2 -> 1.10.0 2020-07-14 16:18:39 +02:00
oxalica
26de7b3711
rust-analyzer: disable install check due to #93119 2020-07-14 21:51:50 +08: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
oxalica
1cb300ac2a
rust-analyzer: fix update script and avoid updating nodePackages if possible 2020-07-14 19:02:04 +08:00
Jonas Schievink
720a9358dd nrfutil: 5.2 -> 6.1 2020-07-13 23:25:43 +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
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
Vladimír Čunát
377324ca6d
Merge branch 'staging-next' (PR #91090) 2020-07-13 07:13:56 +02:00
Maximilian Bosch
e072276cf2
Merge pull request #93015 from equirosa/lazygit
lazygit: 0.20.5 -> 0.20.6
2020-07-12 23:37:50 +02:00
markuskowa
8a48fe1682
Merge pull request #92815 from ck3d/add-redo-c
redo-c: Init at 0.2
2020-07-12 23:07:30 +02:00
Eduardo Quiros
6c70cee85a lazygit: 0.20.5 -> 0.20.6
new version released with some improvements and a couple fixes:
https://github.com/jesseduffield/lazygit/releases/tag/v0.20.6
2020-07-12 11:50:04 -06:00
Oleksii Filonenko
a2e8547c36
Merge pull request #92913 from equirosa/lazygit
lazygit: 0.20.4 -> 0.20.5
2020-07-12 12:37:10 +03:00
Daniël de Kok
4c40111f1d maturin: 0.8.1 -> 0.8.2
The changelog is not updated, so this has to do:

https://github.com/PyO3/maturin/compare/v0.8.1...v0.8.2
2020-07-12 07:26:44 +02:00
Daniël de Kok
e8d7851e00
Merge pull request #92943 from minijackson/cargo-inspect-0.10.3
cargo-inspect: 0.10.1 -> 0.10.3
2020-07-11 20:09:27 +02:00
Minijackson
ca343e5398
cargo-inspect: 0.10.1 -> 0.10.3 2020-07-11 18:26:40 +02:00
Raghav Sood
881c92f68f
mage: 1.9.0 -> 1.10.0 2020-07-11 16:06:12 +00:00
Eduardo Quiros
40f4cbbd7c lazygit: 0.20.4 -> 0.20.5
new version released with a small improvement
https://github.com/jesseduffield/lazygit/releases/tag/v0.20.5
2020-07-11 02:10:54 -06:00
Frederik Rietdijk
ae8eee9c3f Merge master into staging-next 2020-07-11 08:59:54 +02:00
Mario Rodas
c87c474b17
Merge pull request #92901 from r-ryantm/auto-update/rustup
rustup: 1.21.1 -> 1.22.1
2020-07-10 22:32:18 -05:00
R. RyanTM
0d68512749 rustup: 1.21.1 -> 1.22.1 2020-07-11 01:11:05 +00:00
Silvan Mosberger
75ee18766a
yarn2nix: Don't pass yarnNix to mkDerivation (#92856)
The generated yarnNix file doesn't need to be part of the mkDerivation.
And doing so prevents other platforms from reproducibly instantiating
it. With this change you can e.g. do

  darwinPkgs.yarn2nix.mkYarnPackage {
    # ...
    yarnNix = pkgs.yarn2nix.mkYarnNix {
      yarnLock = ./yarn.lock;
    };
  }

Which is a darwin derivation, but can still be instantiated reproducibly on Linux.
2020-07-10 16:24:03 +00:00
Jörg Thalheim
33b5621ef6
Merge pull request #92794 from dguibert/dg/cross-texinfo-interactive 2020-07-10 07:28:39 +01:00
David Guibert
b92c2c666c
Update cross-tools-flags.patch 2020-07-10 08:07:35 +02:00
Christian Kögler
30a2f40336 redo-c: Initial 0.2 2020-07-10 00:48:57 +02:00
David Guibert
a2eb391e8f fix pkgsCross.*.texinfoInteractive
This fixes #86166 to build cross compilied texinfoInteractive.
BUILD_CC has been renamed to CC_FOR_BUILD so the patch needs to applied
this renaming.

tested on: pkgsCross.armv7l-hf-multiplatform.texinfoInteractive
2020-07-09 17:19:09 +02:00
Austin Seipp
e494368606
trellis: 2020.06.12 -> 2020.06.29
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-09 09:12:42 -05:00
Austin Seipp
f22c718e17
icestorm: 2020.04.22 -> 2020.07.08
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-09 09:12:42 -05:00
Mario Rodas
61f57d850e
Merge pull request #92729 from r-ryantm/auto-update/tfsec
tfsec: 0.21.0 -> 0.23.2
2020-07-08 19:10:11 -05:00
Mario Rodas
aa5ee82db2
tfsec: add ldflags 2020-07-08 18:55:18 -05:00
Ryan Mulligan
f2ff245bfd
Merge pull request #92730 from r-ryantm/auto-update/the-way
the-way: 0.3.2 -> 0.4.0
2020-07-08 11:54:47 -07:00
R. RyanTM
b9d29dad13 the-way: 0.3.2 -> 0.4.0 2020-07-08 16:58:51 +00:00
R. RyanTM
4b0ab3f2a4 tfsec: 0.21.0 -> 0.23.2 2020-07-08 16:49:39 +00:00
Mario Rodas
9b2a1ea654
Merge pull request #92688 from r-ryantm/auto-update/golangci-lint
golangci-lint: 1.27.0 -> 1.28.1
2020-07-08 07:52:39 -05:00
Daniël de Kok
d915b7223a
Merge pull request #92657 from CRTified/pkg/cc-tool
cc-tool: Init at unstable-2020-05-19
2020-07-08 14:16:30 +02:00
CRTified
cc1fadf581 cc-tool: init at unstable-2020-05-19 2020-07-08 13:30:53 +02:00
Mario Rodas
27ac9620c6 golangci-lint: update meta 2020-07-08 04:22:00 -05:00
Mario Rodas
4568f9bfb1 golangci-lint: add ldflags 2020-07-08 04:21:00 -05:00
Mario Rodas
c94a2de710 golangci-lint: install completions 2020-07-08 04:20:00 -05:00
R. RyanTM
bf76f25248 golangci-lint: 1.27.0 -> 1.28.1 2020-07-08 06:42:40 +00:00
Mario Rodas
b25895d964
Merge pull request #92647 from r-ryantm/auto-update/webdis
webdis: 0.1.10 -> 0.1.11
2020-07-07 19:34:33 -05:00
Mario Rodas
a6fad046a8
Merge pull request #92555 from r-ryantm/auto-update/redo-apenwarr
redo-apenwarr: 0.42a -> 0.42c
2020-07-07 19:33:19 -05:00
Timo Kaufmann
c6e47d5763
Merge pull request #78451 from arnarg/adding-operator-sdk
operator-sdk: init at 0.18.2
2020-07-07 23:41:30 +02:00
R. RyanTM
20f4914bf5 webdis: 0.1.10 -> 0.1.11 2020-07-07 21:31:50 +00:00
Arnar Gauti Ingason
5458f54a83 operator-sdk: init at 0.18.2
Operator-sdk is a cli tool for scaffolding and building Kubernetes
operators.
2020-07-07 21:13:26 +02:00
MetaDark
832a240b12 cmake-language-server: build with pygls 0.9.x 2020-07-07 10:33:26 -07:00
R. RyanTM
ed9f1b36b3 mill: 0.7.3 -> 0.7.4 2020-07-07 10:04:15 -07:00