mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:48:10 +00:00
Code Issues Wiki Activity
232325 commits 179 branches 125 tags 8.9 GiB
Commit graph

14249 commits

Author SHA1 Message Date
Frederik Rietdijk bef20b38ef Merge master into staging-next 2020-06-25 13:48:05 +02:00
Kim Lindberger c00bf081d9
Merge pull request #88940 from stigtsp/package/convos-init 
convos: init at 4.22
 2020-06-25 09:32:33 +02:00
Timo Kaufmann 41ba255e23
Merge pull request #77982 from symphorien/sshl_ipv6 
nixos/sslh: make it possible (and the default) to listen on ipv6, plus regression test
 2020-06-24 22:13:19 +02:00
Frederik Rietdijk 16287a8cb8 Merge master into staging-next 2020-06-24 19:04:03 +02:00
Fabian Möller c07a6f8743
nixos/generic-extlinux-compatible: fix docbook syntax 2020-06-23 20:51:02 +02:00
Vladimír Čunát 64cf1e79dd
Merge #91363: small treewide: his -> theirs/its 2020-06-23 19:11:13 +02:00
Florian Klink d227d81c9a
Merge pull request #91195 from flokli/extlinux-conf-builder-dtbname 
extlinux-conf-builder: expose and use base builder command, allow a custom FDT to be specified
 2020-06-23 18:07:31 +02:00
Profpatsch 517be84135 small treewide: his -> theirs/its 
SJW brigade represent. ;)

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
 2020-06-23 16:49:50 +02:00
Jörg Thalheim 7aaffa71dc
Merge pull request #91216 from Mic92/nixos-config-generate 
nixos-generate-config: refer to nixos-hardware
 2020-06-22 23:52:48 +01:00
Jörg Thalheim e943489f24
nixos-generate-config: refer to nixos-hardware 2020-06-22 23:51:08 +01:00
Stig Palmquist 042a2d8baf
nixos/convos: init 2020-06-22 13:58:34 +02:00
Frederik Rietdijk 7481da9cbd Merge master into staging-next 2020-06-22 08:46:16 +02:00
Jörg Thalheim 9aa668ef04
Merge pull request #91154 from Mic92/homeassistant 2020-06-21 13:59:28 +01:00
Florian Klink 387f3b58d2 hardware.deviceTree: add name 
This can be used to explicitly specify a specific dtb file, relative to
the dtb base.

Update the generic-extlinux-compatible module to make use of this option.
 2020-06-21 13:48:22 +02:00
Florian Klink bd8137aef1 extlinux-conf-builder.sh: allow a custom FDT to be specified 
Some bootloaders might not properly detect the model.
If the specific model is known by configuration, provide a way to
explicitly point to a specific dtb in the extlinux.conf.
 2020-06-21 13:48:22 +02:00
Florian Klink afa627730e nixos/sd-image-*: use boot.loader.generic-extlinux-compatible.populateCmd 
While getting rid of the separate extlinux-conf-builder import, this now
also honors boot.loader.timeout in the initial sd card image if
specified.
 2020-06-21 13:48:17 +02:00
Florian Klink 54129e72b4 nixos/generic-extlinux-compatible: introduce boot.loader.generic-extlinux-compatible.populateCmd 
This option exposes the builder command used to populate an image,
honoring all options except the -c <path-to-default-configuration>
argument.

Useful to have for sdImage.populateRootCommands.

Special care needs to be taken w.r.t cross - the populate command runs
on the host platform, the activation script on the build platform (so
the builders differ)
 2020-06-21 13:41:22 +02:00
