From 1646605a806c9d3e3eb9b27e0f8ed8ba6cb4ac39 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 4 Jan 2019 16:19:52 +0000 Subject: [PATCH] Pin electrs dependencies (within nixpkgs) --- README.md | 1 + pkgs/electrs.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a3bdd22..a4b79ac 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Profiles * adds clightning hidden service * [liquid-daemon](https://github.com/blockstream/liquid) * [lightning charge](https://github.com/ElementsProject/lightning-charge) + * [electrs](https://github.com/romanz/electrs) * [nanopos](https://github.com/ElementsProject/nanopos) * adds an index page using nginx to display node information and link to nanopos * [spark-wallet](https://github.com/shesek/spark-wallet) diff --git a/pkgs/electrs.nix b/pkgs/electrs.nix index f88170a..3310084 100644 --- a/pkgs/electrs.nix +++ b/pkgs/electrs.nix @@ -1,9 +1,13 @@ let - PkgsSource = builtins.fetchGit { url = "https://github.com/nixos/nixpkgs-channels"; ref = "nixos-18.09"; }; - defaultPkgs = import PkgsSource {overlays = [(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)) ]; }; + overlay = builtins.fetchGit { + url = "https://github.com/mozilla/nixpkgs-mozilla"; + ref = "master"; + rev = "f61795ea78ea2a489a2cabb27abde254d2a37d25"; + }; + defaultPkgs = import {overlays = [ (import overlay) ]; }; defaultRust = defaultPkgs.latest.rustChannels.nightly.rust; defaultCargo = defaultPkgs.latest.rustChannels.nightly.cargo; - defaultBuildRustPackage = defaultPkgs.callPackage (import "${PkgsSource}/pkgs/build-support/rust") { + defaultBuildRustPackage = defaultPkgs.callPackage (import ) { rust = { rustc = defaultRust; cargo = defaultCargo;