swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
265762 commits 5 branches 0 tags 27 GiB
Commit graph

15856 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
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
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
Phillip Cloud f1778cd90e
nixos/nomad: add extraSettingsFiles option to nomad service (#109761) 2021-01-23 23:52:19 +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
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
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
Symphorien Gibol f45f22d519 nixos/evolution: enable gnome-keyring 2021-01-20 19:51:32 +01:00
Scriptkiddi 1572940688
networking, chrony, ntpd, timesyncd: add timeServers option type 2021-01-20 10:54:24 +01:00
WORLDofPEACE 35ad1687a7
Merge pull request #109060 from MetaDark/nixos/xdg/portal 
nixos/xdg/portal: fix loading portals from systemd service
 2021-01-20 03:29:16 -05:00
Robert Hensing d51d15e1cf
Merge pull request #109665 from prusnak/stdenv-lib-nixos 
nixos/modules: stdenv.lib -> lib
 2021-01-19 23:50:30 +01:00
Sandro f591395492
Merge pull request #108319 from KaiHa/pr/nitrokey-app-1.4.2 2021-01-19 19:20:35 +01:00
Robert Hensing 04946f4246 nixos/vault: extraConfigPaths -> extraSettingsPaths 
Align with RFC42 language, even if in advance of the actual settings
attribute.
 2021-01-19 18:14:29 +01:00
Robert Hensing 3936d85ec3 nixos/systemd: allow preStart with other ExecStartPre cmdlines 
Declaring them as lists enables the concatenation, supporting
lib.mkBefore, lib.mkOrder, etc.

This is useful when you need to extend a service with a pre-start
script that needs to run as root.
 2021-01-19 16:29:29 +01:00
Jonathan Ringer e2fcf81d2a nixos/modules: pkgconfig -> pkg-config 2021-01-19 01:16:25 -08:00
Christian Kampka f0ec10a829
treewide: remove kampka as maintainer (#109813) 2021-01-18 21:23:49 +01:00
Maximilian Bosch 2abfc93a68
nixos/grafana-image-renderer: typo fix 
Since the service doesn't do a strict config check, this worked fine
before, however the settings in the block never applied properly.
 2021-01-18 18:44:58 +01:00
Maximilian Bosch fbdd82bf9b
Merge pull request #109691 from nh2/manual-element-base_url 
manual: Element: Fix misleading `base_url`.
 2021-01-18 14:32:54 +01:00
github-actions[bot] ef2abc20bc
Merge master into staging-next 2021-01-18 06:42:35 +00:00
Kai Harries 991aba30f8 module nitrokey: drop option group 
Since the update of the nitrokey-app to 1.4.2 the group option is no
longer supported.
 2021-01-18 07:36:51 +01:00