Skip to content

Commit

Permalink
Merge master into staging-next
Browse files Browse the repository at this point in the history
  • Loading branch information
FRidh committed Jun 19, 2020
2 parents 301847a + 612ef34 commit 43f8fd5
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 30 deletions.
14 changes: 9 additions & 5 deletions pkgs/applications/blockchains/monero-gui/default.nix
Expand Up @@ -4,21 +4,21 @@
, qtmultimedia, qtxmlpatterns
, qtquickcontrols, qtquickcontrols2
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq
, libsodium, pcsclite, zeromq, libgcrypt, libgpgerror
, hidapi, libusb-compat-0_1, protobuf, randomx
}:

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.15.0.4";
version = "0.16.0.0";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z";
sha256 = "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld";
};

nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
Expand All @@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
qtbase qtdeclarative qtgraphicaleffects
qtmultimedia qtquickcontrols qtquickcontrols2
qtxmlpatterns
monero unbound readline
monero unbound readline libgcrypt libgpgerror
boost libunwind libsodium pcsclite zeromq
cppzmq hidapi libusb-compat-0_1 protobuf randomx
hidapi libusb-compat-0_1 protobuf randomx
];

NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
Expand All @@ -52,6 +52,10 @@ stdenv.mkDerivation rec {
preBuild = ''
sed -i s#/opt/monero-wallet-gui##g Makefile
make -C src/zxcvbn-c
# use nixpkgs monero sources
rmdir monero
ln -s "${monero.src}" monero
'';

desktopItem = makeDesktopItem {
Expand Down
9 changes: 5 additions & 4 deletions pkgs/applications/blockchains/monero/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound, cppzmq
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1
, CoreData, IOKit, PCSC
Expand All @@ -10,27 +10,28 @@ assert stdenv.isDarwin -> IOKit != null;

stdenv.mkDerivation rec {
pname = "monero";
version = "0.15.0.1";
version = "0.16.0.0";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
sha256 = "0sypa235lf2bbib4b71xpaw39h9304slgsvnsz8wmy9fq1zx009m";
sha256 = "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh";
fetchSubmodules = true;
};

nativeBuildInputs = [ cmake pkgconfig ];

buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
pythonProtobuf libusb-compat-0_1
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];

cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_DEVICE_TREZOR=ON"
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
Expand Down
67 changes: 67 additions & 0 deletions pkgs/applications/misc/tellico/default.nix
@@ -0,0 +1,67 @@
{ lib
, fetchurl
, mkDerivation
, kdeApplications
, kinit
, kdelibs4support
, solid
, kxmlgui
, karchive
, kfilemetadata
, khtml
, knewstuff
, libksane
, cmake
, exempi
, extra-cmake-modules
, libcdio
, poppler
, makeWrapper
, kdoctools
}:

mkDerivation rec {
name = "tellico";
version = "3.3.0";

src = fetchurl {
url = "https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz";
sha256 = "1digkpvzrsbv5znf1cgzs6zkmysfz6lzs12n12mrrpgkcdxc426y";
};

patches = [
./hex.patch
];

nativeBuildInputs = [
cmake
extra-cmake-modules
kdoctools
makeWrapper
];

buildInputs = [
kdelibs4support
solid
kxmlgui
karchive
kfilemetadata
khtml
knewstuff
libksane
cmake
exempi
extra-cmake-modules
libcdio
kdeApplications.libkcddb
poppler
];

meta = {
description = "Collection management software, free and simple";
homepage = "https://tellico-project.org/";
maintainers = with lib.maintainers; [ numkem ];
license = with lib.licenses; [ gpl2 gpl3 ];
platforms = lib.platforms.linux;
};
}
15 changes: 15 additions & 0 deletions pkgs/applications/misc/tellico/hex.patch
@@ -0,0 +1,15 @@
index 7ea81c7..0c19767 100644
--- a/src/utils/iso5426converter.cpp
+++ b/src/utils/iso5426converter.cpp
@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) {
return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW

default:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ myDebug() << "no match for" << hex << c;
+#else
myDebug() << "no match for" << Qt::hex << c;
+#endif
return QChar();
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/mailreaders/mutt/default.nix
Expand Up @@ -27,11 +27,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "mutt";
version = "1.14.3";
version = "1.14.4";

src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0wd4cv1c9hqymvml979g607nh3xxmlyx1ifc4r4qf39v6grnsmdi";
sha256 = "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na";
};

