Commit Graph

41288 Commits

Author SHA1 Message Date
Robert Hensing
b096badfeb nixos/activation-script: Add lib.sh with warn()
(cherry picked from commit 1022da85ab)
2024-07-28 11:31:41 +00:00
Vladimir Panteleev
98bccac2f9 nix-channel: do not set empty nix-path when disabling channels
An empty nix-path in nix.conf will disable NIX_PATH environment variable
entirely, which is not necessarily implied by users who want to disable
nix channels. NIX_PATH also has some usages in tools like nixos-rebuild
or just as user aliases.

That change is surprising and debatable, and also caused breakages in
nixpkgs-review and user configs.

See:
- https://github.com/NixOS/nixpkgs/pull/242098/files#r1269891427
- https://github.com/Mic92/nixpkgs-review/issues/343
- https://github.com/NixOS/nix/pull/10998

Co-authored-by: oxalica <oxalicc@pm.me>
(cherry picked from commit 1e6acabaeb)
2024-07-28 11:31:41 +00:00
Sandro Jäckel
d24055bd37 nixos/plasma6: enable programs.kde-pim by default
(cherry picked from commit 4169ba8920)
2024-07-27 22:07:50 +00:00
Sandro Jäckel
e6dacc093c programs/kde-pim: init
(cherry picked from commit aa5ebae159)
2024-07-27 22:07:50 +00:00
Yaya
290dd599d9 nixosTests.gitlab: add git package
(cherry picked from commit 66f9d60dd7)
2024-07-25 23:23:31 +02:00
Yaya
7f19bbe215 nixos/gitlab: Replace git package with bundled git
This commit switches gitaly's git package from `pkgs.git` to the bundled
`git` package in order to maintain compatibility with the supported git
release by gitaly.

(cherry picked from commit feeb53a430)
2024-07-25 23:23:31 +02:00
Benno Bielmeier
4fdb8ffc8d nixos/graylog: add option dataDir
in order to use this nixos module with Graylog 6.0, in which

> the default value for the data_dir configuration option has been
> removed and must be specified in graylog.conf [1].
> -- https://go2docs.graylog.org/current/upgrading_graylog/upgrading_to_graylog_6.0.x.htm

The value set by default is the same as before introducing this option.
See also [1,2]

[1]: https://go2docs.graylog.org/current/setting_up_graylog/server.conf.html
[2]: https://go2docs.graylog.org/5-2/setting_up_graylog/server.conf.html

(cherry picked from commit ed904c256f)
2024-07-22 23:33:20 +00:00
Bjørn Forsman
ea73e7ae9d nixos/dictd: treat SIGTERM exit status as success
dictd doesn't handle SIGTERM and terminates with code 143 (128 + 15
(SIGTERM) instead of 0. This results in systemd marking the service as
failed when a user stops it (with `systemctl stop dictd`). Fix it by
treating code 143 as success.

(cherry picked from commit 7db3dc0fa4)
2024-07-22 17:31:20 +02:00
Franz Pletz
38ad1f17e7 nixos/proxmox-lxc: fix nixos-rebuild
Same is being done in lxc-container module.

(cherry picked from commit ceafec213f)
2024-07-21 07:10:11 +00:00
Franz Pletz
6ab0cafeae nixos/proxmox-lxc: fix getty start
Otherwise there is no getty on tty1 in Proxmox.

