JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
265,762 Commits 2 Branches 0 Tags 13 GiB
8ac4b251c8
Commit Graph

19912 Commits

Author SHA1 Message Date
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 6e99f9fdecb1f28308c8e0aed0fc851737354864)

Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
 2021-01-24 17:18:37 +01: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
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
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
Sandro
0dd579a3e6
Merge pull request #110686 from helsinki-systems/chrony_types 
nixos/chrony: add types
 2021-01-24 14:18:51 +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
talyz
6230ff7dd8
nixos/fish: Fix foreign-env function path 2021-01-24 13:41:37 +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
Attila Lendvai
21c56fc3cf nixos/doc/manual: In the preface, add link to #chap-contributing 
Turned the freetext suggestion about opening the build output
into a copy-pastable xdg-open line.

Renamed title to 'Contributing to this manual'.
 2021-01-23 18:58:54 -08:00
Sandro
77f32f2f3c
Merge pull request #110628 from prusnak/stdenv-lib 
treewide: stdenv.lib -> lib
 2021-01-24 03:10:32 +01:00
Sandro
51ea855376
Merge pull request #109735 from berberman/fcitx5-mozc 2021-01-24 02:47:37 +01:00
Potato Hatsue
e8ffe04c79
fcitx5: update doc 2021-01-24 02:10:23 +01:00
Pavol Rusnak
90f7338112
treewide: stdenv.lib -> lib 2021-01-24 01:49:49 +01:00
Phillip Cloud
f1778cd90e
nixos/nomad: add extraSettingsFiles option to nomad service (#109761) 2021-01-23 23:52:19 +01:00
markuskowa
2f34b4b883
Merge pull request #108983 from markuskowa/dev-mpi 
Use mpi attribute consistently to provide a default MPI implementation
 2021-01-23 22:51:09 +01:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform 
top-level, lib: Remove platform attribute of platforms
 2021-01-23 16:32:36 -05:00
Phillip Cloud
2861d26df5 nixos/nomad: move data_dir default setting to allow propagation of default 2021-01-23 12:50:01 -05:00
Phillip Cloud
0bbed1c273 nixos/nomad: add newline 2021-01-23 12:50:01 -05:00
Jörg Thalheim
17da58acca
Merge pull request #108242 from GovanifY/grub-additional 
boot.loader.grub: add extraInstallCommands option
 2021-01-23 16:18:22 +00:00
John Ericson
9c213398b3 lib: Clean up how linux and gcc config is specified 
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
 2021-01-23 10:01:28 -05:00
Michael Weiss
86897c8f63
nixos/tests/chromium: Fix another potential race condition 
The create_new_win() function could open multiple windows when used
incorrectly. This change makes sure that a new window will only be
created if the main window could be selected successfully.

This also ignores the out return values as they're never used.
 2021-01-23 12:15:56 +01:00
Markus Kowalewski
68fa960f6a
nixos/release-notes: add comment about generic mpi attribute 2021-01-23 12:15:18 +01:00
Stig
c52a11e741
Merge pull request #110389 from tnias/usbguard_test_pr 
nixos/tests/usbguard: init
 2021-01-23 02:50:50 +01:00
Philipp Bartsch
b912846267 nixos/tests/usbguard: init 2021-01-23 01:19:11 +01:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified" 
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
 2021-01-22 14:07:06 -08:00
John Ericson
d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup 
lib: Clean up how linux and gcc config is specified
 2021-01-22 15:15:58 -05:00
Kevin Griffin
515d801aee fish: add babelfish translation option 
Configuration may be ran through fenv at shell start time
(as previously) or translated to fish at build time with
the babelfish package.
 2021-01-22 09:24:40 -08:00
Fritz Otlinghaus
0a38f6da4f
nixos/tomcat: add extraGroups type (#110486) 2021-01-22 16:22:06 +01:00
Anderson Torres
0f31f03f22
Merge pull request #108578 from ctem/feature/chrony 
nixos/chrony: add support for Network Time Security (NTS) authentication
 2021-01-22 09:36:08 -03:00
Florian Klink
ad87ca737d
Merge pull request #110403 from thiagokokada/fix-renamed-option 
nixos/libinput: add missing renamed module
 2021-01-22 12:25:44 +01:00
Fritz Otlinghaus
c1efc32740
nixos/module/jboss: Add types to options (#110451) 2021-01-22 11:11:40 +01:00
Fritz Otlinghaus
332a53728c
activemq: add type to configurationDir (#110450) 2021-01-22 11:11:05 +01:00
Fritz Otlinghaus
fc0d3f8da8
nixos/crashdump: Add type to option (#110448) 2021-01-22 11:10:26 +01:00
Fritz Otlinghaus
800b90ea3f
nixos/bitlbee: Add types to options (#110446) 2021-01-22 11:07:29 +01:00
Robert Hensing
bbaff89ceb
Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre 
nixos/systemd: allow preStart with other ExecStartPre cmdlines
 2021-01-22 10:18:11 +01:00
John Ericson
8929989614 lib: Clean up how linux and gcc config is specified 
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
 2021-01-21 22:44:09 -05:00
Thiago Kenji Okada
c6cf9bcf0b nixos/libinput: add missing renamed module 
Related PR #108909.
 2021-01-21 19:52:57 -03:00
Guillaume Girol
7ed3d2df76
Merge pull request #103135 from symphorien/pr/92775 
Evolution ews: wrap evolution and evolution data server, fix nixos module.
 2021-01-21 19:42:45 +00:00
Markus Kowalewski
dcae37989f tests/slurm: update mysql config to use settings 2021-01-21 17:51:28 +01:00
Linus Heckemann
5153deedd8
Merge pull request #108909 from thiagokokada/libinput-by-device-type 
nixos/libinput: separate settings by mouse/touchpad
 2021-01-21 10:43:44 +01:00
Matthew Bauer
da9fc7b068
Merge pull request #108072 from matthewbauer/fix-binfmt-activation 
nixos/binfmt.nix: fix running commands in binfmt
 2021-01-20 16:31:53 -06:00
Kevin Cox
f1d3b04c04
Merge pull request #109966 from thiagokokada/bump-opentabletdriver 
opentabletdriver: 0.4.2 -> 0.5.0
 2021-01-20 16:37:16 -05:00
zowoq
b46b3d928d nixos/podman: readd rootless runc test 
use `loginctl enable-linger` to create systemd session
 2021-01-21 06:57:51 +10:00
Sandro
ec84cbf95f
Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-smbinfo 
cifs-utils: missing python3 dependency for smbinfo
 2021-01-20 20:12:37 +01:00