diff options
| author | lassulus <lassulus@lassul.us> | 2020-04-23 07:09:58 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-04-23 07:09:58 +0200 |
| commit | f441a3dbc712d72d0bc8e8988f1d5e366b61acbd (patch) | |
| tree | cc832a9737d657470b010d3515671e5ad25f94b8 | |
| parent | 4036dc577abdc34a3bc4e9a463119a08bf91cf99 (diff) | |
| parent | bd7e97477b0529f0f758df197d2f52860564700f (diff) | |
Merge remote-tracking branch 'gum/20.03'
| -rw-r--r-- | krebs/nixpkgs.json | 6 | ||||
| -rw-r--r-- | makefu/1systems/x/config.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/default.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/deployment/owncloud.nix | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 3c4afe8bb..9cef0dd78 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "5272327b81ed355bbed5659b8d303cf2979b6953", - "date": "2020-04-20T11:58:47-04:00", - "sha256": "0182ys095dfx02vl2a20j1hz92dx3mfgz2a6fhn31bqlp1wa8hlq", + "rev": "1e90c46c2d98f9391df79954a74d14f263cad729", + "date": "2020-04-20T23:47:17-04:00", + "sha256": "1xs0lgh3q1hbrj0lbpy3czw41cv6vxx9kdf2npwc58z8xq3sdqmh", "fetchSubmodules": false } diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 4c479875e..ea92e3485 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -162,7 +162,11 @@ krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ]; # hard dependency because otherwise the device will not be unlocked - boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; + boot.initrd.luks.devices.luksroot = + { + device = "/dev/sda2"; + allowDiscards = true; + }; # avoid full boot dir boot.loader.grub.configurationLimit = 3; diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 6166b87c3..0219e9bb7 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -30,7 +30,7 @@ with import <stockholm/lib>; }; nix.trustedUsers = [ config.krebs.build.user.name ]; - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages; nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar"; diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index ed3155efc..753fc963b 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -15,6 +15,7 @@ with lib; let # TODO: copy-paste from lass/2/websites/util.nix + nextcloud = nextcloud18; serveCloud = domains: let domain = head domains; @@ -23,9 +24,9 @@ let in { system.activationScripts."prepare-nextcloud-${domain}" = '' if test ! -e ${root} ;then - echo "copying latest ${pkgs.nextcloud.name} release to ${root}" + echo "copying latest ${nextcloud.name} release to ${root}" mkdir -p $(dirname "${root}") - cp -r ${pkgs.nextcloud} "${root}" + cp -r ${nextcloud} "${root}" chown -R nginx:nginx "${root}" chmod 770 "${root}" fi |