From e1d5ecba4ceb1237da041ee49b3ecfa6b9df2b39 Mon Sep 17 00:00:00 2001
From: Shigeru Myamoto <jgleal@protonmail.com>
Date: Tue, 7 Jan 2025 13:56:03 -0300
Subject: [PATCH] Bump back nix building to 23.11 and remove bitcoin fork
 (#334)

---
 .gitignore |  1 +
 build.nix  | 23 ++++++++++-------------
 flake.lock |  8 ++++----
 flake.nix  |  2 +-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1823d89d..d413e5a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Build outputs
 /target
 /builds
+/result
 
 # Temporary files and generated data
 tmp/
diff --git a/build.nix b/build.nix
index 8b698ba0..94ddda6d 100644
--- a/build.nix
+++ b/build.nix
@@ -1,17 +1,17 @@
 { lib, rustPlatform, florestaRust, buildInputs }:
 
 let
-    # Pname defines the name of the package and will decide the output of this expression
-    pname = "floresta-node";
-    version = "0.7.0";
+  # Pname defines the name of the package and will decide the output of this expression
+  pname = "floresta-node";
+  version = "0.7.0";
 
-    # This sets the rustc and cargo to the ones from the florestaRust.
-    #
-    # Defined in Flake.nix directly from the rust-toolchain.
-    buildRustPackage = rustPlatform.buildRustPackage.override {
-        rustc = florestaRust;
-        cargo = florestaRust;
-    };
+  # This sets the rustc and cargo to the ones from the florestaRust.
+  #
+  # Defined in Flake.nix directly from the rust-toolchain.
+  buildRustPackage = rustPlatform.buildRustPackage.override {
+    rustc = florestaRust;
+    cargo = florestaRust;
+  };
 in
 buildRustPackage {
   inherit pname version;
@@ -22,9 +22,6 @@ buildRustPackage {
 
   cargoLock = {
     lockFile = ./Cargo.lock;
-    outputHashes = {
-      "bitcoin-0.31.0" = "sha256-2v87cb+Wd4OhgDG45Za3bxumaY7QKdw7nKuqKrmtHMs=";
-    };
   };
 
   inherit buildInputs;
diff --git a/flake.lock b/flake.lock
index fac34394..249c5c74 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,16 +57,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731755305,
-        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
+        "lastModified": 1720535198,
+        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
+        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 4144b988..3c05d1cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs = {