diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-16 19:24:52 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-16 19:24:52 +0200 |
commit | fa4a3af5a70ecc628d1467eb5c4b89a479633ce6 (patch) | |
tree | f00f518902a97f40165ab697cce73628443ece5e /pkgs/applications/misc | |
parent | 6e66cf0f6b4f2ca5c08fc75390f6554e5530208e (diff) | |
parent | a95a53aadc3a84ff8c2660f44aa124c58da241cd (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/cataract/build.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/misc/diff-pdf/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/misc/gcalcli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gpxsee/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/joplin-desktop/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/wtf/default.nix | 11 |
6 files changed, 29 insertions, 23 deletions
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 5f4e24f4d3cca..1c33a92987c15 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -22,17 +22,21 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ glib libxml2 exiv2 imagemagick ]; + prePatch = '' + sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp + ''; + installPhase = '' mkdir $out/{bin,share} -p cp src/cgg{,-dirgen} $out/bin/ ''; - meta = { - homepage = http://cgg.bzatek.net/; - description = "a simple static web photo gallery, designed to be clean and easily usable"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + meta = with stdenv.lib; { + homepage = "http://cgg.bzatek.net/"; + description = "A simple static web photo gallery, designed to be clean and easily usable"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 0016f89746d63..af47afcc601d1 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -7,15 +7,15 @@ let else [ wxGTK ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "diff-pdf"; - version = "2017-12-30"; + version = "0.3"; src = fetchFromGitHub { owner = "vslavik"; repo = "diff-pdf"; - rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc"; - sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m"; + rev = "v${version}"; + sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; @@ -24,9 +24,10 @@ stdenv.mkDerivation { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = http://vslavik.github.io/diff-pdf; + homepage = "https://vslavik.github.io/diff-pdf/"; description = "Simple tool for visually comparing two PDF files"; license = licenses.gpl2; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 6f380114a2766..8381f182e5d33 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf"; + sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 6e9296da267b4..4b2ed9af24e04 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.12"; + version = "7.13"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc"; + sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw"; }; nativeBuildInputs = [ qmake ]; @@ -28,7 +28,7 @@ mkDerivation rec { all common GPS log file formats. ''; license = licenses.gpl3; - maintainers = [ maintainers.womfoo ]; + maintainers = with maintainers; [ womfoo sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 410b04d5dcbde..ff0332e1e5ff4 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.158"; + version = "1.0.167"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; - sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q"; + sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw"; }; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 60ff84ffe5933..fa865dcc16c44 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "wtf"; - version = "0.21.0"; + version = "0.22.0"; overrideModAttrs = _oldAttrs : _oldAttrs // { preBuild = ''export GOPROXY="https://gocenter.io"''; @@ -17,17 +17,18 @@ buildGoModule rec { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9"; - }; + sha256 = "1d8lp94cw8rh9r9y64awxafhw9fmp33v3m761gzy500hrxal2rzb"; + }; - modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic"; + modSha256 = "0m180571j4564py5mzdcbyypk71fdlp2vkfdwi6q85nd2q94sx6h"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin" + mv "$out/bin/wtf" "$out/bin/wtfutil" + wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin" ''; meta = with lib; { |