3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1865 commits

Author SHA1 Message Date
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
2020-07-29 18:20:56 -05:00
Matthew Bauer e36b1d4ad1
Merge pull request #94090 from sikmir/fix-cmake-hook
cmake: fix CMAKE_FIND_FRAMEWORK
2020-07-29 18:19:57 -05:00
Kevin Rauscher df6e489c4b Bloop: adapt derivation to darwin 2020-07-28 11:36:42 -07:00
Kevin Rauscher 147cab1ee5 Bloop: 1.4.1 -> 1.4.3 2020-07-28 11:36:42 -07:00
Karol Chmist 58f609160c Bloop: rework bloop packaging
* Include all completions
* Update derivation to make it similar to archlinux packaging
2020-07-28 11:36:42 -07:00
Karol Chmist 9a6386fd6f Bloop: 1.3.4 -> 1.4.1 2020-07-28 11:36:42 -07:00
Nikolay Korotkiy b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK 2020-07-28 19:05:43 +03:00
Michael Weiss b9de39c2a1
scons: 4.0.0 -> 4.0.1 (#93415) 2020-07-19 11:41:41 +02:00
Vladimír Čunát 4244b73917
Merge branch 'master' into staging 2020-07-18 17:50:23 +02:00
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 d41cd156d0
scons: 3.1.2 -> 4.0.0 2020-07-18 10:48:13 +02:00
Jan Tojnar 7dff6d6681
Merge pull request #93166 from jtojnar/cmake-docdir 2020-07-18 06:51:29 +02:00
Profpatsch 595afc2c3f bazel: use installShellCompletion for completions 2020-07-17 15:38:49 +02:00
Profpatsch a06fda4c5d bazel: add fish completions
bazel 3.3 adds a first version of completions for fish shell.

Tested manually whether fish is able to load the completions.
2020-07-17 15:38:49 +02:00
Profpatsch 2ba87b6e79 bazel: use install for completions
Preserving existing behavior: the bash completion was not executable,
the zsh completion was; according to lukegb the fish completion does
not have to be executable.
2020-07-17 15:38:49 +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
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 4ba7e9aa8e rocm-cmake: init at 3.5.0 2020-07-13 20:00:20 +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
Raghav Sood 881c92f68f
mage: 1.9.0 -> 1.10.0 2020-07-11 16:06:12 +00:00
Frederik Rietdijk ae8eee9c3f Merge master into staging-next 2020-07-11 08:59:54 +02:00
Christian Kögler 30a2f40336 redo-c: Initial 0.2 2020-07-10 00:48:57 +02: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
R. RyanTM ed9f1b36b3 mill: 0.7.3 -> 0.7.4 2020-07-07 10:04:15 -07:00
Mario Rodas 005b5770f4
redo-apenwarr: install bash completion 2020-07-07 04:20:00 -05:00
Mario Rodas a12ccb7f3e redo-apenwarr: update meta 2020-07-07 04:20:00 -05:00
R. RyanTM abe8394a5b redo-apenwarr: 0.42a -> 0.42c 2020-07-07 08:01:26 +00:00
Vladimír Čunát e978eb5986
gnumake42: bring this version back
This is almost a revert of commit 0cfe9f3a (PR #86293).  Version 4.3
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
brought some incompatibilities, so this will be useful for shorter-term
workarounds.
2020-07-06 10:55:32 +02:00
Jan Tojnar cfe7e12d38
Revert "cmake: only set output paths with multiple outputs"
This reverts commit be1b22538a.

The commit broke Qt modules using CMake because they disable setOutputFlags.

There is no need to have these flags limited to multiple output derivations since it
should just work. If it does not, it is a bug that should be fixed as per
https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path
Likewise, having a variable to disable passing the flags is also unnecessary,
since CMake, unlike some configure scripts, ignores unknown flags. And if a person
does not like the values, they can just override them by passing the offending
flag with a different value to cmakeFlags.
2020-07-05 19:01:53 +02:00
Jan Tojnar 4bca7dfb27
Merge branch 'master' into staging-next 2020-07-04 23:59:32 +02:00
Ludovic Claude 6eeb612a9b gradle: 5.6.4 -> 6.5.1
Co-authored-by: Daniël de Kok <me@github.danieldk.eu>
Use https for all urls
fix version for native library
pin gradle for jd-gui
2020-07-04 14:56:12 -07:00
Vladimír Čunát e1206a2129
Merge master into staging-next
This brings thousands of rebuilds.
Hydra nixpkgs: ?compare=1597944
2020-07-04 09:15:27 +02:00
R. RyanTM 2d6d3db7e2 bmake: 20200606 -> 20200629 2020-07-03 01:07:55 +00:00
Chuck 0cfe9f3ae2 gnumake: 4.2.1 -> 4.3 2020-07-02 17:44:47 +02:00
Frederik Rietdijk c33ca7c5ce Merge staging-next into staging 2020-07-02 17:14:53 +02:00
Claudio Bley cda852a528 bazel: 3.3.0 -> 3.3.1 2020-07-01 23:23:33 +02:00
Drew Risinger 2396eb646d conan: 1.25.0 -> 1.27.0
Switch to fetching source from GitHub vs PyPi, which will enable running
packaging tests in the future.
2020-07-01 12:45:39 -07:00
Drew Risinger ea5a79c4a3 conan: enable pythonPackages.six > 1.14.0 2020-07-01 12:45:39 -07:00
R. RyanTM 58cbd5ba85 sbt: 1.3.12 -> 1.3.13 2020-06-30 14:57:54 +00:00
Alyssa Ross be1b22538a cmake: only set output paths with multiple outputs
This brings cmake inline with the behaviour used for configure
scripts, defined in multiple-outputs.sh.  It's important because
that setup hook will only set shareDocName if multiple outputs are in
use (and setOutputFlags hasn't been disabled).  So previously,
CMAKE_INSTALL_DOCDIR would be set to $out/share/doc for single-output
derivations, instead of $out/share/doc/$shareDocName, which would
result in collisions.

Since this hook now uses the setOutputFlags variable, I had to remove
the empty assignment of it added in
a714284d8b.

Fixes: https://github.com/NixOS/nixpkgs/issues/82304
2020-06-29 13:56:27 +00:00
Frederik Rietdijk bef20b38ef Merge master into staging-next 2020-06-25 13:48:05 +02:00
Frederik Rietdijk 16287a8cb8 Merge master into staging-next 2020-06-24 19:04:03 +02:00
Claudio Bley 388038ff98 bazel-buildtools: 3.2.1 -> 3.3.0 2020-06-24 17:02:23 +02:00
Claudio Bley 21a21a4224 bazel: 3.2.0 -> 3.3.0 2020-06-23 15:29:38 +02:00
Frederik Rietdijk 9c5e7367d1 Merge master into staging-next 2020-06-20 07:38:17 +02:00
Ryan Mulligan be707e4cc5
Merge pull request #89644 from r-ryantm/auto-update/mill
mill: 0.7.1 -> 0.7.3
2020-06-19 16:45:24 -07:00
R. RyanTM 9757111825 cmake: 3.17.2 -> 3.17.3 2020-06-19 10:54:01 +02:00
Claudio Bley 9836a30422 bazel-buildtools: 3.2.0 -> 3.2.1 2020-06-17 11:11:41 +02:00
R. RyanTM 4fbf2d1b1b bmake: 20200506 -> 20200606 2020-06-16 10:40:27 -05:00