From 8b51ee3667a7492ade1ae6eff1cb193bbfa992f6 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sat, 7 Sep 2019 14:43:43 +0300 Subject: nbstripout: 0.3.1 -> 0.3.6 --- .../version-management/nbstripout/default.nix | 29 ++++------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 8b2b15a00780..b0a7108ac07f 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,8 +1,8 @@ -{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: +{lib, python2Packages, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { - version = "0.3.1"; + version = "0.3.6"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -12,30 +12,11 @@ buildPythonApplication rec { nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - # PyPI source is currently missing tests. Thus, use GitHub instead. - # See: https://github.com/kynan/nbstripout/issues/73 - # Use PyPI again after it has been fixed in a release. - src = fetchFromGitHub { - owner = "kynan"; - repo = pname; - rev = version; - sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; + src = fetchPypi { + inherit pname version; + sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r"; }; - patches = [ - ( - # Fix git diff tests by using --no-index. - # See: https://github.com/kynan/nbstripout/issues/74 - # - # Remove this patch once the pull request has been merged and a new - # release made. - fetchurl { - url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; - sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; - } - ) - ]; - # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' -- cgit 1.4.1 From e38a36094b7807813a50482e7ec0133d676e430b Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 8 Sep 2019 16:01:03 +0300 Subject: nano-wallet: 18.0 -> 19.0 --- pkgs/applications/blockchains/nano-wallet/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index a8d29ae149d9..4aaaabe64496 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; + sha256 = "1y5fc4cvfqh33imjkh91sqhy5bb9kh0icwyvdgm1cl564vnjax80"; fetchSubmodules = true; }; @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { make nano_wallet ''; + # Move executables under bin directory + postInstall = '' + mkdir -p $out/bin + mv $out/nano* $out/bin/ + ''; + checkPhase = '' ./core_test ''; -- cgit 1.4.1 From fa0b1870d11505f3747ff48489f0a26576734f73 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 8 Sep 2019 19:41:05 +0300 Subject: nano-wallet: fix Qt wrapping --- pkgs/applications/blockchains/nano-wallet/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 4aaaabe64496..5b8b17232b90 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL +, qtbase}: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { optionToFlag = name: value: "-D${name}=${value}"; in lib.mapAttrsToList optionToFlag options; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; buildPhase = '' -- cgit 1.4.1 From cd04b610ba34e3081dd81c82d9e7d3c247128279 Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Sat, 7 Sep 2019 17:42:35 -0400 Subject: inkscape: add wrapGAppsHook for icons (fixed for strictDeps) Resolves #68185. The icons in Inkscape depend on gdk-pixbuf loaders, but because strictDeps is set to true to fix some macOS issues it doesn't work (see #56943). Adding librsvg to buildInputs explicitly fixes the issue. --- pkgs/applications/graphics/inkscape/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 1729f3c5cdab..547e2914399b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -3,6 +3,7 @@ , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme +, librsvg, wrapGAppsHook }: let @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ] + nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ] ++ (with perlPackages; [ perl XMLParser ]); buildInputs = [ libXft libpng zlib popt boehmgc @@ -48,6 +49,8 @@ stdenv.mkDerivation rec { gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif potrace hicolor-icon-theme + librsvg # for loading icons + python2Env perlPackages.perl ]; -- cgit 1.4.1 From 8cd9b85bb3b48f607d68029955d051c55ee176e9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 9 Sep 2019 01:54:41 +0200 Subject: urlview: fix path to url_handler.sh By default, `/etc/urlview/url_handler.sh` is used which breaks by default with the following error: ``` sh: /etc/urlview/url_handler.sh: No such file or directory ``` With this change, the script will be copied to `$out` and `urlview` will be patched accordingly. --- pkgs/applications/misc/urlview/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 8764c41c8a4c..ad29c8f94d8b 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -31,10 +31,21 @@ stdenv.mkDerivation rec { patches = debianPatches; - meta = { + postPatch = '' + substituteInPlace urlview.c \ + --replace '/etc/urlview/url_handler.sh' "$out/etc/urlview/url_handler.sh" + ''; + + postInstall = '' + install -Dm755 url_handler.sh $out/etc/urlview/url_handler.sh + patchShebangs $out/etc/urlview + ''; + + meta = with stdenv.lib; { description = "Extract URLs from text"; homepage = https://packages.qa.debian.org/u/urlview.html; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ ma27 ]; }; } -- cgit 1.4.1