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: 28224516e5cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 33548111764b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 11, 2020

  1. bitcoin: 0.20.0 -> 0.20.1

    @prusnak
    prusnak committed Aug 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    meyfa Fabian Meyer
    GPG key ID: 8238F1A166D59533
    Verified
    Learn about vigilant mode
    Copy the full SHA
    411c318 View commit details

Commits on Aug 13, 2020

  1. Merge pull request #94480 from prusnak/bitcoin 

    bitcoin: 0.20.0 -> 0.20.1
    @mmahut
    mmahut authored Aug 13, 2020
    Copy the full SHA
    3354811 View commit details
Showing with 3 additions and 7 deletions.
  1. +3 −7 pkgs/applications/blockchains/bitcoin.nix
10 changes: 3 additions & 7 deletions pkgs/applications/blockchains/bitcoin.nix
View file
Original file line number Diff line number Diff line change
@@ -20,16 +20,12 @@

with stdenv.lib;
let
version = "0.20.0";
version = "0.20.1";
majorMinorVersion = versions.majorMinor version;
desktop = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
};
pixmap = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
};
in
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin" else "bitcoind";
@@ -40,7 +36,7 @@ stdenv.mkDerivation rec {
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28";
sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978";
};

nativeBuildInputs =
@@ -53,7 +49,7 @@ stdenv.mkDerivation rec {

postInstall = optional withGui ''
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
install -Dm644 share/pixmaps/bitcoin128.png $out/share/pixmaps/bitcoin128.png
'';

configureFlags = [