github-actions[bot]
3063a8ea39
Merge staging-next into staging
2022-04-05 12:10:46 +00:00
github-actions[bot]
27a4e52731
Merge master into staging-next
2022-04-05 12:05:41 +00: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
Martin Weinelt
bf1914e12a
Merge remote-tracking branch 'origin/staging-next' into staging
2022-04-05 04:05:02 +02: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
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]
17eb9da14b
Merge staging-next into staging
2022-04-04 12:06:26 +00: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
github-actions[bot]
c9154e5e14
Merge staging-next into staging
2022-04-04 00:02:45 +00:00
Martin Weinelt
bb7e4b378e
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-04 00:46:44 +02:00
Martin Weinelt
f95a3d1140
Merge remote-tracking branch 'origin/staging-next' into staging
2022-04-04 00:46:25 +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
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
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
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]
ffa96ab0c0
Merge staging-next into staging
2022-04-02 18:01:37 +00:00
github-actions[bot]
fc17fe6417
Merge master into staging-next
2022-04-02 18:01:07 +00:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/libraries/zlib/default.nix
pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
7c6f434c
8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
...
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
github-actions[bot]
66754ae952
Merge master into staging-next
2022-04-02 12:01:10 +00:00
Jan Solanti
f665340b6c
pipewire: 0.3.48 -> 0.3.49
2022-04-02 12:10:35 +02:00
github-actions[bot]
fd5d77aa66
Merge master into staging-next
2022-04-02 06:01:21 +00:00
github-actions[bot]
8b4f11bb87
Merge master into staging-next
2022-04-02 00:02:09 +00:00
Florian Klink
c57c5c42a4
prometheus-bird-exporter: update birdSocket default path
...
a5276e1fbdhttps://github.com/NixOS/nixpkgs/pull/161193#issuecomment-1086228985
2022-04-01 22:59:48 +02:00
Florian Klink
401cb86da1
Merge pull request #166142 from ncfavier/wait-online
...
nixos/networkd: add `wait-online` options
2022-04-01 22:54:28 +02:00
Zhaofeng Li
e42f06f93f
nixos/podman: Add zfs to wrapper if enabled
2022-04-02 06:38:16 +10:00
P. R. d. O
eeb3206a29
nixos/jenkinsSlave: install java
...
Installs Java into the Jenkins agent and allows specifying the JDK/JRE package to use. This is necessary as Jenkins verifies if the agent contains Java installed through the java -fullversion command, which if not, the connection will fail.
2022-04-01 22:11:18 +02:00
