Merge remote-tracking branch 'gum/20.03'

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
 }

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;
 

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";
 

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