update nixos

124237.patch

@@ -1,36 +0,0 @@
-From 113823669b9b71fff84bc592d1fd6022635c28eb Mon Sep 17 00:00:00 2001
-From: regnat <rg@regnat.ovh>
-Date: Mon, 24 May 2021 10:51:02 +0200
-Subject: [PATCH] Revert "nixos/nix-daemon: fix sandbox-paths option"
-
-This reverts commit aeeee447bcc181d57a19d348f857326f4e1959fe.
----
- nixos/modules/services/misc/nix-daemon.nix | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
-index df745fa7168bc3..133e96da0ec8e6 100644
---- a/nixos/modules/services/misc/nix-daemon.nix
-+++ b/nixos/modules/services/misc/nix-daemon.nix
-@@ -12,8 +12,6 @@ let
- 
-   isNix23 = versionAtLeast nixVersion "2.3pre";
- 
--  isNix24 = versionAtLeast nixVersion "2.4pre";
--
-   makeNixBuildUser = nr: {
-     name  = "nixbld${toString nr}";
-     value = {
-@@ -43,11 +41,7 @@ let
-         max-jobs = ${toString (cfg.maxJobs)}
-         cores = ${toString (cfg.buildCores)}
-         sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
--        ${if isNix24 then ''
--          sandbox-paths = ${toString cfg.sandboxPaths}
--        '' else ''
--          extra-sandbox-paths = ${toString cfg.sandboxPaths}
--        ''}
-+        extra-sandbox-paths = ${toString cfg.sandboxPaths}
-         substituters = ${toString cfg.binaryCaches}
-         trusted-substituters = ${toString cfg.trustedBinaryCaches}
-         trusted-public-keys = ${toString cfg.binaryCachePublicKeys}

flake.lock

@@ -55,11 +55,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1621804538,
+        "lastModified": 1623545284,
-        "narHash": "sha256-nQh143ZcRKu3sEC8M/Ei6825Kr0Q4nQcjNw4QRKkgi0=",
+        "narHash": "sha256-zzNCqWIVIgG6QNtDB7z2XAyDSr1I699pHSKECDAmyH4=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "0a653f7ab98dfc05bf0532b9f81bc19377031900",
+        "rev": "141647cfbb1f137e3eefe6ba8e658b475e902cac",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1621844069,
+        "lastModified": 1623571864,
-        "narHash": "sha256-6jLY3Zlz6c5AEDZ4XzeymB6wz+ixsMITAuHryx7ftg8=",
+        "narHash": "sha256-7amTesMYtN9eGqw9qjBf+VezeBYlp8y1PynQ4WqtxVo=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "ec583ae1cb5e2431846fa9a7c247f145591b6a70",
+        "rev": "3b60a1f75e545d11ce530c81d0efe8b0adfe7025",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1621728353,
+        "lastModified": 1623324058,
-        "narHash": "sha256-cgRKslcI/lG5wnxgt1z6OGm+JnzmBqyR8m/JzpUNpYQ=",
+        "narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "900115a4f7fdd9189e7803ca781a65be663f2c89",
+        "rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997",
         "type": "github"
       },
       "original": {

flake.nix

@@ -15,7 +15,7 @@
 
     channels.nixpkgs.input = nixpkgs;
 
-    channels.nixpkgs.patches = [ ./124237.patch ];
+    channels.nixpkgs.patches = [ ];
 
     hostDefaults = {
       modules = [