Bump back nix building to 23.11 and remove bitcoin fork (#334)

vinteumorg · Jan 7, 2025 · e1d5ecb · e1d5ecb
1 parent c726ac2
commit e1d5ecb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git 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
@@ -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
diff --git 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 = {