From aa24d32f04b89846d263e41c67ecde136adf10fb Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Wed, 1 May 2024 09:45:04 -0400
Subject: [PATCH] Update flake and make it compatible with master changes

Ref: https://github.com/NixOS/nixpkgs/pull/305951
---
 flake.lock | 18 +++++++++---------
 flake.nix  |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index a5e52d0..63b249d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704161960,
-        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
+        "lastModified": 1714314149,
+        "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
+        "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704593904,
-        "narHash": "sha256-nDoXZDTRdgF3b4n3m011y99nYFewvOl9UpzFvP8Rb3c=",
+        "lastModified": 1714529851,
+        "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "c36fd70a99decfa6e110c86f296a97613034a680",
+        "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8248e6d..d8d9417 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@ rec {
       date = "${substring 0 4 mtime}-${substring 4 2 mtime}-${substring 6 2 mtime}";
       rev = self.rev or (lib.warn "Git changes are not committed" (self.dirtyRev or "dirty"));
 
-      mkNil = { rustPlatform, nixUnstable, ... }:
+      mkNil = { rustPlatform, nixVersions, ... }:
         rustPlatform.buildRustPackage {
           pname = "nil";
           version = "unstable-${date}";
@@ -29,7 +29,7 @@ rec {
             allowBuiltinFetchGit = false;
           };
 
-          nativeBuildInputs = [ nixUnstable.out ];
+          nativeBuildInputs = [ (nixVersions.latest or nixVersions.unstable) ];
 
           CFG_RELEASE = "git-${rev}";
 
@@ -148,7 +148,7 @@ rec {
           # See comments above.
           devShells.full = devShells.default.overrideAttrs (old: {
             nativeBuildInputs = old.nativeBuildInputs ++ [
-              pkgs.nixUnstable.out
+              (pkgs.nixVersions.latest or pkgs.nixVersions.unstable).out
             ];
           });