flake: don't make flurry a recursive package (#39)

.github/workflows/update.yml

@@ -11,11 +11,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - run: nix shell nixpkgs#cargo --command cargo update
+      - run: nix shell -L nixpkgs#cargo --command cargo update
-      - run: nix shell nixpkgs#git --command git add Cargo.lock
+      - run: nix shell -L nixpkgs#git --command git add Cargo.lock
       - name: Check flake
         uses: DeterminateSystems/flake-checker-action@main
-      - run: nix build
+      - run: nix build -L
       - name: Update Nix Flake Lock
         uses: DeterminateSystems/update-flake-lock@main
         with:
@@ -23,3 +23,4 @@ jobs:
           pr-labels: |
             dependencies
             automated
+          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}

flake.lock

@@ -2,9 +2,7 @@
   "nodes": {
     "fenix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs"
-        ],
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
@@ -69,7 +67,7 @@
     "flurry": {
       "inputs": {
         "fenix": "fenix_3",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1729619105,
@@ -87,21 +85,37 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729632202,
+        "lastModified": 1729413321,
-        "narHash": "sha256-BqWFOqG9Iuzf5wm9dyVWPeH1SPxSjCxo3inUSnYqxaQ=",
+        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5a95c26209c2e136ef7da309824f562253b5fd7a",
+        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "master",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1729413321,
+        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1729568966,
         "narHash": "sha256-t7r899w6fZh9SOOgDykmqUz7DwK9Xw1CwFLri6Ga0Bs=",
@@ -117,7 +131,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1729619492,
         "narHash": "sha256-VPd3fRyxlIgYxQ8z5uq6tp13wG/cYvPfZh0Z6QNlt1k=",
@@ -136,7 +150,7 @@
     "root": {
       "inputs": {
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "tsunami": "tsunami"
       }
     },
@@ -195,7 +209,7 @@
       "inputs": {
         "fenix": "fenix_2",
         "flurry": "flurry",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1729621351,

flake.nix

@@ -1,9 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/master";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     fenix = {
       url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
     tsunami = {
       url = "github:itepastra/tsunami";
@@ -35,10 +34,10 @@
           rec {
             default = flurry;
             flurry =
-              (pkgs.makeRustPlatform { cargo = toolchain; rustc = toolchain; }).buildRustPackage rec {
+              (pkgs.makeRustPlatform { cargo = toolchain; rustc = toolchain; }).buildRustPackage {
                 pname = "flurry";
                 version = "0.1.0";
-                cargoLock.lockFile = "${src}/Cargo.lock";
+                cargoLock.lockFile = ./Cargo.lock;
                 src = fs.toSource {
                   root = ./.;
                   fileset = fs.unions [