patches = optional smimeSupport (fetchpatch {
Expand Down
17 changes: 10 additions & 7 deletions pkgs/development/ocaml-modules/piqi/default.nix
@@ -1,16 +1,19 @@
{ stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }:
{ stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }:

stdenv.mkDerivation rec {
version = "0.6.14";
version = "0.6.15";
pname = "piqi";
name = "ocaml${ocaml.version}-${pname}-${version}";

src = fetchurl {
url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7";
src = fetchFromGitHub {
owner = "alavrik";
repo = pname;
rev = "v${version}";
sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb";
};

buildInputs = [ ocaml findlib which ocaml_optcomp ];
propagatedBuildInputs = [ulex xmlm easy-format base64];
buildInputs = [ ocaml findlib which ];
propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ];

patches = [ ./no-ocamlpath-override.patch ];

Expand Down
34 changes: 34 additions & 0 deletions pkgs/development/python-modules/markdown/3_1.nix
@@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, nose
, pyyaml
, pythonOlder
, importlib-metadata
, isPy3k
}:

buildPythonPackage rec {
pname = "Markdown";
version = "3.1.1";

src = fetchPypi {
inherit pname version;
sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
};

propagatedBuildInputs = [
setuptools
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];

checkInputs = [ nose pyyaml ];

meta = {
description = "A Python implementation of John Gruber's Markdown with Extension support";
homepage = "https://github.com/Python-Markdown/markdown";
license = lib.licenses.bsd3;
};
}
9 changes: 2 additions & 7 deletions pkgs/development/python-modules/soco/default.nix
@@ -1,4 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
, toml

# Test dependencies
, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
Expand All @@ -14,13 +15,7 @@ buildPythonPackage rec {
sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck";
};

postPatch = ''
# https://github.com/SoCo/SoCo/pull/670
substituteInPlace requirements-dev.txt \
--replace "pytest-cov>=2.4.0,<2.6" "pytest-cov>=2.4.0"
'';

propagatedBuildInputs = [ xmltodict requests ];
propagatedBuildInputs = [ xmltodict requests toml ];
checkInputs = [
pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
sphinx_rtd_theme
Expand Down
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -23465,11 +23465,12 @@ in

monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost17x;
pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; };
};

monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
boost = boost16x;
boost = boost17x;
protobuf = protobuf3_10;
};

Expand Down Expand Up @@ -26299,6 +26300,8 @@ in

prow = callPackage ../applications/networking/cluster/prow { };

tellico = libsForQt5.callPackage ../applications/misc/tellico { };

termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {};

inherit (callPackage ../applications/networking/cluster/terraform { })
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/ocaml-packages.nix
Expand Up @@ -712,9 +712,7 @@ let

phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };

piqi = callPackage ../development/ocaml-modules/piqi {
base64 = base64_2;
};
piqi = callPackage ../development/ocaml-modules/piqi { };

piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };

Expand Down
5 changes: 4 additions & 1 deletion pkgs/top-level/python-packages.nix
Expand Up @@ -4504,7 +4504,10 @@ in {

mapsplotlib = callPackage ../development/python-modules/mapsplotlib { };

markdown = callPackage ../development/python-modules/markdown { };
markdown = if isPy3k then
callPackage ../development/python-modules/markdown { }
else
callPackage ../development/python-modules/markdown/3_1.nix { };

markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {};

Expand Down

0 comments on commit 43f8fd5

Please sign in to comment.