edef c27fc6a5e5
nixos/gerrit: allow configuring replication declaratively (#91200) 2020-06-21 08:54:14 +00:00
Florian Klink 43424688db nixos/deviceTree: fix description 
hardware.deviceTree.base points to a path, not a package (and also if of
types.path)

It defaults to ${config.boot.kernelPackages.kernel}/dtbs.
 2020-06-21 10:39:10 +02:00
Edmund Wu 00f7558225
Revert "libinput: ensure that we only apply touchpad options to touchpads" 
This reverts commit 912a58428c.
 2020-06-20 20:46:17 -04:00
Samuel Dionne-Riel f203b8b277
Merge pull request #90119 from samueldr/feature/rpi4-fixups 
Fix some pitfalls from the Raspberry Pi 4 specific sd image
 2020-06-20 17:02:51 -04:00
Michele Guerini Rocco 1eef920a8d
Merge pull request #91128 from bbigras/rslsync-localhost 
nixos/resilio: listen on [::1] by default
 2020-06-20 20:43:04 +02:00
Bruno Bigras dbb5bdfa09 nixos/resilio: listen on [::1] by default 2020-06-20 14:28:23 -04:00
Maximilian Bosch c9462630bd
Merge pull request #91149 from nlewo/nextcloud-expose-occ 
nixos/nextcloud: add occ internal option
 2020-06-20 19:28:25 +02:00
Marek Mahut 0ff1bdb7c0
Merge pull request #90884 from mmahut/wasabi 
nixos/wasabibackend: init 1.1.11.1
 2020-06-20 15:30:32 +02:00
lewo 2fd146f6ae
Merge pull request #89427 from Ma27/nextcloud19 
nextcloud19: init at 19.0.0
 2020-06-20 13:59:47 +02:00
Symphorien Gibol 433f227f70 nixos/sslh: make it possible (and the default) to listen on ipv6 2020-06-20 12:54:36 +02:00
Jörg Thalheim 26e9a3498b
nixos/home-assistant: make service reloadable 
This allows quick reloads using the following trick:

$(nix-build --show-trace --no-out-link \
  -E '(with import <nixpkgs/nixos> {};
       pkgs.writeScript "update-hass-config"
       config.systemd.services.home-assistant.preStart)')
systemctl reload home-assistant
 2020-06-20 10:31:27 +01:00
Maximilian Bosch f326e5a35e
nixos/nextcloud: update upgrade-path for nextcloud19 
Enhance the heuristics to make sure that a user doesn't accidentally
upgrade across two major versions of Nextcloud (e.g. from v17 to v19).

The original idea/discussion has been documented in the nixpkgs manual[1].

This includes the following changes:

* `nextcloud19` will be selected automatically when having a stateVersion
  greater or equal than 20.09. For existing setups, the package has to
  be selected manually to avoid accidental upgrades.

* When using `nextcloud18` or older, a warning will be thrown which recommends
  upgrading to `nextcloud19`.

* Added a brief paragraph about `nextcloud19` in the NixOS 19.09 release
  notes.

* Restart `phpfpm` if the Nextcloud-package (`cfg.package`) changes[2].

[1] https://nixos.org/nixos/manual/index.html#module-services-nextcloud-maintainer-info
[2] https://github.com/NixOS/nixpkgs/pull/89427#issuecomment-638885727
 2020-06-20 11:30:11 +02:00
Michele Guerini Rocco 34f19a4686
Merge pull request #86253 from erictapen/printers-example 
nixos/printers: fix example for hardware.printers.ensurePrinters.*.model
 2020-06-20 10:15:30 +02:00
Michele Guerini Rocco fe1245d555
Merge pull request #87270 from martinetd/mpd-fluidsynth 
mpd: add services.mpd.fluidsynth option
 2020-06-20 10:14:06 +02:00
Antoine Eiche 7d994ad445 nixos/nextcloud: add occ internal option 
This option exposes the prefconfigured nextcloud-occ
program. nextcloud-occ can then be used in other systemd services or
added in environment.systemPackages.

The nextcloud test shows how it can be add in
environment.systemPackages.
 2020-06-20 09:59:27 +02:00
Michele Guerini Rocco 41e1bd6021
Merge pull request #90635 from Twey/libinput-touchpad 
libinput: ensure that we only apply touchpad options to touchpads
 2020-06-20 09:58:47 +02:00
Michele Guerini Rocco 003bf184c0
Merge pull request #91116 from bbigras/rslsync-group 
nixos/resilio: fix group name in documentation
 2020-06-20 09:54:17 +02:00
Frederik Rietdijk 9c5e7367d1 Merge master into staging-next 2020-06-20 07:38:17 +02:00
Evils 73a90b0154 nixos/tuptime: change group/user to match upstream 2020-06-20 05:34:37 +02:00
Timo Kaufmann 4843eab3a1
Merge pull request #84135 from symphorien/btrfs-scrub-success 
nixos/btrfs autoScrub: don't fail when scrub finishes successfully
 2020-06-19 22:55:19 +02:00
Maximilian Bosch a2a5aa2634
nextcloud19: init at 19.0.0 
https://nextcloud.com/blog/nextcloud-hub-brings-productivity-to-home-office/
 2020-06-19 22:16:52 +02:00
Bruno Bigras ad13beeebc nixos/resilio: fix group name in documentation 2020-06-19 15:15:33 -04:00
Marek Mahut d07ba3e962
nixos/wasabibackend: fixing description 
Co-authored-by: 1000101 <b1000101@pm.me>
 2020-06-19 20:07:55 +02:00
Alyssa Ross 4e69b0a899
Merge pull request #89744 from vojta001/traefik-indent-config 
traefik: unify TOML generation
 2020-06-19 15:23:55 +00:00
Marek Mahut b62df8ab46 nixos/wasabibackend: init 2020-06-19 16:44:21 +02:00
Frederik Rietdijk e4cd7a48f3 Merge staging-next into staging 2020-06-19 10:49:25 +02:00
Linus Heckemann aea806b8ea
Merge pull request #86177 from mayflower/mailman-upstream 
Mailman refactor
 2020-06-19 07:54:41 +02:00
Florian Klink a84cbb60f0
Merge pull request #91073 from danielfullmer/systemd-string-format 
nixos/systemd-boot: fix incorrect string formatting
 2020-06-19 02:23:25 +02:00
Daniel Fullmer 1d4dc149df nixos/systemd-boot: fix incorrect string formatting 
Currently, this always writes "default nixos-generation-%d.conf" without
replacing the "%d" in the string.
Python .format() is not equivalent to "%"
 2020-06-18 19:58:50 -04:00
Florian Klink 757ba1931f
Merge pull request #91068 from flokli/nixos-systemd-unit-path-types 
nixos/systemd: allow str in systemd.services.<name>.path
 2020-06-19 00:25:32 +02:00
Florian Klink f5f8b08f16
Merge pull request #91065 from Infinisil/move-fontultimate 
nixos/fontconfig: Move deprecated ultimate removals to relevant module
 2020-06-19 00:07:46 +02:00
Florian Klink 1c9e02b911 nixos/systemd: allow str in systemd.services.<name>.path 
Turns out, #75510 was too restrictive.

We also need to allow str here, as some modules set this to
"/run/wrappers" to bring `/run/wrappers/bin` into $PATH of a unit.
 2020-06-19 00:02:51 +02:00
Florian Klink c1e7366483
Merge pull request #75510 from helsinki-systems/systemd-path-type 
nixos/systemd: Use a proper type for unit paths
 2020-06-18 23:50:42 +02:00