heierbtc/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#629: update nixpkgs

Browse Source 
aca0b1e6ec update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK aca0b1e6ec

Tree-SHA512: de44d8ad85665d0e0a7d79ed06bdc70cd3c831d06f58d237bd75b50a14c2cc02f7c1252350962884ef8bb9b35fccf1ecabedf883a516d6c054938381b0998d9a
This commit is contained in:
Jonas Nick 2023-07-29 19:22:11 +00:00
commit 369ce1c60c
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -28,11 +28,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1687709756, "lastModified": 1689068808,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1688764204, "lastModified": 1690558459,
"narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=", "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1688798537, "lastModified": 1690593349,
"narHash": "sha256-+3QEnDgBiso8lgUJpMagn6xCujmarc6zCWfKYAd6nqU=", "narHash": "sha256-i6jdORO+YiP19pFNeR7oYIIwmzQvdxwNO+BmtATcYpA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "842e90934a352f517d23963df3ec0474612e483c", "rev": "11cf5e1c74fe6892e860afeeaf3bfb84fdb7b1c3",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/default.nix
View File

@ -15,13 +15,11 @@ let self = {
# when https://github.com/bitcoin/bitcoin/issues/27722 has been resolved # when https://github.com/bitcoin/bitcoin/issues/27722 has been resolved
bitcoin = pkgsUnstable.libsForQt5.callPackage ./bitcoin { bitcoin = pkgsUnstable.libsForQt5.callPackage ./bitcoin {
stdenv = if pkgsUnstable.stdenv.isDarwin then pkgsUnstable.darwin.apple_sdk_11_0.stdenv else pkgsUnstable.stdenv; stdenv = if pkgsUnstable.stdenv.isDarwin then pkgsUnstable.darwin.apple_sdk_11_0.stdenv else pkgsUnstable.stdenv;
boost = pkgsUnstable.boost17x;
withGui = true; withGui = true;
inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook; inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook;
}; };
bitcoind = pkgsUnstable.callPackage ./bitcoin { bitcoind = pkgsUnstable.callPackage ./bitcoin {
boost = pkgsUnstable.boost17x;
withGui = false; withGui = false;
inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook; inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook;
}; };