diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/alacritty/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/gallery-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/hugo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/josm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/kitty/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/kitty/no-werror.patch | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/mlterm/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/osmium-tool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/simplenote/default.nix | 54 | ||||
-rw-r--r-- | pkgs/applications/misc/slic3r/boost-compile-error.patch | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/slic3r/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/misc/syncthingtray/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xchm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xmrig/default.nix | 4 |
17 files changed, 93 insertions, 54 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 24f788ef468..4b4148bdc63 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -52,16 +52,16 @@ let ]; in buildRustPackage rec { pname = "alacritty"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jwilm"; repo = pname; rev = "v${version}"; - sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750"; + sha256 = "0adaqdbma6gskb2g14yscrgr9gch5wf2g2clchplv72c2qr1k427"; }; - cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1"; + cargoSha256 = "1r267g8f986nxh8ms5yhp50qy1yl8gly2jr78p738qqc6frlxlhv"; nativeBuildInputs = [ cmake @@ -76,10 +76,6 @@ in buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; outputs = [ "out" "terminfo" ]; - postPatch = '' - substituteInPlace alacritty_terminal/src/config/mouse.rs \ - --replace xdg-open ${xdg_utils}/bin/xdg-open - ''; postBuild = lib.optionalString stdenv.isDarwin "make app"; @@ -118,7 +114,7 @@ in buildRustPackage rec { description = "GPU-accelerated terminal emulator"; homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ filalex77 mic92 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 22ae573353e..9701db3c0b7 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with pypkgs; [ - apsw cssselect css-parser dateutil dnspython html5-parser lxml markdown netifaces pillow + apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow python pyqt5_with_qtwebkit sip regex msgpack beautifulsoup4 html2text # the following are distributed with calibre, but we use upstream instead diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index b1cd6a36e08..1a9789114dc 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.10.6"; + version = "1.11.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0jbfp072rnb3pkqp10xds57bnlcn87vqjaz68nhpzkwvwhs3hr4w"; + sha256 = "08py1f48ylw83712h8313rxz55igbszxcwr2yxkchpr4233avzph"; }; doCheck = false; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 840f4c32e52..c2065d94353 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.58.3"; + version = "0.60.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc"; + sha256 = "0g8rq79xp7c9p31xc0anfjyz7xp8n7qzv3vmvg2nmzl7nayg88aa"; }; - modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx"; + modSha256 = "12h1ik1hgs4lkmk699wpa34rnycnm03qyr2vp1y5lywz1h93by20"; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 857cc6c7456..a3cbdabeacf 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15390"; + version = "15492"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1wxncd3mjd4j14svgpmvrxc0nkzfkpn0xlci7m7wp9hfp1l81v9f"; + sha256 = "0x7ndcrlvrvk2fd4pyn10npr3778khcwg6xzzh19vdw4glh5zfcl"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6701c910a1f..06fc04ba8fb 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -34,13 +34,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "053z6mzcn22w3vkf09i7kdi5p0c6zcd9g62v3p5i3yhd14cgviqr"; + sha256 = "0dkya9smx81c5cgcwk2gi2m1pabfff1v9gd3ngl42sdvyb63wgdq"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index e87d09b50cc..cd04fdb2574 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.14.6"; + version = "0.15.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51"; + sha256 = "1gh8lcyqpkwvmjxwiq5d43sd43bg3c49fyy2x8drqdzj34gc49qg"; }; buildInputs = [ diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch index 8217b5ef51a..92a65258855 100644 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -1,11 +1,11 @@ --- a/setup.py +++ b/setup.py -@@ -212,7 +212,7 @@ +@@ -217,7 +217,7 @@ def init_env( cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ).format( + float_conversion, std, optimize, - ' '.join(sanitize_args), diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 303b9fe5e8b..0c8ad9ae1b3 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.8.8"; + version = "3.8.9"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; + sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -86,8 +86,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Multi Lingual TERMinal emulator on X11"; homepage = http://mlterm.sourceforge.net/; - license = licenses.bsd2; + license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 19657da607f..82144e9689f 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "164r1w539dzy67ir2rqh21kwdvkjv87isd18gp51qyxbsprz6kq5"; + sha256 = "199dvajik5d56nybk2061vdjyxwakngfd7frxj99wr2vsrp4aw2b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 1256bb96608..f185524da58 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, git, gnupg, pass, pwgen +, git, gnupg, pass, pwgen, qrencode , qtbase, qtsvg, qttools, qmake }: @@ -14,6 +14,11 @@ mkDerivation rec { sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x"; }; + postPatch = '' + substituteInPlace src/qtpass.cpp \ + --replace "/usr/bin/qrencode" "${qrencode}/bin/qrencode" + ''; + buildInputs = [ git gnupg pass qtbase qtsvg ]; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index be8e2105401..1829407705b 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,23 +1,37 @@ -{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper -, stdenv, udev, wrapGAppsHook }: +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: let inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + pname = "simplenote"; - version = "1.9.1"; + version = "1.11.0"; sha256 = { - x86_64-linux = "1zqrjh1xfdpkpj1fsri9r4qkazh9j89pbj8vjr474b39v56v693j"; - }.${system}; + x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s"; + }.${system} or throwSystem; meta = with stdenv.lib; { description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; - maintainers = with maintainers; [ kiwi ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ + kiwi + ]; + platforms = [ + "x86_64-linux" + ]; }; linux = stdenv.mkDerivation rec { @@ -31,14 +45,14 @@ let }; desktopItem = makeDesktopItem { - name = "simplenote"; + categories = "Development"; comment = "Simplenote for Linux"; + desktopName = "Simplenote"; exec = "simplenote %U"; icon = "simplenote"; - type = "Application"; + name = "simplenote"; startupNotify = "true"; - desktopName = "Simplenote"; - categories = "Development"; + type = "Application"; }; dontBuild = true; @@ -46,9 +60,14 @@ let dontPatchELF = true; dontWrapGApps = true; - buildInputs = atomEnv.packages; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook + ]; - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + buildInputs = atomEnv.packages; unpackPhase = "dpkg-deb -x $src ."; @@ -62,14 +81,15 @@ let cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ + udev.lib + ]; postFixup = '' - ls -ahl $out makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ - "''${gappsWrapperArgs[@]}" + "''${gappsWrapperArgs[@]}" ''; }; in - linux +linux diff --git a/pkgs/applications/misc/slic3r/boost-compile-error.patch b/pkgs/applications/misc/slic3r/boost-compile-error.patch new file mode 100644 index 00000000000..4dbdb85f743 --- /dev/null +++ b/pkgs/applications/misc/slic3r/boost-compile-error.patch @@ -0,0 +1,12 @@ +diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp +index cc0b2983..0f39f5a3 100644 +--- a/xs/src/libslic3r/GCodeSender.hpp ++++ b/xs/src/libslic3r/GCodeSender.hpp +@@ -9,6 +9,7 @@ + #include <boost/asio.hpp> + #include <boost/bind.hpp> + #include <boost/thread.hpp> ++#include <boost/core/noncopyable.hpp> + + namespace Slic3r { + diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index cf9e93b87b3..8dbd0cd5776 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem -, which, perlPackages, boost +{ lib, stdenv, fetchgit, perl, makeWrapper +, makeDesktopItem, which, perlPackages, boost }: stdenv.mkDerivation rec { @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp ''; + # note the boost-compile-error is fixed in + # https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68 + # this patch can be probably be removed in the next version after 1.3.0 + patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch; + buildPhase = '' export SLIC3R_NO_AUTO=true export LD=$CXX diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 816ae664f8e..857dcfaf69f 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.2"; + version = "0.10.3"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "09iq1rr70wwy5xk0jmfnwzvnigq409hvs2viy1j0khn9jhvnk6z0"; + sha256 = "12s1v65h4z051k4gi1b5f3z4hpbgqnhkjnz2xv5bdwhs24zxrrif"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 6a5e62f54e1..fb1b59ed01f 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.30"; + version = "1.31"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v"; + sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 265c4c173fc..037d6be2299 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "17bgz1rpix1zgzzn4zz84jp7hl6b2k968h918y3av5asxn0mji49"; + sha256 = "0w6vbrp44l25jhv3kx1m0841rkv7im30581gds0qb7lhyqm0hnbg"; }; nativeBuildInputs = [ cmake ]; |