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

Merge branch 'nixos-19.03'

This commit is contained in:
Jonas Nick 2019-04-26 23:33:26 +00:00
parent 5c26539c48 25f30addce
commit 286601660e
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/electrs/default.nix
View File

@ -1,7 +1,7 @@
{ pkgs }: { pkgs }:
with pkgs; with pkgs;
rustPlatform_1_31.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "electrs-${version}"; name = "electrs-${version}";
version = "0.5.0"; version = "0.5.0";

6
pkgs/nixpkgs-pinned.nix
View File

@ -1,13 +1,13 @@
{ {
nixpkgs = builtins.fetchGit { nixpkgs = builtins.fetchGit {
url = "https://github.com/nixos/nixpkgs-channels"; url = "https://github.com/nixos/nixpkgs-channels";
ref = "nixos-18.09"; ref = "nixos-19.03";
rev = "222950952f15f6b1e9f036b80440b597f23e652d"; rev = "7936400662bc9379beb69855b0e0b7c0110e5f3c";
}; };
nixpkgs-unstable = builtins.fetchGit { nixpkgs-unstable = builtins.fetchGit {
url = "https://github.com/nixos/nixpkgs-channels"; url = "https://github.com/nixos/nixpkgs-channels";
ref = "nixpkgs-unstable"; ref = "nixpkgs-unstable";
rev = "0c0954781e257b8b0dc49341795a2fe7d96945a3"; rev = "02bb5e35eae8a9e124411270a6790a08f68e905b";
}; };
} }