(cherry picked from commit c501d3fa97)
2024-07-21 07:10:11 +00:00
Franz Pletz
f9b9828216 nixos/proxmox-lxc: reformat
(cherry picked from commit 4aa419c046)
2024-07-21 07:10:11 +00:00
Franz Pletz
83887abeed
Merge pull request #328838 from NixOS/backport-320075-to-release-24.05 2024-07-21 09:09:27 +02:00
Franz Pletz
924059143b
Merge pull request #328837 from NixOS/backport-267764-to-release-24.05 2024-07-21 09:09:15 +02:00
illustris
5a65ef0b08 nixos/proxmox-lxc: fix ping in unprivileged LXCs
(cherry picked from commit 01b159092f)
2024-07-21 06:25:34 +00:00
Brendan Golden
f879790bc1 nixos/proxmox-lxc: allow importing module without activation, for used in mixed machine clusters
(cherry picked from commit c20f3b70ab)
2024-07-21 06:25:04 +00:00
illustris
fe84f99154 nixos/proxmox-lxc: fix console access (#307163)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit da799551a4)
2024-07-21 06:24:24 +00:00
Peder Bergebakken Sundt
272ab0c0c6
Merge pull request #327625 from NixOS/backport-327324-to-release-24.05
[Backport release-24.05] programs.ydotool: remove invalid systemd directive
2024-07-20 18:38:35 +02:00
Guillaume Girol
7f14f6aaaf
Merge pull request #327154 from NixOS/backport-318897-to-release-24.05
[Backport release-24.05] nixos/btrbk: undeprecate extraPackages
2024-07-20 18:00:27 +02:00
Pol Dellaiera
c34bfade68 nixos/boot: use --replace-fail
(cherry picked from commit f2318b9d58)
2024-07-19 20:53:12 +00:00
Franz Pletz
18e1e8ec7c
Merge pull request #327386 from NixOS/backport-325589-to-release-24.05 2024-07-16 16:38:22 +02:00
Zitrone
651684c92b programs.ydotool: remove invalid systemd directive
fixes #327156

(cherry picked from commit 10c8868b7f)
2024-07-16 11:25:14 +00:00
Cosima Neidahl
f49f761cd3
Merge pull request #327152 from NixOS/backport-324663-to-release-24.05
[Backport release-24.05] lomiri.teleports: init at 1.20
2024-07-16 08:07:33 +02:00
wskeele
83caf04904 nixos/duplicity: Add support for --include-filelist / --exclude-filelist
(cherry picked from commit fff878e7c6)
2024-07-15 14:35:46 +00:00
Robert Hensing
77df3f1792
Update nixos/modules/installer/tools/nix-fallback-paths.nix
Co-authored-by: Emily <vcs@emily.moe>
2024-07-14 20:06:56 +02:00
Guillaume Girol
4d3f56b92c nixos/btrbk: undeprecate extraPackages
it is required on systems where ssh access is configured for
lz4-compressed btrfs send, but no instances are present.

fixes https://github.com/NixOS/nixpkgs/issues/316676

(cherry picked from commit 952b1a3d96)
2024-07-14 17:14:19 +00:00
OPNA2608
ac799e549f nixos/lomiri: Add teleports
(cherry picked from commit 77aaa0695f)
2024-07-14 16:48:22 +00:00
OPNA2608
f6cd0d58b3 tests/teleports: init
(cherry picked from commit e5ad7914a8)
2024-07-14 16:48:22 +00:00
Jean-François Roche
d05d904cec nixVersions.nix_2_18: 2.18.4 -> 2.18.5
Fix sandbox on macos.

More details here: https://github.com/NixOS/nix/compare/2.18.4...2.18.5

(cherry picked from commit c08c79536c)
2024-07-11 12:30:26 +00:00
Sandro
89bc15e14e
Merge pull request #323423 from NixOS/backport-278982-to-release-24.05 2024-07-10 16:28:43 +02:00
Franz Pletz
e424737b35
Merge pull request #325852 from fpletz/backport-325377-to-release-24.05 2024-07-10 15:33:25 +02:00
abysssol
18a35d93f2
Merge pull request #325791 from abysssol/ollama-fix-override
[24.05] nixos/ollama: make overrides compatible with unstable package
2024-07-10 10:38:41 +00:00
abysssol
f95457b3e8 [24.05] nixos/ollama: make overrides compatible with unstable package
The unstable package no longer uses `linuxPackages` for nvidia/cuda,
so when `services.ollama.package = unstable.ollama;` is set,
the unstable package is overridden with `linuxPackages` causing a build failure.
2024-07-10 06:36:04 -04:00
Martin Weinelt
abd2967927
Merge pull request #325672 from mweinelt/24.05/firefox-128.0
[release-24.05] Firefox: 127.0.2 -> 128.0; 115.12.0esr -> 115.13.0esr; init 128.0esr
2024-07-10 01:32:14 +02:00
Cosima Neidahl
a4dd777ab9
Merge pull request #325886 from NixOS/backport-325247-to-release-24.05
[Backport release-24.05] lomiri.*: Revert GLib workarounds
2024-07-09 22:07:52 +02:00
Leonardo Eugênio
aa01c35210
[Backport release-24.05] virtualbox & virtualboxGuestAdditions: cleanup (#318311)
* virtualbox: remove with lib

* virtualboxGuestAdditions: remove with lib

* virtualboxGuestAdditions: move more buildInputs to nativeBuildInputs

* virtualbox: introduce finalAttrs

* virtualbox: remove old patch

* virtualboxGuestAdditions: Add dragAndDrop service

* fixup! virtualboxGuestAdditions: Add dragAndDrop service

* virtualbox: disable VBOX_WITH_UPDATE_AGENT

* virtualboxGuestAdditions: disable VBOX_WITH_UPDATE_AGENT

* virtualboxGuestAdditions: disable more includes

* virtualboxGuestAdditions: ignore more includes when building

* virtualboxGuestAdditions: cleanup

* virtualboxGuestAdditions: remove alsa & pulse deps

* virtualboxGuestAdditions: remove makeWrapper dep

* virtualboxGuestAdditions: use nix packaged lzma

* virtualbox: remove nasm

* Update nixos/modules/virtualisation/virtualbox-guest.nix

---------

Co-authored-by: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2024-07-09 17:53:41 +02:00
OPNA2608
327e47ef03 Revert "lomiri.telephony-service: Mark broken & exclude everywhere"
This reverts commit 3ef60ac499.

(cherry picked from commit c34ee327e6)
2024-07-09 15:52:19 +00:00
Hugh O'Brien
467e433357
profiles/qemu_guest: add virtio_gpu to initrd
(cherry picked from commit 66b896630d)
2024-07-09 15:56:30 +02:00
Bjørn Forsman
58f859572d nixos/deconz: treat SIGTERM exit status as success
deconz doesn't handle SIGTERM and terminates with code 143 (128 + 15
(SIGTERM) instead of 0. This results in systemd marking the service as
failed when a user stops it (with `systemctl stop deconz`). Fix it by
treating code 143 as success.

(cherry picked from commit 5aab6344c2)
2024-07-09 13:08:06 +00:00
Martin Weinelt
3b6aec240d
firefox-esr-128-unwrapped: init at 128.0esr
(cherry picked from commit 6d85f70d35)
2024-07-09 13:06:53 +02:00
Judson Lester
298692111e (lorri) (update tests)
(cherry picked from commit c862b97f72)
2024-07-09 12:46:59 +02:00
OPNA2608
e67f19672d nixos/lomiri: Add clock
(cherry picked from commit 2204726a6d)
2024-07-08 15:51:51 +00:00
OPNA2608
6e7550e08f tests/lomiri-clock-app: init
(cherry picked from commit 3efabb3359)
2024-07-08 15:51:51 +00:00
OPNA2608
08baeb4b3d nixos/lomiri: Add calculator
(cherry picked from commit 60f68545b1)
2024-07-07 22:30:45 +00:00
OPNA2608
c23c8976ed tests/lomiri-calculator-app: init
(cherry picked from commit 7a3cb59d2a)
2024-07-07 22:30:45 +00:00
OPNA2608
4eeded0054 tests/lomiri: Add polkit agent test
(cherry picked from commit 3a788099cd)
2024-07-06 22:48:24 +00:00
OPNA2608
740a982d63 nixos/lomiri: Add polkit agent
(cherry picked from commit 916ba54f24)
2024-07-06 22:48:24 +00:00
Weijia Wang
d6285bd3f0
Merge pull request #324886 from eclairevoyant/backport-322386-to-release-24.05
[24.05] treewide: remove jonringer as package maintainer and code owner
2024-07-06 02:35:55 +02:00
Paul Meyer
c908aa4ffd
treewide: remove jonringer as package maintainer
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
(cherry picked from commit fbe8538aa1)
2024-07-05 15:52:33 -04:00
OPNA2608
6a83f618e0 tests/lomiri: Fix OCR detection
(cherry picked from commit ad6c2fc76f)
2024-07-05 07:09:24 +00:00
Yaya
f2a40608e6 nixos/gitlab: Add missing state folder 2024-07-05 01:56:06 +02:00