Bobby Rong
745cf36f95
Merge branch 'staging-next-fix' into staging-next
2021-09-07 16:17:21 +08:00
Bobby Rong
90354922c2
nixos/doc: adjust to the new structure of kernel packages
2021-09-07 16:13:15 +08:00
Vladimír Čunát
09f5763784
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/pathspec/default.nix
The hashes are equivalent, so it's not a real conflict.
- pkgs/top-level/static.nix
I can't see a solution, deffered redoing this to the later PR:
https://github.com/NixOS/nixpkgs/pull/136849
2021-09-07 08:43:26 +02:00
Jörg Thalheim
4015c275ca
Merge pull request #129121 from bobby285271/pr13
...
nixos/doc: convert Chapter 7, 9, 10, 11, 12, 14, 15, 48 to CommonMark
2021-09-07 06:29:45 +01:00
Jörg Thalheim
e622dd1c84
Merge pull request #129154 from bobby285271/pr15
...
nixos/doc: convert Chapter 1, 3, 4 to CommonMark
2021-09-07 06:29:19 +01:00
Jörg Thalheim
c7d32059b1
Merge pull request #129136 from bobby285271/pr14
...
nixos/doc: convert "Chapter 58. Writing NixOS Modules" to CommonMark
2021-09-07 06:28:57 +01:00
Jörg Thalheim
929f0156cc
Merge pull request #128933 from bobby285271/pr5
...
nixos/doc: convert "8.1. LUKS-Encrypted File Systems" to CommonMark
2021-09-07 06:28:37 +01:00
Jörg Thalheim
48dc5e4ba6
Merge pull request #129003 from bobby285271/pr10
...
nixos/doc: convert "2.5. Additional installation notes" to CommonMark
2021-09-07 06:24:42 +01:00
Jörg Thalheim
0d789e992f
Merge pull request #128937 from bobby285271/pr8
...
nixos/doc: convert "Chapter 55. Container Management" to CommonMark
2021-09-07 06:24:21 +01:00
Jörg Thalheim
5de68de484
Merge pull request #128935 from bobby285271/pr7
...
nixos/doc: convert "Chapter 56. Troubleshooting" to CommonMark
2021-09-07 06:20:47 +01:00
Jörg Thalheim
2a55504a99
Merge pull request #128934 from bobby285271/pr6
...
nixos/doc: convert "6.2. Ad-Hoc Package Management" to CommonMark
2021-09-07 06:20:26 +01:00
Jörg Thalheim
96c98af211
Merge pull request #128892 from bobby285271/pr4
...
nixos/doc: convert "Chapter 13. Networking" to CommonMark
2021-09-07 06:20:04 +01:00
Jörg Thalheim
c0735214e1
Merge pull request #129083 from bobby285271/pr12
...
nixos/doc: convert Chapter 49, 50, 51, 52, 53, 54 to CommonMark
2021-09-07 06:19:33 +01:00
midchildan
21a7695b8a
mirakurun: build with yarn2nix
2021-09-07 12:22:59 +09:00
happysalada
9cbdd2655c
elasticsearch: auto_import_dangling_indices in single-node mode
2021-09-07 12:18:16 +09:00
happysalada
f4b40d572c
elasticsearch: update configuration
...
- transport.tcp.port -> transport.port https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.1.html
- default to start a single-node cluster https://stackoverflow.com/questions/59350069/elasticsearch-start-up-error-the-default-discovery-settings-are-unsuitable-for
2021-09-07 12:18:16 +09:00
Jörg Thalheim
6e17c53b98
Merge pull request #128885 from bobby285271/pr3
...
nixos/doc: convert "Chapter 5. Configuration Syntax" to CommonMark
2021-09-07 03:56:34 +01:00
Jörg Thalheim
b9ed8cbaff
Merge pull request #128878 from bobby285271/pr2
...
nixos/doc: convert "6.1. Declarative Package Management" to CommonMark
2021-09-07 03:55:22 +01:00
Jörg Thalheim
c0e53b6857
Merge pull request #128760 from bobby285271/master
...
nixos/doc: convert "Chapter 45. Profiles" to CommonMark
2021-09-07 03:54:22 +01:00
github-actions[bot]
79667a59e7
Merge master into staging-next
2021-09-06 00:01:28 +00:00
Anders Kaseorg
d8ef13fc13
modules/programs/command-not-found: Fix ShellCheck warnings
...
https://github.com/koalaman/shellcheck/wiki/SC2086
Double quote to prevent globbing and word splitting.
https://github.com/koalaman/shellcheck/wiki/SC2166
Prefer `[ p ] && [ q ]` as `[ p -a q ]` is not well defined.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-09-06 08:49:34 +09:00
Anders Kaseorg
d44b6ae6cb
modules/programs/bash: Fix ShellCheck warnings
...
https://github.com/koalaman/shellcheck/wiki/SC2086
Double quote to prevent globbing and word splitting.
https://github.com/koalaman/shellcheck/wiki/SC2166
Prefer `[ p ] && [ q ]` as `[ p -a q ]` is not well defined.
https://github.com/koalaman/shellcheck/wiki/SC2219
Instead of `let expr`, prefer `(( expr ))` .
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-09-06 08:49:34 +09:00
github-actions[bot]
6c9e0f15dc
Merge master into staging-next
2021-09-04 18:01:10 +00:00
Maximilian Bosch
da537dbfb8
Merge pull request #136505 from bew/update-rofi-1.7.0
...
rofi: 1.6.1 -> 1.7.0
2021-09-04 18:24:45 +02:00
github-actions[bot]
e3f1f8bba2
Merge master into staging-next
2021-09-04 00:01:34 +00:00
Robert Scott
8ae687b26b
Merge pull request #136334 from c0deaddict/master
...
release-notes: add nats service
2021-09-04 00:58:49 +01:00
Timothy DeHerrera
bb1058f1f0
Merge pull request #136534 from kevincox/synapse-server-name
...
nixos.matrix-synapse: Clarify documentation of server_name.
2021-09-03 13:07:27 -06:00
Alyssa Ross
071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next
2021-09-03 18:23:45 +00:00
Graham Christensen
3677d4bc22
kexec-tools: rename from kexectools to match the project name
2021-09-03 10:17:21 -04:00
Artturi
45b7c5b223
Merge pull request #136475 from Artturin/pipewirejackldpath
...
nixos/pipewire: use absolute path for jack libs
2021-09-03 16:36:39 +03:00
Jos van Bakel
d68d6477c2
release-notes: add nats service
2021-09-03 13:57:04 +02:00
Kevin Cox
6f7fc1c693
nixos.matrix-synapse: Clarify documentation of server_name.
...
Matrix homeservers have two important domains. The user-visible server_name and the homeserver domain which serves most of the traffic but is really seen by users. The docs around this variable said "This is used by remote servers to connect to this server" which is very confusing because most of the remote server traffic actually goes the server domain, not the server_name domain. (The server_name domain is only used to fetch the .well-known file that points at the server domain).
I largely copied the wording from https://matrix-org.github.io/synapse/latest/usage/configuration/homeserver_sample_config.html as I found it much more clear.
2021-09-02 21:27:00 -04:00
github-actions[bot]
704a7a86ca
Merge master into staging-next
2021-09-03 00:01:42 +00:00
Benoit de Chezelles
2d9bf01310
rofi: 1.6.1 -> 1.7.0
...
And add myself as a maintainer
2021-09-02 23:15:45 +02:00
Bernardo Meurer
62f6985869
Merge pull request #135182 from lovesegfault/nixos-distcc
...
nixos/distccd: init
2021-09-02 20:41:28 +00:00
github-actions[bot]
0630061ef3
Merge master into staging-next
2021-09-02 18:01:20 +00:00
Artturin
756e60344f
nixos/pipewire: use absolute path for jack libs
2021-09-02 17:17:15 +03:00
Matthias Treydte
9ce8df127d
nixos/etc: make sure local "source" files are imported to the store
...
The treatment of the "source" parameter changed
with eb7120dc79
, breaking stuff.
Before that commit, the source parameter was converted to a
string by implicit coercion, which would copy the file to the
store and yield an string containing the store path. Now, by
the virtue of escapeShellArg, toString is called explicitly on
that path, which will yield an string containing the absolute
path of the file.
This commit restores the old behavior.
2021-09-02 15:50:44 +02:00
github-actions[bot]
3cc5df2052
Merge master into staging-next
2021-09-02 12:01:09 +00:00
Michele Guerini Rocco
052009bf2b
Merge pull request #135315 from johnjameswhitman/johnjameswhitman/fix-wlan-sub-interfaces
...
nixos/tasks/network-interfaces: Assign mac to new wlan interface instead of underlying one
2021-09-02 09:37:04 +02:00
github-actions[bot]
ba543de038
Merge master into staging-next
2021-09-02 06:01:01 +00:00
Aaron Andersen
abfdb24af0
Merge pull request #125687 from malte-v/soju-module-new
...
nixos/soju: add module
2021-09-01 22:09:44 -04:00
happysalada
4ddc5c6b2a
elasticsearch: remove logic for version less than 6
2021-09-02 10:57:02 +09:00
happysalada
d58fa9e445
elasticsearch: fix jvm gc log path
2021-09-02 10:57:02 +09:00
happysalada
e13906fff0
elasticsearch: nixpkgs-fmt
2021-09-02 10:57:02 +09:00
John Whitman
8d3527aa88
nixos/network-interfaces: Fix wlan interface mac
2021-09-01 21:46:26 -04:00
Raphael Megzari
acf0098bb0
Merge branch 'master' into staging-next
2021-09-02 10:20:23 +09:00
Jan Tojnar
07978cddab
Merge pull request #136071 from jtojnar/gnome-qpa
...
nixos/gnome: enable platform integration for Qt
2021-09-02 03:06:55 +02:00
github-actions[bot]
ce1d6621cd
Merge master into staging-next
2021-09-02 00:01:38 +00:00
Aaron Andersen
186df90343
Merge pull request #135108 from p3psi-boo/master
...
clfswm: support custom package
2021-09-01 15:45:18 -04:00