Commit graph

12309 commits

Author SHA1 Message Date
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
595a36d846
scons.py2: Replace with sconsPackages.scons_3_1_2
Required since SCons 4.0.0 doesn't support Python 2.7 anymore.
2020-07-18 10:48:20 +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
Wael Nasreddine
e3bd95b2c7
bazel-kazel: init at 0.0.7 (#93361) 2020-07-17 13:10:32 -07:00
Daniël de Kok
1bef2f1606
Merge pull request #93304 from Tomahna/metals
metals: 0.9.1 -> 0.9.2
2020-07-17 20:42:41 +02:00
Tim Steinbach
223efd7b37
jenkins: 2.235.1 -> 2.235.2 2020-07-17 10:22:13 -04:00
Maximilian Bosch
3f4a78f749
wasm-bindgen-cli: 0.2.64 -> 0.2.65
https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.65
2020-07-17 15:55:59 +02:00
Maximilian Bosch
3f18f9b5c3
wabt: 1.0.16 -> 1.0.18
https://github.com/WebAssembly/wabt/releases/tag/1.0.18
https://github.com/WebAssembly/wabt/releases/tag/1.0.17
2020-07-17 15:55:58 +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
Mario Rodas
64b23199ba
Merge pull request #93221 from r-ryantm/auto-update/fly
fly: 6.3.0 -> 6.4.0
2020-07-16 21:48:57 -05:00
Mario Rodas
05dc6afb08
Merge pull request #93285 from r-ryantm/auto-update/cargo-fuzz
cargo-fuzz: 0.5.4 -> 0.8.0
2020-07-16 21:46:13 -05:00
Kevin Rauscher
8a58662c40 metals: 0.9.1 -> 0.9.2 2020-07-16 23:31:28 +02:00
R. RyanTM
35f96e6c7b cargo-fuzz: 0.5.4 -> 0.8.0 2020-07-16 17:06:23 +00:00
Daniël de Kok
a856b54987
Merge pull request #93212 from r-ryantm/auto-update/cargo-expand
cargo-expand: 0.6.0 -> 0.6.4
2020-07-16 15:12:13 +02:00
Ryan Mulligan
aa9aa2b9dc
Merge pull request #93236 from r-ryantm/auto-update/mustache-go
mustache-go: 1.0.1 -> 1.2.0
2020-07-16 05:35:53 -07:00
zimbatm
390737910d
gopls: 0.4.1 -> 0.4.3 2020-07-16 14:32:18 +02:00
Florian Klink
ba20bc872f
Merge pull request #93128 from Ma27/fix-rust-build-flags
rust: Fix build flags
2020-07-16 12:47:26 +02:00
R. RyanTM
fbb1a543c0 mustache-go: 1.0.1 -> 1.2.0 2020-07-16 08:14:58 +00:00
Jan Tojnar
11ae0fb1ad
Merge pull request #93041 from jtojnar/flatpak-builder-1.0.11
flatpak-builder: 1.0.10 → 1.0.11
2020-07-16 07:15:56 +02:00
R. RyanTM
1e816defe7 fly: 6.3.0 -> 6.4.0 2020-07-16 04:42:06 +00: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
R. RyanTM
466562c3e0 cargo-expand: 0.6.0 -> 0.6.4 2020-07-16 02:38:04 +00:00
Dmitry Kalinkin
9173beb67d
Merge branch 'staging-next' into staging 2020-07-15 22:28:18 -04: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
Jan Tojnar
821dba740e
Merge branch 'staging-next' into staging 2020-07-15 09:29:01 +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
Maximilian Bosch
7713fba8f8
Revert "buildRustPackage: fix cargoBuildFlags"
This reverts commit deb78151a9.

Mixing up two distinct phases of a derivation's build is not a good idea. See
also https://github.com/NixOS/nixpkgs/pull/91689#issuecomment-657813954.
2020-07-14 17:39:09 +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
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
Jan Tojnar
0e4bdc9f6e
flatpak-builder: 1.0.10 → 1.0.11
https://github.com/flatpak/flatpak-builder/releases/tag/1.0.11

Also try to fix: https://github.com/NixOS/nixpkgs/issues/73325
2020-07-13 07:25:49 +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