Jonathan Ringer
12fd8a77e1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/top-level/aliases.nix
2022-02-10 09:21:09 -08:00
Artturi
d1ced017c0
Merge pull request #146642 from Artturin/nixosgenerateconfig2
2022-02-10 17:12:16 +02:00
Artturi
e35d057ea5
Merge pull request #151123 from Artturin/havegedupdate
2022-02-10 17:10:20 +02:00
Bobby Rong
4118c7ad03
Merge pull request #158787 : Pantheon: enable packagekit and drop appcenter patch
2022-02-10 12:56:27 +08:00
Jonathan Ringer
39669ea2b6
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/top-level/aliases.nix
2022-02-09 19:58:40 -08:00
Sandro
6a4dea5ffc
Merge pull request #158178 from j0hax/retroarch-wm
2022-02-10 01:23:37 +01:00
Martin Weinelt
607285bc0e
Merge pull request #156873 from mweinelt/wine
2022-02-09 23:55:33 +01:00
Artturin
b4adac9ba9
nixos/nixos-generate-config: move dhcpConfig from configuration.nix to hardware-configuration.nix
2022-02-09 19:35:19 +02:00
Artturin
aaf13bb3bd
nixos/nixos-generate-config: fix proram path replacements
...
btrfs-progs was made optional in 2019 c01ea27ce3
because it didn't cross-compile. it now does
2022-02-09 18:38:17 +02:00
Artturin
b2eacd1595
nixos/tools: add more keymap options to configuration template
2022-02-09 18:38:17 +02:00
Artturin
801dca549f
nixos/tools: add networkmanager to configuration template
2022-02-09 18:38:17 +02:00
Bobby Rong
ea611d2e17
nixos/pantheon: mention latest appcenter and packagekit changes in manual
2022-02-09 22:11:10 +08:00
Bobby Rong
bb357d8203
nixos/pantheon: install appcenter if flatpak is enabled
...
This is how nixos/gnome handle gnome-software.
2022-02-09 21:22:05 +08:00
Bobby Rong
e717c594ab
nixos/pantheon: enable packagekit by default
...
Needed for pantheon.appcenter.
2022-02-09 21:08:19 +08:00
Jörg Thalheim
30d7dbc2be
nixos/rsyncd: fix module eval
2022-02-09 08:21:00 +01:00
Jonathan Ringer
5df08e00cd
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/opensimplex/default.nix
pkgs/development/python-modules/pygame-gui/default.nix
pkgs/top-level/aliases.nix
pkgs/top-level/python-aliases.nix
2022-02-08 21:19:24 -08:00
Matthew Bauer
7ca33e5fcf
Merge pull request #94055 from matthewbauer/flakes-packagekit
...
packagekit: update to flakes branch
2022-02-08 20:13:22 -06:00
Matthew Bauer
92a6ad8626
packagekit: use Nix backend
...
Fixes https://github.com/NixOS/nixpkgs/issues/21230
Use Nix backend for packagekit. Updates to version with my Nix backend
for PackageKit.
2022-02-08 19:24:04 -06:00
ajs124
3ecddf791d
nixos/shellinabox: drop
2022-02-08 18:59:47 -05:00
Bernardo Meurer
363ef08971
Merge pull request #155162 from ZenithalHourlyRate/command-not-found-interactive
...
command-not-found: add interactive option for auto run
2022-02-08 15:30:05 -08:00
Bernardo Meurer
ab98adb9a6
Merge pull request #155158 from ZenithalHourlyRate/command-not-found-multiple-choice-interactive
...
command-not-found: make NIX_AUTO_RUN work when multiple choices
2022-02-08 15:29:49 -08:00
Johannes Arnold
d282f448ff
nixos/retroarch: add RetroArch as a desktop session
2022-02-08 20:52:02 +01:00
pennae
c4a6784457
Merge pull request #158611 from Xe/patch-4
...
nixos/cloud-init: fix trivial error that prevents deploy
2022-02-08 13:41:36 +00:00
Xe Iaso
1a417bc1dd
nixos/cloud-init: fix trivial error that prevents deploy
2022-02-08 08:15:27 -05:00
sternenseemann
8c27f7a2bd
haskellPackages.ghcWithPackages: throw on old override interface
...
Adding a fake override function via passthru will at least give users of
the old override interface a more helpful error message. Additionally we
also document the changes in the changelog.
2022-02-08 13:28:30 +01:00
Luke Granger-Brown
1d36731a2a
Merge pull request #158578 from delroth/iptables-docs
...
nixos/firewall: make 'networking.firewall.package' example less confusing
2022-02-08 12:11:59 +00:00
Jörg Thalheim
82f2d81b22
Merge pull request #157839 from abbradar/stage-1-modprobe
...
Modprobe options in stage-1
2022-02-08 11:43:31 +00:00
Pierre Bourdon
833bcbc844
nixos/firewall: make 'networking.firewall.package' example less confusing
...
pkgs.iptables-nftables-compat == pkgs.iptables (default) since cf9ac2b5
.
2022-02-08 10:31:09 +01:00
zowoq
5e7ec2c9ad
nixos/doc/2205: add note for go_1_17
vendorSha256
2022-02-07 18:59:53 -08:00
David Lewis
26ca9776aa
nixos/autorandr: added new KillMode
...
Prevents Udev Rule from killing processes started by autorandr
2022-02-07 18:53:22 -08:00
github-actions[bot]
335510eb84
Merge master into staging-next
2022-02-08 00:01:49 +00:00
Tom Fitzhenry
2211a7cf74
programs/calls: enable dconf
...
GNOME Calls relies on dconf. Evidence supporting this claim:
https://packages.debian.org/sid/gnome-calls depends on
dconf-gsettings-backend.
Discussed in
https://github.com/NixOS/nixpkgs/pull/136537#issuecomment-1009903194 :
2022-02-07 22:50:36 +01:00
Luke Granger-Brown
a17a7f73cb
Merge pull request #158384 from afreakk/plex-remove-unused-option
...
plex: remove unused option `managePlugins`
2022-02-07 19:52:39 +00:00
github-actions[bot]
9cdb39f965
Merge master into staging-next
2022-02-07 18:01:27 +00:00
gin66
cb648f080d
wg-netmanager: init at 0.3.6 ( #155149 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-02-07 16:46:51 +01:00
Aaron Andersen
e85182268d
Merge pull request #158167 from aanderse/nixos/cfssl
...
nixos/cfssl: use systemd StateDirectory to provision the data directory
2022-02-07 08:02:52 -05:00
github-actions[bot]
4e2cf99754
Merge master into staging-next
2022-02-07 12:01:12 +00:00
afreakk
ff85de6ce8
plex: remove unused option managePlugins
2022-02-07 10:57:40 +01:00
markuskowa
768dd74738
Merge pull request #140891 from markuskowa/os-moosefs
...
nixos: init moosefs module and test
2022-02-07 10:48:33 +01:00
Jonathan Ringer
46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/pysdl2/default.nix
pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
Sandro
5560c824c7
Merge pull request #157761 from tp-la/amazon-ec2-utils
2022-02-07 01:53:35 +01:00
Sandro
7090608b3f
Merge pull request #136521 from pacien/nixos-upower-config-time-unit
2022-02-07 01:29:46 +01:00
Sandro
255417b8f4
Merge pull request #157146 from illustris/cloudinit
2022-02-07 01:27:21 +01:00
Kevin Cox
c2038731e4
Merge pull request #158348 from schnusch/ipfs
...
nixos/ipfs: use ipfs config replace
2022-02-06 18:11:36 -05:00
Robert Hensing
8403e02a5d
Merge pull request #126769 from ncfavier/nixosSystem-lib
...
nixos: move default module location logic to `eval-config.nix`
2022-02-06 22:49:17 +01:00
schnusch
97f809dc87
nixos/ipfs: use ipfs config replace
2022-02-06 21:42:56 +01:00
Jonathan Ringer
e680c83323
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/graphics/scrot/default.nix
2022-02-06 10:36:30 -08:00
github-actions[bot]
45efe10574
Merge master into staging-next
2022-02-06 18:01:09 +00:00
Vladimír Čunát
f0f251d90a
Merge #157109 : github-runner: 2.286.0 -> 2.287.1
2022-02-06 17:19:59 +01:00
Robert Hensing
189f73465b
Merge pull request #158327 from babbaj/virtio-keyboard-option
...
nixos/qemu-vm: Create option for virtio-keyboard device
2022-02-06 16:37:00 +01:00