Commit graph

26579 commits

Author SHA1 Message Date
github-actions[bot] 27a4e52731
Merge master into staging-next 2022-04-05 12:05:41 +00:00
ajs124 41c440bebe
Merge pull request #167315 from Lassulus/systemd-disk-image
make-disk-image: add systemdMinimal to PATH
2022-04-05 13:17:55 +02:00
ajs124 bfa9a7eb22
Merge pull request #167270 from ryantm/vaultwarden-test
nixos/vaultwarden: fix test
2022-04-05 12:15:40 +02:00
lassulus ed18db011f make-disk-image: add systemdMinimal to PATH
this is needed to setup /tmp inside the chroot. which is needed by
systemd-boot to sucessfully install
2022-04-05 11:57:53 +02:00
Lassulus b69bd66518
Merge pull request #167242 from helsinki-systems/feat/systemd-stage-1-variable-bin
nixos/systemd-stage-1: Softcode bin tools...
2022-04-05 09:39:19 +01:00
Robert Hensing 7dabcdbcf4
Merge pull request #167287 from qowoz/dockertools
dockerTools: various
2022-04-05 09:42:26 +02:00
Matthieu Coudron d396c7d316
Merge pull request #166941 from teto/vim-plugins-toml 2022-04-05 09:33:40 +02:00
Ryan Mulligan 0555c738b5 nixos/vaultwarden: fix test
The accept policies checkbox is no longer present on the user creation
screen.
2022-04-04 20:29:09 -07:00
zowoq 76636e0099 dockerTools: pkgs.system -> pkgs.stdenv.hostPlatform.system
`pkgs.system` is an alias
2022-04-05 10:19:40 +10:00
Janne Heß acf089edef
nixos/systemd-stage-1: Softcode bin tools...
...and other cleanups and fixes
2022-04-04 22:56:31 +01:00
github-actions[bot] 5844b1c2fa
Merge master into staging-next 2022-04-04 18:01:27 +00:00
Bernardo Meurer 974ce2dffa
Merge pull request #167209 from bjornfor/ethminer-remove-unneeded-nvidia-dep
nixos/ethminer: only pull in nvidia_x11 when needed
2022-04-04 10:46:44 -07:00
Bjørn Forsman c1af79c69d nixos/ethminer: only pull in nvidia_x11 when needed
Only people using CUDA need it.
2022-04-04 19:27:20 +02:00
Lassulus 5083d22ec5
Merge pull request #167167 from helsinki-systems/feat/systemd-stage-1-less-systemd-files
nixos/stage-1-systemd: Limit files to the bare necessities
2022-04-04 18:25:55 +01:00
Janne Heß 41d3ca0677
nixos/systemd-stage-1: Use an own systemd package
We need more features than systemdMinimal but less than systemd so we
need some own packages :/
2022-04-04 18:12:45 +01:00
Martin Weinelt c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
Lassulus 33a73886c4
Merge pull request #167153 from helsinki-systems/feat/systemd-stage-1-jobscripts
nixos/stage-1-systemd: Implement job scripts
2022-04-04 14:15:22 +01:00
Janne Heß beb02229fb
nixos/systemd-unit-options: Fix indentation 2022-04-04 13:53:58 +01:00
Robert Hensing dd0d10bbb6
Merge pull request #165583 from bosu/patch-1
nixos/qemu-vm: allow booting VM with the custom kernel
2022-04-04 14:33:35 +02:00
github-actions[bot] ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
Janne Heß 75ece4eb82
nixos/stage-1-systemd: Limit files to the bare necessities 2022-04-04 12:54:18 +01:00
Janne Heß 4b9efea255
nixos/stage-1-systemd: Implement job scripts 2022-04-04 11:44:31 +01:00
Bjørn Forsman 966953354c nixos/ethminer: fix option types for maxPower, recheckInterval
Neither power nor time intervals can be negative, let's use unsigned
int.
2022-04-04 11:50:24 +02:00
Bjørn Forsman 5e38d36a6b nixos/ethminer: only pull in cudatoolkit when needed 2022-04-04 11:50:24 +02:00
Timo Kaufmann b44f7ed2c2
Merge pull request #166250 from gador/pgadmin-update-6.7
pgadimin4: 6.5 -> 6.7
2022-04-04 10:07:08 +02:00
Martin Weinelt bb7e4b378e Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 00:46:44 +02:00
Martin Weinelt bc4b9eef3c
Merge pull request #167061 from Artturin/fixtestevalhib 2022-04-03 20:54:34 +02:00
Janne Heß 95a0726449
Merge pull request #167048 from helsinki-systems/fix/test-boot-cdrom
nixos/tests/boot: fix after aa0f27abb0
2022-04-03 20:52:04 +02:00
Artturin 65725c1637 nixos/tests/hibernate: fix eval
by removing duplicate `nodes`
2022-04-03 21:35:05 +03:00
Janne Heß 56b4653904
nixos/stage-2-init: Re-add creation of /etc 2022-04-03 19:03:16 +01:00
github-actions[bot] c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Lassulus f465a5cdf8
Merge pull request #137335 from dsg22/feature-jupyter-create-system-user
jupyter: Create jupyter user as system user
2022-04-03 18:22:04 +01:00
Michael Weiss a378300562
Merge pull request #136040 from xaverdh/adb-open
nixos/adb: switch to android-tools built from source
2022-04-03 18:56:49 +02:00
Martin Weinelt eb40e8633a
Merge pull request #167027 from helsinki-systems/drop/broken 2022-04-03 18:29:26 +02:00
ajs124 4e9f1e537e nixos/tests/boot: fix after aa0f27abb0 2022-04-03 17:24:05 +01:00
Guillaume Girol aafec3d778
Merge pull request #166154 from YoshiRulz/yoshi-manual
Manual: move note re: `useOSProber` option under GRUB subheading
2022-04-03 16:17:48 +00:00
Matthieu Coudron 84fd282788 doc: mention the new format expected by the new vim updater
e.g., from simple strings to csv
2022-04-03 18:14:14 +02:00
Guillaume Girol 23bcd51fd5
Merge pull request #161075 from symphorien/collectd-interval
nixos/collectd: put extraconfig before plugins
2022-04-03 15:59:49 +00:00
Martin Weinelt f2a00b4079
Merge pull request #163658 from dminuoso/kea-changes 2022-04-03 17:44:19 +02:00
Victor Nawothnig 799bda94db nixos/kea: Allow specifying custom config file 2022-04-03 17:34:00 +02:00
Guillaume Girol 44a3d91e5f nixos/collectd: put extraconfig before plugins
this is necessary to override the global option Interval.
If set after the plugins, it has no effect.
2022-04-03 17:25:26 +02:00
ajs124 eb13e249f0 openfire: remove after being marked broken for over two years
It was marked in commit 567c1a360f by Michael Raskin on 2017-01-04 (commited on 2017-01-04)
2022-04-03 16:14:18 +01:00
Guillaume Girol f9fe536c8f
Merge pull request #165873 from symphorien/rkjnsn-master
xfce4-screensaver: init at 4.16.0
2022-04-03 15:09:08 +00:00
Janne Heß 371504ac8e
Merge pull request #167019 from NixOS/fix/systemd-env
nixos/stage-2-init: Don't clear environment
2022-04-03 16:36:26 +02:00
Janne Heß 7cdc4dd5d1
Merge pull request #164943 from ElvishJerricco/systemd-initrd-reuse-systemd-module
initrd: Opt-in bare bones systemd-based initrd
2022-04-03 15:53:02 +02:00
Lassulus e65b825672
Merge pull request #165684 from helsinki-systems/clean/stage-2-init
nixos/stage-2-init: Clean up legacy commands
2022-04-03 14:12:52 +02:00
Janne Heß ea473fac72
nixos/stage-2-init: Don't clear environment
This breaks NixOS Containers because systemd needs some env variables
from the outside.
2022-04-03 11:12:00 +01:00
github-actions[bot] fc36f69a60
Merge master into staging-next 2022-04-03 00:02:50 +00:00
Peter Hoeg e38cc45dd1 nixos: add maestral tests 2022-04-03 03:37:22 +08:00
github-actions[bot] fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00