diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
commit | 08900c0554657442c60c86e54081325c0f4cedce (patch) | |
tree | 4e7a2e330991ee3eb08cf6b51d3f44ae47ae03f3 /pkgs/applications/misc | |
parent | 458b2cb7d67561c796c6f0660a97eea9b685fc65 (diff) | |
parent | 3327b9a385f5ec2e219bf93b48896772b3f66afc (diff) | |
download | nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.gz nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.bz2 nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.lz nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.xz nixlib-08900c0554657442c60c86e54081325c0f4cedce.tar.zst nixlib-08900c0554657442c60c86e54081325c0f4cedce.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
20 files changed, 179 insertions, 43 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 518ec310ffbe..9e04a738db30 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws"; + sha256 = "1b6fspcd8yn1857cgn1m8a828bvjspvrfc2giwsa9ai0ighcqbgl"; }; - cargoSha256 = "07gq63qd11zz229b8jp9wqggz39qfpzd223z1zk1xch7rhqq0pn4"; + cargoSha256 = "1zadnwjqk9kklj0p43azd78kgbva2zihh9wh81w4c5y0kypbchyd"; nativeBuildInputs = [ cmake @@ -135,7 +135,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 mic92 cole-h ]; + maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index b7b7cfea7c1a..ff8785785268 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/almanah/merge_requests/7 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch"; - sha256 = "q3M+osNWz7AsDQtFju5S7P4wH3cAdzKOPKnEXTJ+k3M="; + sha256 = "0wwkgqr5vi597j734xq0fwgk1zpcabp8wi8b1lnb1ksnqfi3wwxb"; }) ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 869785ef82a0..ff39eccf4f84 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.15.0"; + version = "4.17.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "0m8mvyw5c1khd54jx896w6nfwaydmpi3cb6wi5p2a0hxdksqgrkm"; + sha256 = "1qgzx2q8a5g102z311ibz4aw1ipn2j1lbndgadig7xvy6zdhknma"; }; patches = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 75edce66b94f..3b55a1506370 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.5"; + version = "7.1.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "082a0dszdlynpf7lrkwijwcs2x8xmbzrjr8rrwmrmkznhzj50gqf"; + sha256 = "1q3f5bghm3jw5c7c62ivf32fldjqhmj1a0qlwgqjxyhmfcig0rnb"; }; installPhase = '' diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix new file mode 100644 index 000000000000..fae7809d25a2 --- /dev/null +++ b/pkgs/applications/misc/dstask/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "dstask"; + version = "0.18"; + + src = fetchFromGitHub { + owner = "naggie"; + repo = pname; + rev = "v${version}"; + sha256 = "16z5zlfj955pzsj0l58835slvpchdaq2vbyx2fjzi6y9xn1z2nd1"; + }; + + # Set vendorSha256 to null because dstask vendors its dependencies (meaning + # that third party dependencies are stored in the repository). + # + # Ref <https://github.com/NixOS/nixpkgs/pull/87383#issuecomment-633204382> + # and <https://github.com/NixOS/nixpkgs/blob/d4226e3a4b5fcf988027147164e86665d382bbfa/pkgs/development/go-modules/generic/default.nix#L18> + vendorSha256 = null; + + # The ldflags reduce the executable size by stripping some debug stuff. + # The other variables are set so that the output of dstask version shows the + # git ref and the release version from github. + # Ref <https://github.com/NixOS/nixpkgs/pull/87383#discussion_r432097657> + buildFlagsArray = [ '' + -ldflags=-w -s + -X "github.com/naggie/dstask.VERSION=${version}" + -X "github.com/naggie/dstask.GIT_COMMIT=v${version}" + '' ]; + + subPackages = [ "cmd/dstask.go" ]; + + meta = with stdenv.lib; { + description = "Command line todo list with super-reliable git sync"; + homepage = src.meta.homepage; + license = licenses.mit; + maintainers = with maintainers; [ stianlagstad foxit64 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index f8da250dbc79..5fad7b9ac031 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -1,22 +1,22 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-jira"; - version = "1.0.17"; + version = "1.0.23"; - goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1"; - - src = fetchgit { + src = fetchFromGitHub { rev = "v${version}"; - url = "https://gopkg.in/Netflix-Skunkworks/go-jira.v1"; - sha256 = "0ap5dzikp934mawigmv7ighajr5yxpck2gpnb2cmkc1p6qa6gn4v"; + owner = "go-jira"; + repo = "jira"; + sha256 = "0qk5ifjxkqisvgv066rw8xj2zszc9mhc0by4338xjd7ng10jkk7b"; }; + vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; + meta = with stdenv.lib; { description = "Simple command line client for Atlassian's Jira service written in Go"; - homepage = "https://github.com/Netflix-Skunkworks/go-jira"; + homepage = "https://github.com/go-jira/jira"; license = licenses.asl20; - maintainers = [ maintainers.carlosdagos ]; + maintainers = with maintainers; [ carlosdagos timstott ]; }; } diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index cd8ecc18223b..535985f1601d 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -6,17 +6,17 @@ , withExtraTiff ? true, libtiff , withFFmpeg ? true, libao, ffmpeg , withMultimedia ? true -, withZim ? true }: +, withZim ? true, zstd }: mkDerivation rec { pname = "goldendict"; - version = "2020-01-09"; + version = "2020-05-27"; src = fetchFromGitHub { owner = "goldendict"; repo = pname; - rev = "da197ff5cd0e7326124c9240a1853a0e8b1de439"; - sha256 = "0dlzwjh9wg4bzhhib71jycpp21qw762ww63a37dd50z1ymi61lxc"; + rev = "ec40c1dcfde6df1dc7950443b46ae22c283b1e52"; + sha256 = "1zmnwwnpnrqfyf7vmmh38r95q2fl4cqzbkp69bcwkr0xc80wgyz7"; }; patches = [ @@ -39,7 +39,8 @@ mkDerivation rec { ++ stdenv.lib.optional withCC opencc ++ stdenv.lib.optional withEpwing libeb ++ stdenv.lib.optional withExtraTiff libtiff - ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ]; + ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ] + ++ stdenv.lib.optional withZim zstd; qmakeFlags = with stdenv.lib; [ "goldendict.pro" diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix new file mode 100644 index 000000000000..418fe96a897b --- /dev/null +++ b/pkgs/applications/misc/gopacked/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gopacked"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "gopacked"; + rev = "v${version}"; + sha256 = "03qr8rlnipziy16nbcpf631jh42gsyv2frdnh8yzsh8lm0p8p4ry"; + }; + + vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352"; + + meta = with lib; { + description = "A simple text-based Minecraft modpack manager"; + license = licenses.agpl3; + homepage = src.meta.homepage; + maintainers = with maintainers; [ foxit64 ]; + }; + +} diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index c519bf63e093..b3dbecb56b1b 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,18 +1,28 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations }: mkDerivation rec { pname = "gpxsee"; - version = "7.29"; + version = "7.30"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4="; + sha256 = "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs"; }; + patches = [ + # See https://github.com/NixOS/nixpkgs/issues/86054 + ./fix-qttranslations-path.diff + ]; + nativeBuildInputs = [ qmake qttools ]; + postPatch = '' + substituteInPlace src/GUI/app.cpp \ + --subst-var-by qttranslations ${qttranslations} + ''; + preConfigure = '' lrelease gpxsee.pro ''; diff --git a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff new file mode 100644 index 000000000000..3b546338d209 --- /dev/null +++ b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff @@ -0,0 +1,18 @@ +diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp +index 10e84d5..1e0abbe 100644 +--- i/src/GUI/app.cpp ++++ w/src/GUI/app.cpp +@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) + installTranslator(gpxsee); + + QTranslator *qt = new QTranslator(this); +-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN32) + qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()); + #else // Q_OS_WIN32 || Q_OS_MAC +- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( +- QLibraryInfo::TranslationsPath)); ++ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); + #endif // Q_OS_WIN32 || Q_OS_MAC + installTranslator(qt); + diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 7fe94cd2ff84..ba01f88cc58f 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.71.1"; + version = "0.72.0"; buildInputs = [ libsass ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0kx3q2i5p8k1dfkh02ns5ns97aqqvdcs0kx4bl9d38jk3lw3jrgh"; + sha256 = "05parzx0wm51z4qkvh4k096ykgiyr9i5xy55c0g99j4y96drcybb"; }; golibsass = fetchFromGitHub { @@ -27,7 +27,7 @@ buildGoModule rec { ''; }); - vendorSha256 = "1fz1wvw0jy3rj6pl1w6vpr0xr1v8pnpf76bwdalacqy6r85lxmkl"; + vendorSha256 = "07dkmrldsxw59v6r4avj1gr4hsaxybhb14qv61hc777qix2kq9v1"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 0261dfbe8991..5676aef23607 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -11,7 +11,7 @@ let owner = "pyproj4"; repo = "pyproj"; rev = "v${version}rel"; - sha256 = "sha256:18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy"; + sha256 = "18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy"; }; nativeBuildInputs = with python.pkgs; [ cython ]; patches = [ ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 3c192c124cbe..7d613f376758 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -20,6 +20,7 @@ let (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") + (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix new file mode 100644 index 000000000000..9042ab38e758 --- /dev/null +++ b/pkgs/applications/misc/razergenie/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, lib, meson, ninja, pkgconfig, qtbase, qttools +, wrapQtAppsHook +, enableExperimental ? false +, includeMatrixDiscovery ? false +}: + +let + version = "0.8.1"; + pname = "razergenie"; + +in stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "z3ntu"; + repo = "RazerGenie"; + rev = "v${version}"; + sha256 = "1ggxnaidxbbpkv1h3zwwyci6886sssgslk5adbikbhz9kc9qg239"; + }; + + nativeBuildInputs = [ + pkgconfig meson ninja wrapQtAppsHook + ]; + + buildInputs = [ + qtbase qttools + ]; + + mesonFlags = [ + "-Denable_experimental=${if enableExperimental then "true" else "false"}" + "-Dinclude_matrix_discovery=${if includeMatrixDiscovery then "true" else "false"}" + ]; + + meta = with lib; { + homepage = "https://github.com/z3ntu/RazerGenie"; + description = "Qt application for configuring your Razer devices under GNU/Linux"; + license = licenses.gpl3; + maintainers = with maintainers; [ f4814n ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 43393478ec4a..05dc4c429b61 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -9,6 +9,7 @@ , withGeolocation ? true , withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa , withGeoclue ? withGeolocation && stdenv.isLinux, geoclue +, withAppIndicator ? true, libappindicator }: let @@ -50,6 +51,7 @@ let ++ stdenv.lib.optional withDrm libdrm ++ stdenv.lib.optional withQuartz ApplicationServices ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] + ++ stdenv.lib.optional withAppIndicator libappindicator ; pythonPath = [ pygobject3 pyxdg ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index d2a883c295db..83a7e9d62165 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -3,12 +3,12 @@ # adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "${version}"; - sha256 = "1ni3aimpl9vyhwzi61mvm8arkii52cmb6bzjma9cnkjyx328pkid"; + sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; }; propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 798f1708ae70..be9027f9d098 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.20"; + version = "1.22"; src = fetchurl { url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; - sha256 = "0w885xqy1304cp6b0jll5lvm6b1zd1ciqjl97d2hkdi8c9gv3bqx"; + sha256 = "09w2040xkvv78190fmhx99c0dwy7vpab5fvxs67s7yyjwh5n4693"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index aa2246603f33..a6efc492d8a3 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "udiskie"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1d8fz0jrnpgldvdwpl27az2kjhpbcjd8nqn3qc2v6682q12p3jqb"; + sha256 = "0kn5w6bm3rmbszphzbxpjfnkawb2naa230svzkpmh3n6dcdvk4qa"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 330d778c5de8..aeece53e779b 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; + sha256 = "11vy39zygk1gxb1nc1zmxlgs6fn7yq68090fwm2jar0lsxx8a83i"; }; - vendorSha256 = "1q54bl1z9ljpsf63i5r6vzv7f143slja0n8lyppaxxdcg18h8gn0"; + vendorSha256 = "0qfb352gmsmy5glrsjwc3w57di5k2kjdsyfqn4xf7p4v12yg88va"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index e5dc92c4ad62..84e4eee2bddc 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "Release-${version}"; - sha256 = "sha256-IdlRScAy7tCyVCElCceY4PvqPXWfZZ35f+MwCo3nO3s="; + sha256 = "0yrvwy6hlc73gzwrsrczflyymyz0k33hj991ajrd1vijq14m3n91"; }; buildInputs = [ |