diff options
| author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:01 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:21 +0000 |
| commit | 32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch) | |
| tree | fcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/applications/altcoins | |
| parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
| parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) | |
| download | nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.gz nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.bz2 nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.lz nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.xz nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.zst nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/altcoins')
| -rw-r--r-- | pkgs/applications/altcoins/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/go-ethereum.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/lnd.nix | 22 |
3 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 23eb9033ed1..5293c1eefa3 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -65,6 +65,8 @@ rec { }; litecoind = litecoin.override { withGui = false; }; + lnd = callPackage ./lnd.nix { }; + masari = callPackage ./masari.nix { boost = boost165; }; memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index cf0261e01c4..9ef348abc50 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.0"; + version = "1.9.1"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "03gkrvps1syvyjna7769n4j3mlpxcgdj461gzds2l90k02ajvh7x"; + sha256 = "05vnjdjwahdp2j7c6g81jchpdhxmdpbr20mjzpszylp9824v4cba"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/altcoins/lnd.nix new file mode 100644 index 00000000000..7fcaca487b1 --- /dev/null +++ b/pkgs/applications/altcoins/lnd.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "lnd"; + version = "0.7.0-beta"; + + src = fetchFromGitHub { + owner = "lightningnetwork"; + repo = "lnd"; + rev = "v${version}"; + sha256 = "0d6m1vfy33rg6d7qmkpydiypav1girxsnxan9njyjz0vhinmq0sx"; + }; + + modSha256 = "0akxi7xhyz7xx0vc003abidva02sp940cc2gfjg4fmzkc95cajc9"; + + meta = with lib; { + description = "Lightning Network Daemon"; + homepage = "https://github.com/lightningnetwork/lnd"; + license = lib.licenses.mit; + maintainers = with maintainers; [ cypherpunk2140 ]; + }; +} |