diff --git a/justfile b/justfile index 68900c1..74b8d02 100644 --- a/justfile +++ b/justfile @@ -11,13 +11,13 @@ clean: echo "Cleaning build artifacts" if [ -d result ]; then echo "Removing result directory..." - rm ./result; + rm ./result fi if ls *.qcow2 1> /dev/null 2>&1; then echo "Removing virtual disk..." - rm ./*.qcow2; + rm ./*.qcow2 fi - echo "All clean!" + echo "Done" # Output what derivations will be built out TYPE SYSTEM="desktop": diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix index 37e8070..6a4b89e 100644 --- a/src/system/modules/bitcoin/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -18,10 +18,10 @@ in nixpkgs.overlays = [ (final: prev: { bitcoind = prev.bitcoind.overrideAttrs (old: rec { - version = "27.0"; + version = "28.0"; src = fetchTarball { url = "https://github.com/bitcoin/bitcoin/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-U2tR3WySD3EssA3a14wUtA3e0t/5go0isqNZSSma7m4="; + sha256 = "sha256-LLtw6pMyqIJ3IWHiK4P3XoifLojB9yMNMo+MGNFGuRY="; }; }); }) diff --git a/src/system/modules/bitcoin/modules/electrum/default.nix b/src/system/modules/bitcoin/modules/electrum/default.nix index 296e3f2..de8277d 100644 --- a/src/system/modules/bitcoin/modules/electrum/default.nix +++ b/src/system/modules/bitcoin/modules/electrum/default.nix @@ -15,19 +15,19 @@ let in { options.modules.system.bitcoin.electrum = { enable = mkEnableOption "Electrs Server"; }; config = mkIf (cfg.enable && btc.enable) { - nixpkgs.overlays = [ - (final: prev: { - electrs = prev.electrs.overrideAttrs (old: rec { - version = "0.10.4"; - src = pkgs.fetchFromGitHub { - owner = "romanz"; - repo = "electrs"; - rev = "${version}"; - hash = "sha256-4c+FGYM34LSfazzshfRPjA+0BvDL2tvkSr2rasUognc="; - }; - }); - }) - ]; + #nixpkgs.overlays = [ + # (final: prev: { + # electrs = prev.electrs.overrideAttrs (old: rec { + # version = "0.10.4"; + # src = pkgs.fetchFromGitHub { + # owner = "romanz"; + + # rev = "${version}"; + # hash = "sha256-4c+FGYM34LSfazzshfRPjA+0BvDL2tvkSr2rasUognc="; + # }; + # }); + # }) + #]; environment.systemPackages = with pkgs; [ electrs