From fa90caf0714dca52d310bb4a0d21573bc16727c4 Mon Sep 17 00:00:00 2001
From: "guillem.cordoba" <guillem.cordoba@gmail.com>
Date: Tue, 17 Sep 2024 12:28:30 +0200
Subject: [PATCH] Follow holonix

---
 flake.lock | 21 ++++-----------------
 flake.nix  | 10 +---------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2fff2c2..c503c00 100644
--- a/flake.lock
+++ b/flake.lock
@@ -155,22 +155,6 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1726320982,
-        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "crane": [
@@ -178,7 +162,10 @@
           "crane"
         ],
         "holonix": "holonix",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "holonix",
+          "nixpkgs"
+        ],
         "rust-overlay": [
           "holonix",
           "rust-overlay"
diff --git a/flake.nix b/flake.nix
index e662632..dc2c38c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,6 @@
 rec {
   inputs = {
-    # nixpkgs.follows = "holonix/nixpkgs";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.follows = "holonix/nixpkgs";
 
     holonix.url = "github:holochain/holonix/main-0.3";
     rust-overlay.follows = "holonix/rust-overlay";
@@ -203,8 +202,6 @@ rec {
         };
 
         devShells.holochainDev = pkgs.mkShell {
-          CGO_ENABLED = 0;
-
           buildInputs = flake.lib.holochainDeps { inherit pkgs lib; };
         };
 
@@ -307,11 +304,6 @@ rec {
           version = cargoToml.package.version;
           inherit cargoArtifacts;
         });
-
-        # packages.pnpm = pkgs.writeShellScriptBin "pnpm" ''
-        #   #!${pkgs.bash}/bin/bash
-        #   exec ${pkgs.nodejs_20}/bin/node ${pkgs.nodejs_20}/bin/corepack pnpm@9.7.1 "$@"
-        # '';
       };
     };
 }