Commit Graph

9679 Commits (release-18.03-flake)

Author SHA1 Message Date
Natalie Adams bd6e65e0fb updating flake 2023-04-13 22:30:45 -05:00
Natalie Adams bcc2a98af4 updating flake 2023-04-13 21:55:54 -05:00
Natalie Adams 54526004fa updating flake 2023-04-13 21:54:20 -05:00
Natalie Adams e11a246049 updating flake 2023-04-13 21:52:01 -05:00
Matthew Bauer c8c521f0c0 nixos-rebuild: get Nix from channel
If our old Nix can’t evaluate the Nixpkgs channel, try the fallback
from the new channel /first/. That way we can upgrade Nix to a newer
version and support breaking changes to Nix (like seen in the upgrade
o Nix 2.0).

This change should be backported to older NixOS versions!

(cherry picked from commit 475c8aa018bbdd99e7e9d693c7207cdccdcde7b3)
2019-03-02 18:53:35 -05:00
Ján Hrnko 4d6e4b9652 nixos/trezord: revised and updated udev rules
(cherry picked from commit a88e0ef9aa79ec3910898b056e087e9452c1964d)
2018-10-26 16:22:25 +02:00
1000101 ec88e0c9b6 nixos/trezord: revised and updated udev rules 2018-09-24 19:45:46 +02:00
Arcadio Rubio García a37638d467
nixos: stumpwm: switch from package marked as broken to working quicklisp package (#40501)
(cherry picked from commit efde5fefb3a55d3aeebf69332d7d1223e4432413)
2018-08-30 21:03:26 +02:00
Tuomas Tynkkynen 7fc7886203 nixos/qemu-vm: Always add a virtio RNG device to the quest
mke2fs has this annoying property that it uses getrandom() to get random
numbers (for whatever purposes) which blocks until the kernel's secure
RNG has sufficient entropy, which it usually doesn't in the early boot
(except if your CPU supports RDRAND) where we may need to create the
root disk.

So let's give the VM a virtio RNG to avoid the boot getting stuck at
mke2fs.

(cherry picked from commit dda74d9e50dbd8a412de743a53e9cfd585407342)
2018-08-18 15:47:33 +03:00
aszlig da9efe97d9
nixos/systemd: Allow to override serviceConfig
This has been reported by @qknight in his Stack Overflow question:

https://stackoverflow.com/q/50678639

The correct way to override a single value would be to use something
like this:

systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no";

However, this doesn't work because the check is applied for the attrsOf
type and thus the attribute values might still contain the attribute set
created by mkOverride.

The unitOption type however did already account for this, but at this
stage it's already too late.

So now the actual value is unpacked while checking the values of the
attribute set, which should allow us to override values in
serviceConfig.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @qknight
(cherry picked from commit 0e7c945e15117e88ac494e29c9828ccea2ec32ee)
Reason: Another user has hit this problem on Discourse[1] and I thought
        I had already backported it to 18.03, apparently I didn't. Given
        the time of the original commit I think this had enough testing
        already so it shouldn't break anything and rather make things
        less annoying.
[1]: https://discourse.nixos.org/t/is-there-a-universal-way-to-enable-a-service-auto-restart/592/3
2018-08-16 06:53:18 +02:00
Vladimír Čunát 3b6ec08719
Revert "nixos tests: temporarily disable nfs tests"
Fixes #43473.  The latest kernel bumps apparently solved it.
This reverts 99adfd0a, d6c6c7fce, b9dccd8fa.
2018-08-04 11:28:52 +02:00
WilliButz 979d823f53
nixos/prometheus-exporters: use nixos-fw chain
Use nixos-fw chain instead of INPUT so that the rules don't keep
stacking everytime the firewall is reloaded.
This also adds a comment to each rule about the associated exporter.

(cherry picked from commit 9216da8928bc17878635ef50dac089f01a8c6466)
2018-08-03 23:53:14 +02:00
markuskowa 728c28f934 beegfs/module: Fix a typo in meta.conf generation (#40979) (#44326)
This typo places mgtmd.extraConf in meta.conf
leading to meta.extraConf being ignored.
2018-08-02 09:00:54 +02:00
Michael Weiss bb5988dd1c nixos/switch-to-configuration: Never stop system.slice
Problem: Restarting (stopping) system.slice would not only stop X11 but
also most system units/services. We obviously don't want this happening
to users when they switch from 18.03 to 18.09 or nixos-unstable.

Reason: The following change in systemd:
d8e5a93382

The commit adds system.slice to the perpetual units, which means
removing the unit file and adding it to the source code. This is done so
that system.slice can't be stopped anymore but in our case it ironically
would cause this script to stop system.slice because the unit file was
removed (and an older systemd version is still running).

Related issue: https://github.com/NixOS/nixpkgs/issues/39791

(cherry picked from commit 7098b0fcdfd7fa4b82c036d8116b60b78f497316)
Reason: Make sure that this problem wouldn't occur if we would update
the systemd version.
2018-08-02 01:12:02 +02:00
Jean-Philippe Braun 1596c81382 nixos/kubernetes: fix kubelet cgroup stats
https://github.com/kubernetes/kubernetes/issues/56850
(cherry picked from commit 76c7cc0f30d6b0bcd690e2d22b180e8b171ce544)
2018-08-01 23:37:10 +01:00
Daniël de Kok 717e9e4123 gitea: fix undefined variable 'gitea'.
Commit 42c35dea37, which is a cherry-pick
of 28c20a4731da9d5ba539e2d1ef6bcf3ddf1026ac uses the variable 'gitea',
which is not defined in the 18.03 module.

Fix this by: gitea -> pkgs.gitea
2018-08-01 08:09:25 +02:00
Eelco Dolstra afffbe50fb EC2 AMIs: 18.03.131792.becbe4dbe16 -> 18.03.132946.1caae7247b8
(cherry picked from commit c9ea04b57f898d6093e16b48abe5d964b355f542)
2018-07-24 21:21:00 +02:00
Eelco Dolstra dba78f04c2 create-amis.sh: Change directory for AMIs
(cherry picked from commit b240822cfaa80145491b7fcfe6421d7a10f6de94)
2018-07-24 21:20:59 +02:00
Tobias Happ 42c35dea37 nixos/gitea: fix pre start script
The hooks directory contains now one level deep subdirectories which
need to be updated as well.
If you use gitea via ssh, ~/.ssh/authorized_keys also needs to be
updated because of the hardcoded path to gitea in the "command" option.

(cherry picked from commit 28c20a4731da9d5ba539e2d1ef6bcf3ddf1026ac)
2018-07-23 11:41:37 +01:00
Vladimír Čunát 99adfd0a42
nixos tests: bring back non-blocking nfs tests
... at least for the big combined jobset where it's easy.
I don't know what I was thinking; this is clearly a better way.
2018-07-20 17:24:18 +02:00
Vladimír Čunát d6c6c7fcec
fixup: nixos tests: temporarily disable nfs tests
We really have these things spread over too many files.
2018-07-20 16:40:00 +02:00
Vladimír Čunát b9dccd8fa1
nixos tests: temporarily disable nfs tests (/cc #43473)
The regression in ext4 kernel code appears to cause no real issue
to anyone, so I hate it would block other fixes from 18.03 for longer
than a full week.
(The ext4 changes themselves fix some CVE, though apparently minor.)
2018-07-20 13:23:51 +02:00
Graham Christensen f872318e76
networking: Fix timeout when `lo` has aliased IPs
With a config like

    {
      networking.interfaces."lo".ip4 = [
        { address = "10.8.8.8"; prefixLength = 32; }
      ];
    }

a nixos-rebuild switch would take a long time, and you'd see:

    $ systemctl list-jobs
       JOB UNIT                                TYPE  STATE
    734400 network-interfaces.target           start waiting
    734450 sys-subsystem-net-devices-lo.device start running
    734449 network-link-lo.service             start waiting

and:

    systemd[1]: sys-subsystem-net-devices-lo.device: Job sys-subsystem-net-devices-lo.device/star>
    systemd[1]: sys-subsystem-net-devices-lo.device: Job sys-subsystem-net-devices-lo.device/star>
    systemd[1]: Timed out waiting for device sys-subsystem-net-devices-lo.device.

This removes the device dependency for `lo` and fixes this bug.

Closes #7227

(cherry picked from commit 48d292e8a14bec3926dc3963e167859b35fc60af)
2018-07-06 17:17:23 -04:00
Rickard Nilsson 5a566004a2 nixos: Fix error in assertion (introduced by #41715) 2018-07-03 14:11:00 +02:00
Rickard Nilsson dad6f732d5
Merge pull request #41715 from rickynils/networkmanager-dynamichosts
nixos: Add option networking.networkmanager.dynamicHosts
2018-07-03 12:26:58 +02:00
Florian Klink 192179b875 manual: rename user added to networkmanager from "youruser" to "alice"
to be consistent with the rest of the manual

Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
(cherry picked from commit 329983f6c72bf5acf68cdfd29bf1a9dac7050968)
2018-06-30 01:09:04 +02:00
Florian Klink 3a5f893de2 manual: rename users.extraUsers to users.users
Is called like this since 14321ae, but
docs were still using the old option in some cases.

Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
(cherry picked from commit 6cabce9abd916f219c1c003719f2e8ba547654c3)
2018-06-30 01:08:50 +02:00
Bas van Dijk 942097db53 chrony: disable the whole timesyncd module when chronyd is enabled
Peviously only the timesyncd systemd unit was disabled. This meant
that when you activate a system that has chronyd enabled the following
strange startup behaviour takes place:

  systemd[1]: Starting chrony NTP daemon...
  systemd[1]: Stopping Network Time Synchronization...
  systemd[1]: Stopped chrony NTP daemon.
  systemd[1]: Starting Network Time Synchronization...

(cherry picked from commit 56ef1068488c64af7c1e5b811caa24255a818bf4)
2018-06-22 12:12:40 +02:00
Jörg Thalheim 43d3e539c5
Merge pull request #42182 from markuskowa/pgbackup-18.03
nixos-18.03/pgbackup: Fix bug in postgresql-backup module that causes to fail
2018-06-19 10:01:24 +01:00
Markus Kowalewski 508477f076
nixos-18.03/pgbackup: Fix bug in postgresql-backup module that causes
pg_dump to fail

Run pg_dump as postgres super user instead of root.
See https://github.com/NixOS/nixpkgs/issues/41388
2018-06-18 23:58:30 +02:00
Léo Gaspard 989884026b
opensmtpd module: allow changing the package
(cherry picked from commit bb08686f1e3c274979f842e8d405e381b1e41658)
2018-06-18 16:45:05 +08:00
Frank Doepper 15353c2d8f nixos/zfs: mount AFTER import
(cherry picked from commit 909cbc9f785a2c87bfbff530abef2ce555030934)
2018-06-16 09:20:57 +02:00
Frank Doepper dcaa902187 nixos/zfs: enable zfs services
(cherry picked from commit 0e51428280020a5859e515de294fac22e1d1ed30)
2018-06-16 09:20:56 +02:00
Léo Gaspard 0cdd824bd5 nixos/gogs: allow git operations over ssh
Without `ROOT_PATH` set, `gogs serv` tries to open logs in writing in
its store directory. This blocks cloning or pushing over ssh, and
results in a gogs internal error.

(cherry picked from commit b59570eac05b65e23b6a0ccc8a665027d740b1d9)
2018-06-13 11:57:27 +02:00
Svein Ove Aas cc1b088a94 zfs: Fix "zfs-sync" for modern systemd
(cherry picked from commit deb6c6e052a7c7d255835cb50ea2d39890c817a8)
2018-06-11 10:19:19 +01:00
Uli Baum 19d04024ff nixos/tomcat: fix eval error introduced by #40657
(cherry picked from commit 93cbb9b72fed5076d4d0038f14625be4debde255)
2018-06-11 11:05:15 +02:00
Tristan Helmich 3939055dda tomcat service: fix webapps default option (#40657)
The old package tomcat.webapps does not exist

(cherry picked from commit 1daa77160e92b372503c29e22bb82b1c263445ea)
2018-06-10 20:10:51 +02:00
Andreas Rammhold 5a927299aa
nixos/tests; add haproxy
(cherry picked from commit e1790030262d1ce4a28144363469af96a588b21d)
2018-06-08 23:44:35 +02:00
Eelco Dolstra 561585f264
nix: 2.0.3 -> 2.0.4
(cherry picked from commit 47b85dc5ab8243a653c20d4851a3e6c966877251)
2018-06-08 18:15:23 +02:00
Rickard Nilsson e6c3d5a507 nixos: Add option networking.networkmanager.dynamicHosts
This allows non-privileged users to configure local DNS
entries by editing hosts files read by NetworkManager's dnsmasq
instance.
2018-06-08 16:59:32 +02:00
xeji 17232131b5
Merge pull request #41344 from samueldr/fix/doc/formatting-oopsies-unstable_18.03
Fixes doc auto-formatting oopsies [18.03]
2018-06-06 00:19:55 +02:00
Graham Christensen 49a6964a42
install-grub: only try to loadfont if font is not null
(cherry picked from commit ab889c14b5228fbb1d76f61bfa9bb07558ca053c)
2018-06-05 13:29:56 -04:00
Graham Christensen 4da554df0f
grub-config.xml: handle a null font
(cherry picked from commit 52de38f5f40a97dc46bbb9a442903f26e087bd30)
2018-06-05 13:29:48 -04:00
Ihor Antonov 07ba0ed756 Do not kill udev during boot
Backport of https://github.com/NixOS/nixpkgs/pull/40230/files
Fixes #39867
2018-06-04 13:00:44 -04:00
AmineChikhaoui cb0eb5b271
avoid redundant rm calls
(cherry picked from commit 1398d0c3128323f02e4e380c64bf817823a278c6)
2018-06-04 11:39:39 +02:00
AmineChikhaoui 91f7231b72
revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly remove
the temporary ssh host keys file/directory.

(cherry picked from commit 95c05343ce292cd97c120f68131560947e25122c)
2018-06-04 11:39:18 +02:00
Robert Helgesson 0286c2b2e1
mpd: fix spelling in description
(cherry picked from commit 323c2a1c6b1fe17d7f32451ad82e646c5e610e3c)
2018-06-03 09:57:05 +02:00
Uli Baum 03ba84eb56 nixos/release-combined: remove keymap tests from tested job
.. temporarily as non-deterministic failures blocked the release channel
2018-06-02 18:26:48 +02:00
Andreas Rammhold a9fdfb689b
nixos/mpd: allow services.mpd.dbFile to be null
This change allows users to specify an alternative database method. For
example an mpd satellite setup where another mpd on the network shares
it's database with the local instance. The `dbFile` parameter must not be
configured in that case.

(cherry picked from commit a0797bad2c9ea3781367703bb603ab21e5d64d3e)
2018-06-01 19:39:57 +02:00
Samuel Dionne-Riel 3a33c586dc nixos/doc+man: Fixes squishedtogether definitions. 2018-05-31 21:46:50 -04:00