Silvan Mosberger
e9101d4a3b
lib/types: Improved functionTo merging
...
Now type checks the resulting function values and allows mkMerge and co.
Also indicates that the type check is done in the function body
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2021-01-27 00:16:23 +01:00
Bas van Dijk
8ac4b251c8
nixos: use functionTo to prevent evaluation errors while merging
...
Without this patch merging options like
services.xserver.windowManager.xmonad.extraPackages
results in the evaluation error:
error: value is a list while a set was expected, at nixpkgs/lib/options.nix:77:23
With this patch we get the desired merging behaviour that just concatenates the
resulting package lists.
(cherry picked from commit 6e99f9fdec
)
Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
2021-01-24 17:18:37 +01:00
Bas van Dijk
43243539b3
lib/tests/modules: add a test for the functionTo type
...
(cherry picked from commit 478af112e8
)
2021-01-24 16:56:45 +01:00
Bas van Dijk
b454af298d
Revert "Remove types.functionTo."
...
This reverts commit 4ff1ab5a56
.
We need this to type options like:
services.xserver.windowManager.xmonad.extraPackages that specify functions that
take an attribute set containing packages / plugins and return a list containing
a selection of the values in this set.
The reason we need a dedicated type for this is to have the correct merge
behaviour. Without the functionTo type merging multiple function option
definitions results in an evaluation error. The functionTo type merges
definitions by returning a new function that applies the functions of all the
definitions to the given input and merges the result.
(cherry picked from commit 7ed41ff5e7
)
2021-01-24 16:56:33 +01:00
Fabian Affolter
5c7e19604e
swego: init at 0.7 ( #108106 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-24 16:27:17 +01:00
Sandro
367618236a
Merge pull request #110612 from kanashimia/master
...
sord: 0.16.4 -> unstable-2021-01-12
2021-01-24 16:26:05 +01:00
Sandro
d14a61a4dc
Merge pull request #110593 from holymonson/prezto
2021-01-24 16:21:08 +01:00
Mario Rodas
214d726b92
Merge pull request #110487 from r-ryantm/auto-update/lean
...
lean: 3.24.0 -> 3.25.0
2021-01-24 10:17:35 -05:00
Sandro
81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
...
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
sternenseemann
2dd93a5c13
solo5: add missing test dependencies
2021-01-24 16:15:28 +01:00
Sandro
9ac594329b
Merge pull request #110668 from fabaff/bump-msf
...
metasploit: 6.0.26 -> 6.0.27
2021-01-24 15:56:11 +01:00
Ryan Mulligan
51c417ccaa
Merge pull request #110518 from r-ryantm/auto-update/obsidian
...
obsidian: 0.10.7 -> 0.10.8
2021-01-24 06:55:16 -08:00
Mario Rodas
24827624b9
Merge pull request #110602 from cpcloud/update-pulumi
...
pulumi-bin: 2.17.2 -> 2.18.2
2021-01-24 09:54:13 -05:00
aszlig
2f30e32121
uqm: Fix evaluation of 3DO video package
...
Regression introduced by 2e34288f0d
.
The commit in question just used the "lib" attribute, but it wasn't in
scope. In addition to bringeng the lib attribute into scope, I also
removed the "with lib;", which should make sure that we get an error
when just parsing (nix-instantiate --parse) the Nix expression.
Signed-off-by: aszlig <aszlig@nix.build>
2021-01-24 15:35:33 +01:00
Michael Weiss
9e9e240a27
Revert "release-combined.tested: Temporarily remove the Chromium test"
...
This reverts commit 2dbd08dcbd
.
I've fixed the regression in 8a7a8442c1
and the rest of my
refactorings/improvements shouldn't affect the stability of the test.
2021-01-24 15:27:49 +01:00
Mario Rodas
6a5bcdfc5a
Merge pull request #110659 from nzhang-zh/add-grpc-tools
...
grpc-tools: init at 1.10.0
2021-01-24 09:26:14 -05:00
Michael Weiss
8ef056ba72
glances: 3.1.6 -> 3.1.6.1
2021-01-24 14:56:36 +01:00
Kim Lindberger
2632551494
Merge pull request #110689 from talyz/fish-foreign-env-function-path
...
nixos/fish: Fix foreign-env function path
2021-01-24 14:37:08 +01:00
Monson Shao
99b3d904e7
maintainers: add holymonson
2021-01-24 21:33:11 +08:00
Robert Schütz
f9d90fdbbf
Merge pull request #109940 from dotlambda/Nikola-fix
...
pythonPackages.Nikola: fix
2021-01-24 14:32:12 +01:00
Monson Shao
6f94d834a1
zsh-prezto: update to unstable
2021-01-24 21:32:01 +08:00
Sandro
0dd579a3e6
Merge pull request #110686 from helsinki-systems/chrony_types
...
nixos/chrony: add types
2021-01-24 14:18:51 +01:00
Fabian Affolter
0154142350
metasploit: 6.0.26 -> 6.0.27
2021-01-24 14:00:07 +01:00
volth
bc0d605cf1
treewide: fix double quoted strings in meta.description
...
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Sandro
513a3ea665
Merge pull request #110680 from helsinki-systems/amuled_types
2021-01-24 13:52:02 +01:00
Fritz Otlinghaus
31345193f0
nixos/chrony: add types
2021-01-24 13:50:35 +01:00
Robert Hensing
530df49d7a
Merge pull request #108411 from hercules-ci/vault-multiple-config-files
...
vault: Support multiple config files (no secrets in store)
2021-01-24 13:49:06 +01:00
Sandro
0a81d0846a
Merge pull request #110682 from helsinki-systems/buildbot_types
...
nixos/buildbot: add pythonPackages type
2021-01-24 13:45:05 +01:00
Sandro
0d71519d68
Merge pull request #110681 from helsinki-systems/autofs_types
...
nixos/autofs: add timeout type
2021-01-24 13:44:54 +01:00
talyz
6230ff7dd8
nixos/fish: Fix foreign-env function path
2021-01-24 13:41:37 +01:00
zowoq
5cdf493674
youtube-dl: 2021.01.16 -> 2021.01.24.1
...
https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.24.1
2021-01-24 22:39:58 +10:00
Sandro
f2a2be7308
Merge pull request #110671 from illustris/rescuetime
...
rescuetime: 2.16.4.2 -> 2.16.5.1
2021-01-24 13:38:22 +01:00
Fritz Otlinghaus
6054aa2bc1
nixos/amuled: add types
2021-01-24 13:37:09 +01:00
Fritz Otlinghaus
72691e14ec
nixos/buildbot: add pythonPackages type
2021-01-24 13:20:35 +01:00
Fritz Otlinghaus
91311fcb46
nixos/autofs: add timeout type
2021-01-24 13:17:07 +01:00
Sandro
c2785a405b
Merge pull request #110664 from TredwellGit/xorg.xf86videonouveau
...
xorg.xf86videonouveau: 1.0.16 -> 1.0.17
2021-01-24 13:13:38 +01:00
Nicolas Mattia
e63d0738a7
lsyncd: build on darwin ( #109981 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-24 12:22:36 +01:00
Sandro
31e38da733
Merge pull request #110669 from fabaff/desc-glances-api
...
python3Packages.glances-api: fix description
2021-01-24 12:15:31 +01:00
jakobrs
460b9f53b2
lua: Add more symlinks to lua.pc
...
This creates a symlink to lua.pc for every name of the file used by Arch:
For a version of Lua (for example, 5.4) we now have:
- lib/pkgconfig/lua.pc
- lib/pkgconfig/lua-5.4.pc
- lib/pkgconfig/lua5.4.pc
- lib/pkgconfig/lua54.pc
2021-01-24 11:01:04 +01:00
illustris
ad91c491fa
rescuetime: 2.16.4.2 -> 2.16.5.1
2021-01-24 15:30:52 +05:30
Michael Raskin
813e19964e
Merge pull request #110108 from r-ryantm/auto-update/mpfi
...
mpfi: 1.5.3 -> 1.5.4
2021-01-24 09:37:11 +00:00
Ning Zhang
7b358c6e7a
grpc-tools: init at 1.10.0
2021-01-24 20:36:46 +11:00
Robert Schütz
45a2edbe4a
python3Packages.doit: 0.32.0 -> 0.33.1
2021-01-24 09:52:30 +01:00
Robert Schütz
98e624eb7d
doit: move to pythonPackages
2021-01-24 09:52:28 +01:00
Robert Schütz
76054e38cd
pythonPackages.piexif: fix tests
...
apply https://github.com/hMatoba/Piexif/pull/109
2021-01-24 09:51:20 +01:00
Fabian Affolter
6a12c0b99e
python3Packages.glances-api: fix description
2021-01-24 09:25:38 +01:00
dadada
dc8231950c
gitea: add passthru.tests
...
Reference nixos tests to execute on package upgrades.
2021-01-24 08:50:59 +01:00
TredwellGit
ba5dedbbd0
xorg.xf86videonouveau: 1.0.16 -> 1.0.17
...
https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html
2021-01-24 07:33:12 +00:00
Profpatsch
2a9f33600c
hpack: add a statically built executable
...
hpack is a little tool to convert a yaml spec to a cabal file, but its
runtime closure depends on ghc if it’s not built statically.
2021-01-24 07:02:19 +01:00
Jörg Thalheim
2dde588a28
Merge pull request #110656 from siraben/vim-plugins-overrides-stdenv-lib
...
vim-plugins/overrides.nix: stdenv.lib -> lib
2021-01-24 04:23:58 +00:00