Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4bb22be34948
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d16a7abceb72
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Sep 20, 2018

  1. altcoins.bitcoin: 0.16.0 -> 0.16.1 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bitcoin/versions.

These checks were done:

- built on NixOS
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoind passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-cli passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-tx passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bench_bitcoin passed the binary check.
- Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-qt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin-qt had a zero exit code or showed the expected version
- 5 of 7 passed binary check by having a zero exit code.
- 0 of 7 passed binary check by having the new version present in output.
- found 0.16.1 with grep in /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1
- directory tree listing: https://gist.github.com/a5e5d745910497ae913d4577342deba5
- du listing: https://gist.github.com/5f62bec50f6ab977a25c8ee0f118cb10

(cherry picked from commit 77f3ac7)
    @xeji
    R. RyanTM authored and xeji committed Sep 20, 2018
    Copy the full SHA
    14c6b72 View commit details

  2. bitcoin: 0.16.1 -> 0.16.2 

    (cherry picked from commit 75d567e)
    @roconnor @xeji
    roconnor authored and xeji committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    GPG key ID: F1E5FB7C768BCE52
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aca2304 View commit details

  3. bitcoin: 0.16.2 -> 0.16.3 (#46891) 

    (cherry picked from commit fab901d)

security: fixes CVE-2018-17144
    @roconnor @xeji
    roconnor authored and xeji committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    GPG key ID: F1E5FB7C768BCE52
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6999bcc View commit details

  4. haskellPackages.sbv: fix location of z3 executable 

    A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.

(cherry picked from commit c8598da)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    Nathan van Doorn authored and thoughtpolice committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    caendesilva Caen De Silva
    GPG key ID: F1E5FB7C768BCE52
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d16a7ab View commit details
Showing with 8 additions and 2 deletions.
  1. +2 −2 pkgs/applications/altcoins/bitcoin.nix
  2. +6 −0 pkgs/development/haskell-modules/configuration-nix.nix
4 changes: 2 additions & 2 deletions pkgs/applications/altcoins/bitcoin.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.16.0";
version = "0.16.3";

src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc";
sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3";
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
6 changes: 6 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -500,4 +500,10 @@ self: super: builtins.intersectAttrs super {
LDAP = dontCheck (overrideCabal super.LDAP (drv: {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
}));

# Expects z3 to be on path so we replace it with a hard
sbv = overrideCabal super.sbv (drv: {
postPatch = ''
sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
});
}