From d36617bb2114cd898aeafdb96b1b300830c76b0f Mon Sep 17 00:00:00 2001
From: yukkop <hectic.yukkop@gmail.com>
Date: Mon, 3 Feb 2025 17:42:30 +0000
Subject: [PATCH] fix: `devShells` merging

---
 flake.lock      |  7 ++++---
 flake.nix       | 11 ++++++-----
 large_file.json |  8 --------
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 large_file.json

diff --git a/flake.lock b/flake.lock
index 19dc284..2e28919 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,15 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735402525,
-        "narHash": "sha256-0RzBF9sKEjHo7Sinrs8wFktrUNc90ziOI48RLtZTW6U=",
+        "lastModified": 1738435198,
+        "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0429fa5b552a5c182e23d0e14de644db867961e4",
+        "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 97a1683..9ee0fd0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "yukkop's nix utilities";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs = {
@@ -94,15 +94,16 @@
         else
 	  pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
       in
-      shells.default // {
+      shells.default //
+      (pkgs.mkShell {
         nativeBuildInputs = [ 
 	   rustToolchain
 	   pkgs.pkg-config
 	];
-      };
-      haskell = shells.default // {
+      });
+      haskell = shells.default // (pkgs.mkShell {
         buildInputs = [ pkgs.stack ];
-      };
+      });
     };
 
 
diff --git a/large_file.json b/large_file.json
deleted file mode 100644
index fd28fdd..0000000
--- a/large_file.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {
-    "c": "unique_text_1",
-    "ln": "en_US",
-    "lb": "l1",
-    "s": "0000000000000000000000000000000000000000000000000000000000000001"
-  }
-]