home

commit 4d5665a592ac1586bf34d3a7be15396532e86a69
parent 00ccf05cf771c59e99ef88370aeb64f788425356
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 24 Nov 2021 17:23:48 +0100

systems/nix: update sources…

This move to nix 2.4 so there is / might be some incompatible change.
Also, upgrade to this with boot instead of switch or everything breaks live.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
nix/sources.json
 | 
48
++++++++++++++++++++++++------------------------
M
systems/modules/core/nix.nix
 | 
11
+++++++++--

2 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "1bf9add4298e7fa48392a9b045b2b1e698f30f2d",
-        "sha256": "19zb58bdpzcl253cr8xysm3gdvln7hf3silcg1kdv084qmbh3hls",
+        "rev": "cc2cdfc1212057526f1f8f48b91cf58f49a1c3ae",
+        "sha256": "1ssqyf60xx1ji24mcprzhbwqbbsf5q5337bnlxvwwrbn7ak9i4cy",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/1bf9add4298e7fa48392a9b045b2b1e698f30f2d.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/cc2cdfc1212057526f1f8f48b91cf58f49a1c3ae.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gitignore": {
@@ -29,10 +29,10 @@
         "homepage": "https://rycee.gitlab.io/home-manager/",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "cf4866d2187399117d3aed47a58e6f8ef58e5afd",
-        "sha256": "1v248bx6pq6wpkvxlpwlab6a03njwhf4pf6wvfrzxxgzwg3gh5mk",
+        "rev": "2452979efe92128b03e3c27567267066c2825fab",
+        "sha256": "0g3sxm407m7qfk6r2hp2jh4bp0samn9y2kcs74cspfiyhh8ss9j4",
         "type": "tarball",
-        "url": "https://github.com/rycee/home-manager/archive/cf4866d2187399117d3aed47a58e6f8ef58e5afd.tar.gz",
+        "url": "https://github.com/rycee/home-manager/archive/2452979efe92128b03e3c27567267066c2825fab.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager-stable": {
@@ -41,10 +41,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
-        "sha256": "122azyrkbp508a1yrhnq2ja2kj9whdmpb1qwgnmdaz87l02m0m26",
+        "rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1",
+        "sha256": "0nznlb2xgkvdav6d4qls2w81m3p3h4hdbwbp2nwqkiszkp7j1bln",
         "type": "tarball",
-        "url": "https://github.com/rycee/home-manager/archive/ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f.tar.gz",
+        "url": "https://github.com/rycee/home-manager/archive/bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -65,10 +65,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2",
-        "sha256": "1yvvfzqmvn9iq5w4v2p9kl60ig9ypspbh868mb9dpf3xgadqcb11",
+        "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4",
+        "sha256": "1xsp0xyrf8arjkf4wi09n96kbg0r8igsmzx8bhc1nj4nr078p0pg",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/46251a79f752ae1d46ef733e8e9760b6d3429da4.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-hardware": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "518b9c2159e7d4b7696ee18b8828f9086012923b",
-        "sha256": "02ybg89zj8x3i5xd70rysizbzx8d8bijml7l62n32i991244rf4b",
+        "rev": "5a7e613703ea349fd46b3fa2f3dfe3bd5444d591",
+        "sha256": "088z9p9ycsvnghqbksxrssk43wfsnm9caks9lch90jp2x8c8aw7x",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixos-hardware/archive/518b9c2159e7d4b7696ee18b8828f9086012923b.tar.gz",
+        "url": "https://github.com/NixOS/nixos-hardware/archive/5a7e613703ea349fd46b3fa2f3dfe3bd5444d591.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-unstable": {
@@ -89,10 +89,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
-        "sha256": "0036sv1sc4ddf8mv8f8j9ifqzl3fhvsbri4z1kppn0f1zk6jv9yi",
+        "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2",
+        "sha256": "152kxfk11mgwg8gx0s1rgykyydfb7s746yfylvbwk5mk5cv4z9nv",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/715f63411952c86c8f57ab9e3e3cb866a015b5f2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -101,10 +101,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "51acb65b302551ac7993b437cc6863fe9fa8ae50",
-        "sha256": "0si8s2ji4prp614q3050x4sp282wxgp0mm5q50slcf5f75jw5yhh",
+        "rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c",
+        "sha256": "0g0jn8cp1f3zgs7xk2xb2vwa44gb98qlp7k0dvigs0zh163c2kim",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/51acb65b302551ac7993b437cc6863fe9fa8ae50.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/7fad01d9d5a3f82081c00fb57918d64145dc904c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "sops-nix": {
@@ -113,10 +113,10 @@
         "homepage": "",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c",
-        "sha256": "0g5xv27s1sx87xxz2ipfi21sqksfmbvx9yn2i0lqb419aqqyks50",
+        "rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9",
+        "sha256": "1ar7919if7cxcm1ny2rm84a5r8clvx1kgkqci74pi0rryv9ri1ph",
         "type": "tarball",
-        "url": "https://github.com/Mic92/sops-nix/archive/2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c.tar.gz",
+        "url": "https://github.com/Mic92/sops-nix/archive/3c53d012ac77d4bd8428f9c847709e287c897ad9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/systems/modules/core/nix.nix b/systems/modules/core/nix.nix
@@ -52,8 +52,15 @@ in
         "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
       ];
       buildCores = cfg.buildCores;
-      daemonIONiceLevel = 5;
-      daemonNiceLevel = 10;
+      # FIXME handle this depending on the version
+      # 21.05 has the following
+      # daemonIONiceLevel, daemonNiceLevel
+      # 21.11 and above
+      # daemonCPUSchedPolicy, daemonIOSchedClass, daemonIOSchedPriority
+
+      #daemonIONiceLevel = 5;
+      #daemonNiceLevel = 10;
+
       # if hydra is down, don't wait forever
       extraOptions = ''
         connect-timeout = 20