Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4acd29342489
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7eb9a1fe18ad
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 8, 2018

  1. bitcoin-xt: 0.11G2 -> 0.11H

    @Lassulus
    Lassulus committed Mar 8, 2018
    Copy the full SHA
    75f4b0f View commit details

  2. Merge pull request #36568 from Lassulus/bitcoin-xt 

    bitcoin-xt: 0.11G2 -> 0.11H
    @Mic92
    Mic92 authored Mar 8, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7eb9a1f View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/altcoins/bitcoin-xt.nix
  2. +3 −3 pkgs/applications/altcoins/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/altcoins/bitcoin-xt.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@ with stdenv.lib;
stdenv.mkDerivation rec{

name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
version = "0.11G2";
version = "0.11H";

src = fetchFromGitHub {
owner = "bitcoinxt";
repo = "bitcoinxt";
rev = "v${version}";
sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs";
sha256 = "1v43bynmidn2zdpky939km721x3ks91bzyh4200gji61qzsmyg62";
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
6 changes: 3 additions & 3 deletions pkgs/applications/altcoins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:

rec {

@@ -16,8 +16,8 @@ rec {
bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };

bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; };
bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; };
bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; };

btc1 = callPackage ./btc1.nix { withGui = true; };
btc1d = callPackage ./btc1.nix { withGui = false; };