Merge master into staging-next
This commit is contained in:
commit
046dece8d7
|
@ -1,21 +1,22 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, hexdump
|
||||
, wrapQtAppsHook ? null
|
||||
, boost
|
||||
, libevent
|
||||
, miniupnpc
|
||||
, zeromq
|
||||
, zlib
|
||||
, db48
|
||||
, sqlite
|
||||
, boost
|
||||
, zeromq
|
||||
, hexdump
|
||||
, zlib
|
||||
, miniupnpc
|
||||
, qrencode
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, wrapQtAppsHook ? null
|
||||
, util-linux
|
||||
, python3
|
||||
, qrencode
|
||||
, libevent
|
||||
, nixosTests
|
||||
, withGui
|
||||
, withWallet ? true
|
||||
|
@ -43,13 +44,14 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkg-config autoreconfHook ]
|
||||
++ optional stdenv.isDarwin hexdump
|
||||
++ optional withGui wrapQtAppsHook;
|
||||
buildInputs = [ boost zlib zeromq miniupnpc libevent ]
|
||||
[ autoreconfHook pkg-config ]
|
||||
++ optionals stdenv.isLinux [ util-linux ]
|
||||
++ optionals stdenv.isDarwin [ hexdump ]
|
||||
++ optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
|
||||
++ optionals withWallet [ db48 sqlite ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
++ optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
postInstall = optional withGui ''
|
||||
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
|
||||
|
|
86
pkgs/applications/blockchains/elements.nix
Normal file
86
pkgs/applications/blockchains/elements.nix
Normal file
|
@ -0,0 +1,86 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, hexdump
|
||||
, wrapQtAppsHook ? null
|
||||
, boost
|
||||
, libevent
|
||||
, miniupnpc
|
||||
, zeromq
|
||||
, zlib
|
||||
, db48
|
||||
, sqlite
|
||||
, qrencode
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, python3
|
||||
, openssl
|
||||
, withGui
|
||||
, withWallet ? true
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "elements" else "elementsd";
|
||||
version = "0.18.1.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz";
|
||||
sha256 = "84a51013596b09c62913649ac90373622185f779446ee7e65b4b258a2876609f";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook pkg-config ]
|
||||
++ optionals stdenv.isLinux [ util-linux ]
|
||||
++ optionals stdenv.isDarwin [ hexdump ]
|
||||
++ optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ boost libevent miniupnpc zeromq zlib openssl ]
|
||||
++ optionals withWallet [ db48 sqlite ]
|
||||
++ optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
] ++ optionals (!doCheck) [
|
||||
"--disable-tests"
|
||||
"--disable-gui-tests"
|
||||
] ++ optionals (!withWallet) [
|
||||
"--disable-wallet"
|
||||
] ++ optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkFlags =
|
||||
[ "LC_ALL=C.UTF-8" ]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol";
|
||||
longDescription= ''
|
||||
The Elements blockchain platform is a collection of feature experiments and extensions to the
|
||||
Bitcoin protocol. This platform enables anyone to build their own businesses or networks
|
||||
pegged to Bitcoin as a sidechain or run as a standalone blockchain with arbitrary asset
|
||||
tokens.
|
||||
'';
|
||||
homepage = "https://www.github.com/ElementsProject/elements";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
# Qt GUI is currently broken in upstream
|
||||
# No rule to make target 'qt/res/rendered_icons/about.png', needed by 'qt/qrc_bitcoin.cpp'.
|
||||
broken = withGui;
|
||||
};
|
||||
}
|
|
@ -52,13 +52,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arcan";
|
||||
version = "0.6.1pre1+unstable=2021-07-07";
|
||||
version = "0.6.1pre1+unstable=2021-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
rev = "f3341ab94b32d02f3d15c3b91a512b2614e950a5";
|
||||
hash = "sha256-YBtRA5uCk4tjX3Bsu5vMkaNaCLRlM6HVQ53sna3gDsY=";
|
||||
rev = "25da999e6e03688c71c7df3852314c01ed610e0d";
|
||||
hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
@ -37,6 +37,6 @@ rec {
|
|||
|
||||
everyone-wrapped = callPackage ./wrapper.nix {
|
||||
name = "everyone-wrapped";
|
||||
appls = [ durden pipeworld prio ];
|
||||
appls = [ durden pipeworld ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "durden";
|
||||
version = "0.6.1+unstable=2021-06-25";
|
||||
version = "0.6.1+unstable=2021-07-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "fb618fccc57a68b6ce933b4df5822acd1965d591";
|
||||
hash = "sha256-PovI837Xca4wV0g0s4tYUMFGVUDf+f8HcdvM1+0aDxk=";
|
||||
rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5";
|
||||
hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -21,7 +21,7 @@ symlinkJoin rec {
|
|||
--set ARCAN_LIBPATH "${placeholder "out"}/lib/" \
|
||||
--set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \
|
||||
--set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \
|
||||
--set ARCAN_STATEBASEPATH "$HOME/.arcan/resources/savestates/"
|
||||
--set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/"
|
||||
done
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -11,15 +11,17 @@
|
|||
, glib
|
||||
, granite
|
||||
, libgee
|
||||
, libhandy
|
||||
, elementary-icon-theme
|
||||
, elementary-gtk-theme
|
||||
, gettext
|
||||
, wrapGAppsHook
|
||||
, appstream
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-feedback";
|
||||
version = "1.0";
|
||||
version = "6.0.0";
|
||||
|
||||
repoName = "feedback";
|
||||
|
||||
|
@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-GkVnowqGXwnEgplT34Po/BKzC2F/IQE2kIw0SLSLhGU=";
|
||||
sha256 = "1fh9a0nfvbrxamki9avm9by760csj2nqy4ya7wzbnqbrrvjwd3fv";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -47,11 +49,13 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
appstream
|
||||
elementary-icon-theme
|
||||
granite
|
||||
gtk3
|
||||
elementary-gtk-theme
|
||||
libgee
|
||||
libhandy
|
||||
glib
|
||||
];
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
|
@ -16,6 +15,7 @@
|
|||
, json-glib
|
||||
, libgda
|
||||
, libgpod
|
||||
, libhandy
|
||||
, libnotify
|
||||
, libpeas
|
||||
, libsoup
|
||||
|
@ -31,7 +31,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-music";
|
||||
version = "5.0.5";
|
||||
version = "5.1.0";
|
||||
|
||||
repoName = "music";
|
||||
|
||||
|
@ -39,17 +39,9 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE=";
|
||||
sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with latest Vala.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch";
|
||||
sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
|
@ -82,6 +74,7 @@ stdenv.mkDerivation rec {
|
|||
libgda
|
||||
libgee
|
||||
libgpod
|
||||
libhandy
|
||||
libnotify
|
||||
libpeas
|
||||
libsignon-glib
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
|
@ -12,6 +11,7 @@
|
|||
, libaccounts-glib
|
||||
, libexif
|
||||
, libgee
|
||||
, libhandy
|
||||
, geocode-glib
|
||||
, gexiv2
|
||||
, libgphoto2
|
||||
|
@ -35,7 +35,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-photos";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
repoName = "photos";
|
||||
|
||||
|
@ -43,17 +43,9 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY=";
|
||||
sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with latest Vala.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch";
|
||||
sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
|
@ -88,6 +80,7 @@ stdenv.mkDerivation rec {
|
|||
libgee
|
||||
libgphoto2
|
||||
libgudev
|
||||
libhandy
|
||||
libraw
|
||||
librest
|
||||
libsoup
|
||||
|
|
|
@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "2bad8be0be95c8f54a26d1e16299e65f31ae1b34bd6ad3819aa50e7b40521484";
|
||||
sha256 = "df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
|
@ -28502,6 +28502,9 @@ in
|
|||
|
||||
electrs = callPackage ../applications/blockchains/electrs.nix { };
|
||||
|
||||
elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; };
|
||||
elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; };
|
||||
|
||||
ergo = callPackage ../applications/blockchains/ergo { };
|
||||
|
||||
exodus = callPackage ../applications/blockchains/exodus { };
|
||||
|
|
Loading…
Reference in a new issue