Martin Weinelt
d9341eafa2
Merge branch 'master' into staging-next
2021-09-10 15:04:01 +02:00
Jörg Thalheim
c2b276369d
Merge pull request #137224 from helsinki-systems/dry-activation-scripts-to-changelog
...
nixos/release-notes: Document dry activation scripts
2021-09-10 11:19:12 +01:00
github-actions[bot]
3f7ad651c7
Merge master into staging-next
2021-09-10 06:01:06 +00:00
happysalada
75c7c16df2
release-docs: add ipfs localdiscovery false change
2021-09-10 09:39:55 +09:00
github-actions[bot]
912b8082df
Merge master into staging-next
2021-09-10 00:01:31 +00:00
Janne Heß
23b21c77f6
nixos/release-notes: Document dry activation scripts
2021-09-09 22:32:55 +02:00
Timothy DeHerrera
6dbeb3190d
Merge pull request #126544 from jonringer/nixos-rebuild-use-substitutes
...
nixos-rebuild: add --use-substitutes option
2021-09-09 13:53:37 -06:00
github-actions[bot]
58f8f1f058
Merge master into staging-next
2021-09-08 00:01:42 +00:00
Jan Tojnar
1e75936926
Merge pull request #130047 from NixOS/doc-manpage-role
...
doc: Add support for manpage references
2021-09-07 21:29:26 +02:00
github-actions[bot]
80cab1d056
Merge master into staging-next
2021-09-07 18:01:08 +00:00
Ryan Mulligan
c863de29a7
nixos/doc/md-to-db.sh: handle Docbook inclues in CommonMark
...
You can do includes like this:
```{=docbook}
<xi:include href="rl-2111.section.xml" />
```
2021-09-07 06:29:21 -07:00
github-actions[bot]
fbefda3466
Merge master into staging-next
2021-09-07 12:01:13 +00:00
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
00f361a846
Merge pull request #129074 from bobby285271/pr11
...
nixos/doc: convert Chapter 57, 59, 60, 63 to CommonMark
2021-09-07 07:15:42 +01: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
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]
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
Jos van Bakel
d68d6477c2
release-notes: add nats service
2021-09-03 13:57:04 +02: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
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
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
Alyssa Ross
c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
2021-09-01 07:47:01 +00:00
Eric Bailey
c87483cb55
kops: 1.21.0 -> 1.21.1 ( #136057 )
2021-08-31 11:55:30 +02:00
Malte Voos
9d822d2047
nixos/soju: add 21.11 release notes entry
2021-08-30 16:28:07 +02:00
Jan Tojnar
47afdc4627
nixos/gnome: enable platform integration for Qt
...
Qt links against GTK to be able to use native GTK file chooser
in GTK-oriented DEs. However, GTK expects a specific environment,
which means the application needs to be wrapped to prevent crashes
when file chooser is opened in some environments.
This patch bypasses the need for wrapping Qt applications with GTK-related
environment since the file chooser dialogue will now come from a separate
process (instantiated by the XDG desktop portal via D-Bus).
In the future, we could remove the GTK dependency from Qt to fix the crashes
on non-{GNOME,Pantheon} environments. Then, users would be able to choose
between non-native Qt dialogue or native one facilitated by XDG portals
(e.g. through setting `QT_QPA_PLATFORMTHEME` to either `qgnomeplatform`,
or `xdgdesktopportal`).
One disadvantage is adding a Qt dependency to GNOME, even for people
who might not use any Qt apps. But they can easily just add `qt5.enable = false;`
to their NixOS configuration.
The configuration is also presumably less battle tested than plain Qt
with its first-party GTK integration. But it is backed by Fedora
and used by Manjaro GNOME so it cannot be that bad.
Lastly, I worry about ABI compatibility of the platform modules
with apps installed from different Nixpkgs revision.
2021-08-29 04:23:34 +02:00
github-actions[bot]
8fb1ff7c31
Merge master into staging-next
2021-08-26 18:01:02 +00:00
Martin Weinelt
7e1cdd2548
Merge pull request #133504 from Luis-Hebendanz/fix_firefox2
...
firefox: Added checks for new addon behaviour since v91
2021-08-26 19:51:08 +02:00
davidak
55f48acce6
Merge pull request #125901 from anubhavkini/update-todoman
...
todoman: 3.9.0 -> 4.0.0
2021-08-26 19:25:52 +02:00
Sandro
1fc2520df1
Merge pull request #135524 from d-xo/erigon-2021-08-04
...
Erigon 2021-08-04
2021-08-26 15:44:29 +02:00
Anubhav Kini
ebe32d542f
todoman: 3.9.0 -> 4.0.0
2021-08-26 12:32:50 +05:30
Vladimír Čunát
70e05c1003
Merge branch 'master' into staging-next
2021-08-25 19:42:15 +02:00
lucasew
83514ae7a9
lib.formats.yaml: use well known YAML format
...
The way `(lib.formats.yaml {}).generate` generates YAML is compliant
because on YAML 1.2 spec JSON is a subset of YAML but it bugs people's
minds and can lead to problems with software that is not compatible with
YAML 1.2.
This commit also changes the test of the generation function. Data
validation/typing remains the same.
See #133802 .
Signed-off-by: lucasew <lucas59356@gmail.com>
2021-08-25 14:02:59 +02:00
Sandro
49b5beea43
Merge pull request #128624 from vs49688/exfat
2021-08-25 12:24:39 +02:00