Update to nixpkgs 23.11

kip93 · Dec 1, 2023 · 3bc8ef9 · 3bc8ef9
1 parent cc530e8
commit 3bc8ef9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -71,9 +71,7 @@
       };
     };
     home-manager = {
-      url = "https://flakehub.com/f/nix-community/home-manager/0.1.0.tar.gz";
-      # TODO Switch back to stable when 23.11 comes out
-      # url = "https://flakehub.com/f/nix-community/home-manager/*.tar.gz";
+      url = "https://flakehub.com/f/nix-community/home-manager/*.tar.gz";
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
@@ -110,9 +108,7 @@
       url = "github:NixOS/nixos-hardware/master";
     };
     nixpkgs = {
-      url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
-      # TODO Switch back to stable when 23.11 comes out
-      # url = "https://flakehub.com/f/NixOS/nixpkgs/*.tar.gz";
+      url = "https://flakehub.com/f/NixOS/nixpkgs/*.tar.gz";
     };
     # TODO devenv#745
     # poetry2nix = {

diff --git a/overlays/overrides/default.nix b/overlays/overrides/default.nix
@@ -39,14 +39,18 @@ in
   hydra_unstable = hydra;
 
   # Build a nix package that has flake schema support (see nix#8892)
-  nixSchemas = nix.overrideAttrs ({ patches ? [ ], ... }: {
+  nixSchemas = final.nixVersions.nix_2_18.overrideAttrs ({ patches ? [ ], ... }: {
+    pname = "nix-schemas";
     patches = patches ++ [
       (final.fetchpatch {
         url = "https://github.com/NixOS/nix/pull/8892.diff";
         hash = "sha256-NfBksfuW1RUWe3O9cyqdM+A4O9ZGvEWg8rfv+24BosA=";
         excludes = [ "doc/manual/src/SUMMARY.md.in" "flake.nix" "flake.lock" ];
       })
     ];
-    doCheck = false; # Schema tests still require internet connection
+
+    # Schema tests still require internet connection
+    doCheck = false;
+    doInstallCheck = false;
   });
 }