Ryan Burns
1f67443319
cmake-language-server: fix test error on macOS
...
This should fix Hydra's Darwin test failures for this package.
See https://github.com/regen100/cmake-language-server/pull/24
2020-07-29 22:09:25 -07:00
Matthew Bauer
1a3b07cf8e
Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging
2020-07-29 18:24:08 -05:00
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
Jörg Thalheim
5ad1cdafe1
Merge pull request #94151 from dtzWill/update/lit-0.10
...
lit: 0.9.0 -> 0.10.0
2020-07-29 22:54:14 +01:00
zowoq
ea1287110f
skopeo: 1.1.0 -> 1.1.1
...
https://github.com/containers/skopeo/releases/tag/v1.1.1
2020-07-30 07:35:53 +10:00
Vladimír Čunát
60d89e5793
Merge branch 'master' into staging
2020-07-29 18:40:28 +02:00
Will Dietz
f46c07bbbd
bloaty: 1.0 -> 1.1
2020-07-29 01:04:55 -05:00
Will Dietz
4d8b20f568
lit: 0.9.0 -> 0.10.0
2020-07-29 00:53:47 -05:00
Colin L Rice
148138e9de
vend: init at unstable-2020-06-04
...
This is used to provide alternate vendoring for go.
2020-07-28 21:11:28 -04:00
Ivan Kozik
0d7bdd6d8e
hydra-unstable: 2020-06-23 -> 2020-07-28
...
This fixes the build:
config.status: creating hydra-config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing executable-scripts commands
building
build flags: -j8 -l8 SHELL=/nix/store/c4wxsn4jays9j31y5z9f83nr2cp7l4pa-bash-4.4-p23/bin/bash
make all-recursive
make[1]: Entering directory '/build/source'
Making all in src
make[2]: Entering directory '/build/source/src'
Making all in hydra-evaluator
make[3]: Entering directory '/build/source/src/hydra-evaluator'
g++ -DHAVE_CONFIG_H -I. -I../.. -std=c++17 -I/nix/store/2xhb4hlskn33pbyph36v4wxcan56dnrw-boehm-gc-8.0.4-dev/include -I/nix/store/5rjgsqjdm71cflfb68q7m771a1rqcsk3-nix-2.4pre20200719_a79b6dd-dev/include/nix -Wall -I ../libhydra -Wno-deprecated-declarations -g -O2 -std=c++17 -include nix/config.h -c -o hydra_evaluator-hydra-evaluator.o `test -f 'hydra-evaluator.cc' || echo './'`hydra-evaluator.cc
hydra-evaluator.cc:27:27: error: template argument 1 is invalid
27 | std::unique_ptr<Config> config;
| ^
hydra-evaluator.cc:27:27: error: template argument 2 is invalid
hydra-evaluator.cc: In constructor 'Evaluator::Evaluator()':
hydra-evaluator.cc:61:56: error: base operand of '->' is not a pointer
61 | , maxEvals(std::max((size_t) 1, (size_t) config->getIntOption("max_concurrent_evals", 4)))
| ^~
hydra-evaluator.cc:60:44: error: invalid user-defined conversion from 'std::_MakeUniq<Config>::__single_object' {aka 'std::unique_ptr<Config, std::default_delete<Config> >'} to 'int' [-fpermissive]
60 | : config(std::make_unique<::Config>())
| ~~~~~~~~~~~~~~~~~~~~~~~~~~^~
In file included from /nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/memory:80,
from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/binarystring.hxx:17,
from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/binarystring:4,
from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/pqxx:3,
from ../libhydra/db.hh:3,
from hydra-evaluator.cc:1:
/nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/bits/unique_ptr.h:374:16: note: candidate is: 'std::unique_ptr<_Tp, _Dp>::operator bool() const [with _Tp = Config; _Dp = std::default_delete<Config>]' <near match>
374 | explicit operator bool() const noexcept
| ^~~~~~~~
/nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/bits/unique_ptr.h:374:16: note: return type 'bool' of explicit conversion function cannot be converted to 'int' with a qualification conversion
make[3]: *** [Makefile:440: hydra_evaluator-hydra-evaluator.o] Error 1
make[3]: Leaving directory '/build/source/src/hydra-evaluator'
make[2]: *** [Makefile:360: all-recursive] Error 1
make[2]: Leaving directory '/build/source/src'
make[1]: *** [Makefile:414: all-recursive] Error 1
make[1]: Leaving directory '/build/source'
make: *** [Makefile:344: all] Error 2
builder for '/nix/store/g967cc3j6rc3nnpx2s4klpr03ig9zzyp-hydra-2020-06-23.drv' failed with exit code 2
2020-07-28 23:40:41 +00:00
Mario Rodas
32a144c554
Merge pull request #94062 from r-ryantm/auto-update/elfinfo
...
elfinfo: 1.0.1 -> 1.1.0
2020-07-28 16:49:24 -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
Mario Rodas
2ea37a0fe6
Merge pull request #94025 from r-ryantm/auto-update/linuxkit
...
linuxkit: 0.7 -> 0.8
2020-07-28 12:49:36 -05:00
Nikolay Korotkiy
b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK
2020-07-28 19:05:43 +03:00
Tim Steinbach
ed0ad5f792
jenkins: 2.235.2 -> 2.235.3
2020-07-28 09:59:03 -04:00
Mario Rodas
7cce068583
azure-storage-azcopy: fix source revision
2020-07-28 04:20:00 -05:00
Lancelot SIX
38f7e8e4e5
Merge pull request #94058 from r-ryantm/auto-update/cmake-format
...
cmake-format: 0.6.10 -> 0.6.11
2020-07-28 10:06:43 +01:00
R. RyanTM
7ab5669bb9
elfinfo: 1.0.1 -> 1.1.0
2020-07-28 08:18:54 +00:00
R. RyanTM
e6d83f4028
cmake-format: 0.6.10 -> 0.6.11
2020-07-28 06:37:38 +00:00
aszlig
3873e0d191
Unmaintain packages I don't use anymore
...
Just got a reminder via the vulnerability roundup[1] that I'm still
listed as maintainer for Synergy, even though I stopped using it years
ago.
I'll also take this as an opportunity to remove myself from other
packages which I stopped using and thus most certainly won't be able to
maintain. The latter is already hard enough these days for software
which I *do* use.
[1]: https://github.com/NixOS/nixpkgs/issues/94007
Signed-off-by: aszlig <aszlig@nix.build>
2020-07-28 02:08:36 +02:00
lewo
8599adeadd
Merge pull request #93845 from lucperkins/open-policy-agent-version
...
Add build version to open-policy-agent package
2020-07-28 00:32:11 +02:00
Mario Rodas
67de12f991
linuxkit: use buildFlagsArray
2020-07-27 16:20:00 -05:00
R. RyanTM
405d540652
linuxkit: 0.7 -> 0.8
2020-07-27 19:30:08 +00:00
oxalica
45cd9b2c18
rust-analyzer: 2020-07-13 -> 2020-07-27
2020-07-27 20:22:44 +08:00
R. RyanTM
09bf6190b6
azure-storage-azcopy: 10.4.3 -> 10.5.1
2020-07-27 11:55:10 +00:00
Mario Rodas
388453233c
buildkit: 0.7.1 -> 0.7.2
2020-07-27 04:20:00 -05:00
Lily Ballard
c8dd9d6c92
jazzy: 0.13.3 -> 0.13.5
2020-07-26 23:14:49 -07:00
Mario Rodas
9fc4678a4a
Merge pull request #92691 from jlesquembre/kustomize-3.8.0
...
kustomize: 3.3.1 -> 3.8.0
2020-07-26 16:36:40 -05:00
Ryan Burns
3a57356721
cmake: 3.17.3 -> 3.18.0
2020-07-26 18:57:06 +02:00
Maximilian Bosch
390ce60d49
rustracer: 2.1.33 -> 2.1.35
...
ChangeLog: https://github.com/racer-rust/racer/blob/master/CHANGELOG.md#2135
Updating to 2.1.36[1] isn't possible as it'd require latest nightly
Rust.
[1] https://crates.io/crates/racer/2.1.36
2020-07-26 11:32:40 +02:00
Bouke van der Bijl
352eeb059d
mockgen: init at 1.4.3
2020-07-26 14:22:57 +10:00
Luc Perkins
debf7bbcb0
Add version flag to Open Policy Agent build
2020-07-25 12:30:12 -07:00
Daniël de Kok
370a71c74f
Merge pull request #93619 from Parasrah/go-task
...
go-task: init at 2.8.1
2020-07-25 20:41:26 +02:00
Parasrah
669155b09d
go-task: init at 2.8.1
2020-07-25 20:27:03 +02:00
Vladimír Čunát
2b7c0dcdaa
Merge branch 'staging-next'
...
Rebuild on Hydra seems OK-ish.
mongodb.nix needed some conflict resolution (scons versions);
all four versions seem to build fine.
2020-07-25 16:18:40 +02:00
Peter Simons
dbacb52ad8
Merge pull request #92461 from NixOS/haskell-updates
...
Update Haskell package set to LTS 16.6 (plus other fixes)
2020-07-24 22:13:40 +02:00
Daniël de Kok
deeb49ee4c
Merge pull request #93776 from Pamplemousse/codeql
...
codeql: 2.2.3 -> 2.2.4
2020-07-24 21:02:28 +02:00
Ryan Mulligan
1857422901
Merge pull request #93730 from r-ryantm/auto-update/doctl
...
doctl: 1.45.1 -> 1.46.0
2020-07-24 10:02:49 -07:00
Jörg Thalheim
af854940a6
Merge pull request #93750 from r-ryantm/auto-update/pwndbg
2020-07-24 17:24:08 +01:00
Pamplemousse
d14d094189
codeql: 2.2.3 -> 2.2.4
...
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2020-07-24 09:03:05 -07:00
Malte Brandy
ccb418a358
haskellPackages.haskell-language-server: 0.2.0.0 -> 0.2.2.0
2020-07-24 15:04:25 +02:00
Peter Simons
6acca641f9
Merge remote-tracking branch 'origin/master' into haskell-updates.
2020-07-24 13:08:06 +02:00
Malte Brandy
5e756f5f31
haskellPackages.haskell-language-server: 0.1.0.0 -> 0.2.0.0
...
generated by
pkgs/development/tools/haskell/haskell-language-server/update.sh
with some manual tweaks
2020-07-24 13:02:55 +02:00
Martin Weinelt
579539103c
Merge pull request #93760 from r-ryantm/auto-update/tockloader
...
tockloader: 1.4.0 -> 1.5.0
2020-07-24 13:01:20 +02:00
R. RyanTM
aecafd476e
tockloader: 1.4.0 -> 1.5.0
2020-07-24 10:49:45 +00:00
R. RyanTM
069700e482
pwndbg: 2019.12.09 -> 2020.07.23
2020-07-24 07:59:14 +00:00
Daniël de Kok
6e0e4960a6
Merge pull request #93681 from xoe-labs/da-drone-update
...
drone: 1.6.5 → 1.9.0
2020-07-24 09:56:55 +02:00
Jörg Thalheim
ac33603b66
Merge pull request #93743 from r-ryantm/auto-update/nix-build-uncached
2020-07-24 07:28:55 +01:00
R. RyanTM
b48de3b039
nix-build-uncached: 0.1.1 -> 1.0.0
2020-07-24 05:29:10 +00:00
Sarah Brofeldt
ea731f42f7
Merge pull request #93738 from r-ryantm/auto-update/kafkacat
...
kafkacat: 1.5.0 -> 1.6.0
2020-07-24 07:05:56 +02:00
R. RyanTM
c648cc3234
kafkacat: 1.5.0 -> 1.6.0
2020-07-24 03:17:16 +00:00
R. RyanTM
b0350bc9e3
doctl: 1.45.1 -> 1.46.0
2020-07-24 00:29:02 +00:00
David Arnold
fcb67219ea
drone: 1.6.5 → 1.9.0
2020-07-23 15:44:40 -05:00
Daniël de Kok
2acbca9b92
Merge pull request #93696 from dywedir/just
...
just: 0.6.0 -> 0.7.1
2020-07-23 20:23:32 +02:00
Wael Nasreddine
bf0d3ff034
bazel-gazelle: 0.20.0 -> 0.21.1 ( #93611 )
2020-07-23 09:06:22 -07:00
Vladyslav M
4973d19644
just: 0.6.0 -> 0.7.1
2020-07-23 12:15:49 +03:00
Jan Tojnar
2988feba8c
Merge branch 'master' into staging-next
2020-07-23 08:19:14 +02:00
adisbladis
63fa3639b1
poetry2nix: 1.10.0 -> 1.11.0
2020-07-22 17:04:47 +02:00
Frederik Rietdijk
19be541fe7
Merge master into staging-next
2020-07-22 16:49:51 +02:00
Maximilian Bosch
7b17579b8b
wabt: 1.0.18 -> 1.0.19
...
https://github.com/WebAssembly/wabt/releases/tag/1.0.19
2020-07-22 15:29:03 +02:00
Vladimír Čunát
7a5c6fee0f
Merge branch 'master' into staging-next
...
Some rebuilds, e.g. all of haskell.
Hydra nixpkgs: ?compare=1601713
2020-07-22 08:37:19 +02:00
Mario Rodas
127634e4af
Merge pull request #93554 from r-ryantm/auto-update/cproto
...
cproto: 4.7o -> 4.7p
2020-07-20 19:42:18 -05:00
Mario Rodas
849868fcb5
cproto: enable on darwin
2020-07-20 18:43:19 -05:00
R. RyanTM
d59fa641b0
cproto: 4.7o -> 4.7p
2020-07-20 20:28:15 +00:00
Maximilian Bosch
117eb485d4
sqldeveloper: 19.4.0.354.1759 -> 20.2.0.175.1842
...
https://www.oracle.com/tools/sqldev/sqldev-relnotes-202.html
2020-07-20 21:47:10 +02:00
Pavol Rusnak
149987489c
electron: mark electron versions < 6 insecure
2020-07-20 18:03:50 +02:00
Pavol Rusnak
4d6411288c
electron: point electron alias to the latest stable version
...
+ require explicit version of electron in packages
2020-07-20 17:58:55 +02:00
Mario Rodas
c2e75de99d
Merge pull request #93508 from r-ryantm/auto-update/go-swagger
...
go-swagger: 0.24.0 -> 0.25.0
2020-07-20 07:46:14 -05:00
Mario Rodas
17ce8608cb
Merge pull request #93517 from eonpatapon/cue-0.2.2
...
cue: 0.2.1 -> 0.2.2
2020-07-20 07:22:15 -05:00
Mario Rodas
eb14ee8521
Merge pull request #93506 from r-ryantm/auto-update/fswatch
...
fswatch: 1.14.0 -> 1.15.0
2020-07-20 07:09:03 -05:00
Max Wittig
64d855d214
gitlab-runner: 13.1.0 -> 13.2.0 ( #93514 )
2020-07-20 11:13:05 +00:00
Mario Rodas
0361a0e9d6
go-swagger: add ldflags
2020-07-20 04:20:00 -05:00
Jean-Philippe Braun
ddec014569
cue: 0.2.1 -> 0.2.2
2020-07-20 10:21:00 +02:00
Daniël de Kok
a8546a078d
Merge pull request #93498 from r-ryantm/auto-update/cargo-udeps
...
cargo-udeps: 0.1.12 -> 0.1.13
2020-07-20 09:24:38 +02:00
R. RyanTM
bac0c4fecb
go-swagger: 0.24.0 -> 0.25.0
2020-07-20 05:47:54 +00:00
R. RyanTM
65e6e68316
fswatch: 1.14.0 -> 1.15.0
2020-07-20 05:25:54 +00:00
R. RyanTM
58c2a5f4fe
cargo-udeps: 0.1.12 -> 0.1.13
2020-07-20 03:05:36 +00:00
R. RyanTM
fa7188cd33
ameba: 0.13.0 -> 0.13.1
2020-07-20 01:12:32 +00:00
Jan Tojnar
83442a3533
Merge branch 'master' into staging-next
2020-07-20 02:16:21 +02:00
Mario Rodas
453394cf86
Merge pull request #93225 from r-ryantm/auto-update/k6
...
k6: 0.26.2 -> 0.27.0
2020-07-19 17:39:36 -05:00
Mario Rodas
5717d9d2f7
Merge pull request #93481 from marsam/update-tflint
...
tflint: 0.17.0 -> 0.18.0
2020-07-19 11:20:01 -05:00
Mario Rodas
18008f4d91
Merge pull request #93462 from markus1189/jo-1-4
...
jo: 1.3 -> 1.4
2020-07-19 11:11:51 -05:00
Alvar
949d39135b
golangci-lint: 1.28.1 -> 1.28.3 ( #93466 )
2020-07-19 08:25:05 -07:00
Mario Rodas
a4119588f7
tflint: 0.17.0 -> 0.18.0
2020-07-19 09:45:00 -05:00
Michael Weiss
b9de39c2a1
scons: 4.0.0 -> 4.0.1 ( #93415 )
2020-07-19 11:41:41 +02:00
Vladimír Čunát
956f3224fe
Merge #92128 : wayland: documentation outputs (in staging)
2020-07-19 10:03:34 +02:00
Markus Hauck
a378e69dcd
jo: 1.3 -> 1.4
2020-07-19 09:51:19 +02:00
Daniël de Kok
5b55f257b5
Merge pull request #93392 from zowoq/fcct
...
fedora-coreos-config-transpiler: use upstream vendor
2020-07-19 08:53:27 +02:00
Mario Rodas
98c9ae41de
Merge pull request #93440 from r-ryantm/auto-update/visualvm
...
visualvm: 2.0.2 -> 2.0.3
2020-07-18 21:47:48 -05:00
R. RyanTM
bdc6bb9b1e
visualvm: 2.0.2 -> 2.0.3
2020-07-18 20:51:52 +00:00
Daniël de Kok
3bcbebb724
Merge pull request #93408 from justin-gerhardt/stm32cube
...
stm32cubemx: 5.3.0 -> 5.6.1
2020-07-18 19:31:32 +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
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
zowoq
5bb8654307
fedora-coreos-config-transpiler: use upstream vendor
2020-07-18 18:15:54 +10: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
R. RyanTM
2d5f459258
k6: 0.26.2 -> 0.27.0
2020-07-16 06:17:40 +00:00
Justin Gerhardt
2370ca0b26
stm32cubemx: 5.3.0 -> 5.6.1
2020-07-16 01:54:41 -04: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
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