From 14d5fb5fd3af3b57eb8efd611880795621efac3a Mon Sep 17 00:00:00 2001
From: Daragh Downes <esy@skynet.ie>
Date: Mon, 26 Aug 2024 20:14:43 +0100
Subject: [PATCH] fix : remove dupe packages in flake, as is on main

---
 README.md  |  1 -
 flake.lock | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  | 15 ++++-----
 3 files changed, 101 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index de4c6cb..b729878 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 [Wiki for Skynet][1]
 
 Uses [mkdocs][2] to generate the site.  
-Run ```nix develop``` to build locally  
 
 [1]: https://wiki.skynet.ie
 [2]: https://www.mkdocs.org
diff --git a/flake.lock b/flake.lock
index bfd457f..9cd42d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,6 +1,81 @@
 {
   "nodes": {
+    "alejandra": {
+      "inputs": {
+        "fenix": "fenix",
+        "flakeCompat": "flakeCompat",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1660592437,
+        "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=",
+        "owner": "kamadorueda",
+        "repo": "alejandra",
+        "rev": "e7eac49074b70814b542fee987af2987dd0520b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kamadorueda",
+        "ref": "3.0.0",
+        "repo": "alejandra",
+        "type": "github"
+      }
+    },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "alejandra",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1657607339,
+        "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "flakeCompat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1657425264,
+        "narHash": "sha256-3aHvoI2e8vJKw3hvnHECaBpSsL5mxVsVtaLCnTdNcH8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "de5b3dd17034e6106e75746e81618e5bd408de8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1724300212,
         "narHash": "sha256-x3jl6OWTs+L9C7EtscuWZmGZWI0iSBDafvg3X7JMa1A=",
@@ -16,10 +91,28 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "alejandra": "alejandra",
+        "nixpkgs": "nixpkgs_2",
         "utils": "utils"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1657557289,
+        "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "caf23f29144b371035b864a1017dbc32573ad56d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 1783315..f3f075c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,25 +15,24 @@
     utils.lib.eachDefaultSystem (
       system: let
         pkgs = nixpkgs.legacyPackages."${system}";
+        # find these here https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=python312Packages.mkdocs
+        packages = with pkgs.python3Packages; [
+          mkdocs
+          mkdocs-material
+        ];
       in {
         formatter = alejandra.defaultPackage.${system};
         defaultPackage = pkgs.stdenv.mkDerivation {
           name = "skynet-wiki";
           src = self;
-          buildInputs = [
-            pkgs.python3Packages.mkdocs
-            pkgs.python3Packages.mkdocs-material
-          ];
+          buildInputs = packages;
           buildPhase = "mkdocs build";
           installPhase = "mkdir -p $out; cp -R site/* $out;";
         };
 
         devShells.default = pkgs.mkShell {
           name = "Skynet Wiki env";
-          packages = [
-            pkgs.python3Packages.mkdocs
-            pkgs.python3Packages.mkdocs-material
-          ];
+          packages = packages;
         };
       }
     );