diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
24 files changed, 88 insertions, 61 deletions
diff --git a/nixpkgs/pkgs/applications/misc/alacritty/default.nix b/nixpkgs/pkgs/applications/misc/alacritty/default.nix index dfd1ddf8503f..c69a523691f2 100644 --- a/nixpkgs/pkgs/applications/misc/alacritty/default.nix +++ b/nixpkgs/pkgs/applications/misc/alacritty/default.nix @@ -2,23 +2,27 @@ lib, fetchFromGitHub, rustPlatform, + cmake, + gzip, makeWrapper, ncurses, - expat, pkgconfig, - freetype, + python3, + + expat, fontconfig, + freetype, + libGL, libX11, - gzip, libXcursor, - libXxf86vm, libXi, libXrandr, - libGL, - xclip, - wayland, + libXxf86vm, + libxcb, libxkbcommon, + wayland, + # Darwin Frameworks cf-private, AppKit, @@ -34,37 +38,39 @@ with rustPlatform; let rpathLibs = [ expat - freetype fontconfig + freetype + libGL libX11 libXcursor - libXxf86vm - libXrandr - libGL libXi + libXrandr + libXxf86vm + libxcb ] ++ lib.optionals stdenv.isLinux [ - wayland libxkbcommon + wayland ]; in buildRustPackage rec { pname = "alacritty"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "jwilm"; repo = pname; rev = "v${version}"; - sha256 = "16lhxfpwysd5ngw8yq76vbzjdmfzs9plsvairf768hnl290jcpbh"; + sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750"; }; - cargoSha256 = "02q5kkr0zygpm9i2hd1sr246f18pyia1lq9dwjagqk7d2x3xlc7p"; + cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1"; nativeBuildInputs = [ cmake + gzip makeWrapper - pkgconfig ncurses - gzip + pkgconfig + python3 ]; buildInputs = rpathLibs @@ -76,11 +82,6 @@ in buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = '' - substituteInPlace copypasta/src/x11.rs \ - --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) - ''; - postBuild = lib.optionalString stdenv.isDarwin "make app"; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/buku/default.nix b/nixpkgs/pkgs/applications/misc/buku/default.nix index 4a73e6b002ee..60ade661cffd 100644 --- a/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub, fetchpatch }: +{ stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { version = "4.2.2"; diff --git a/nixpkgs/pkgs/applications/misc/cardpeek/default.nix b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix index 9b2192708090..a0e5c8149968 100644 --- a/nixpkgs/pkgs/applications/misc/cardpeek/default.nix +++ b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook, +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, gtk3, pcsclite, lua5_2, curl, readline }: let version = "0.8.4"; diff --git a/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/nixpkgs/pkgs/applications/misc/curaengine/default.nix index 25cfccd3ed38..a7339acddee2 100644 --- a/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb, protobuf }: +{ stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: stdenv.mkDerivation rec { name = "curaengine-${version}"; diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 1ffb3e37728e..77a25f2755f0 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "6.0.5"; + version = "6.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 = "19gn6vkjl8dpmqpn26llhvc3yahjwj00wqvvimfsrqd32wgj2and"; + sha256 = "0ngfv5pcj8hs7zcddwk0jw0l7hnm768wp76yrfyk38wkijk9f412"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/ddgr/default.nix b/nixpkgs/pkgs/applications/misc/ddgr/default.nix index 0716125859b1..b010e5401b80 100644 --- a/nixpkgs/pkgs/applications/misc/ddgr/default.nix +++ b/nixpkgs/pkgs/applications/misc/ddgr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchpatch, fetchFromGitHub, python3}: +{stdenv, fetchFromGitHub, python3}: stdenv.mkDerivation rec { version = "1.6"; diff --git a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix index 0272cfd52c08..58bc483d43f3 100644 --- a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix +++ b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix @@ -3,7 +3,6 @@ , curl , fetchFromGitHub , git -, libcap , libevent , libtool , qrencode diff --git a/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 11adfaaf80d0..788ff9b638b9 100644 --- a/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -1,11 +1,5 @@ { lib, fetchurl, python3Packages, qtbase, makeWrapper }: -let - - python = python3Packages.python; - -in - python3Packages.buildPythonApplication rec { pname = "electron-cash"; version = "4.0.2"; diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index f00d6cfc60da..f0da4e883517 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch, +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: diff --git a/nixpkgs/pkgs/applications/misc/gImageReader/default.nix b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix index e0fd33d5e612..062bca5b215e 100644 --- a/nixpkgs/pkgs/applications/misc/gImageReader/default.nix +++ b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix @@ -6,8 +6,8 @@ # Gtk deps # upstream gImagereader supports Qt too -, gtk3, gobject-introspection, wrapGAppsHook -, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm +, gobject-introspection, wrapGAppsHook +, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm }: let diff --git a/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix index 6bc18ba37904..dd0a5c9a4f60 100644 --- a/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, makeDesktopItem, makeWrapper +{ stdenv, fetchzip, makeDesktopItem, makeWrapper , jre }: diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 75800134de07..8c9833ae40d1 100644 --- a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchFromGitHub, qmake, qttools }: +{ stdenv, fetchFromGitHub, qmake, qttools, makeWrapper }: stdenv.mkDerivation rec { pname = "gpxsee"; - version = "7.8"; + version = "7.9"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j"; + sha256 = "029l5dhc9nnxiw7p0s4gyfkcqw709z7lz96aq8krs75mfk4fv07k"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ qttools ]; preConfigure = '' - substituteInPlace src/common/programpaths.cpp --replace /usr/share/ $out/share/ lrelease lang/*.ts ''; enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/gpxsee \ + --prefix XDG_DATA_DIRS ":" $out/share + ''; + meta = with stdenv.lib; { homepage = https://www.gpxsee.org/; description = "GPS log file viewer and analyzer"; diff --git a/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index a35079e91517..9274c2d05216 100644 --- a/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchzip, stdenv, makeWrapper, openjdk }: +{ fetchzip, stdenv, makeWrapper, openjdk }: stdenv.mkDerivation rec { name = "gremlin-console-${version}"; diff --git a/nixpkgs/pkgs/applications/misc/grsync/default.nix b/nixpkgs/pkgs/applications/misc/grsync/default.nix new file mode 100644 index 000000000000..3e1bb31091f8 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/grsync/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }: + +stdenv.mkDerivation rec { + version = "1.2.6"; + pname = "grsync"; + + src = fetchurl { + url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; + sha256 = "06ani65d58p8r3jvxjwpwyqrr07ya3icdqc243nxcrv7bvmarmb6"; + }; + + nativeBuildInputs = [ + intltool + pkg-config + ]; + + buildInputs = [ + dee + gtk2 + libdbusmenu-gtk2 + libunity + rsync + ]; + + meta = with stdenv.lib; { + description = "Grsync is used to synchronize folders, files and make backups"; + homepage = "http://www.opbyte.it/grsync/"; + license = licenses.gpl1; + platforms = platforms.linux; + maintainers = [ maintainers.kuznero ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index bfc4ac796154..4f7acb7731ab 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "15031"; + version = "15155"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "19qw1s5v0dha329a7rfnhby0rq5d109b3f1ln2w1dfkmirbl75ir"; + sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix index bf29e05db1b8..7c5845b35419 100644 --- a/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix +++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig -, zlib, libpng, openjpeg +, zlib, libpng , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf diff --git a/nixpkgs/pkgs/applications/misc/kitty/default.nix b/nixpkgs/pkgs/applications/misc/kitty/default.nix index aa234cf4a253..9b77bdcd2a54 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -2,7 +2,7 @@ harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, - which, dbus, fetchpatch, + which, dbus, Cocoa, CoreGraphics, Foundation, diff --git a/nixpkgs/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix index 3ccceb0e9220..070d293a183f 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub, fetchpatch -, wrapGAppsHook, python2Packages, python3Packages }: +{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub +, wrapGAppsHook, python3Packages }: let qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ]; diff --git a/nixpkgs/pkgs/applications/misc/taskell/default.nix b/nixpkgs/pkgs/applications/misc/taskell/default.nix index 743d89de4add..1a1ea3102afd 100644 --- a/nixpkgs/pkgs/applications/misc/taskell/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskell/default.nix @@ -1,4 +1,4 @@ -{ haskell, lib, haskellPackages, fetchFromGitHub }: +{ lib, haskellPackages, fetchFromGitHub }: let version = "1.4.3"; diff --git a/nixpkgs/pkgs/applications/misc/termite/wrapper.nix b/nixpkgs/pkgs/applications/misc/termite/wrapper.nix index 0b12a905360c..379223d9076d 100644 --- a/nixpkgs/pkgs/applications/misc/termite/wrapper.nix +++ b/nixpkgs/pkgs/applications/misc/termite/wrapper.nix @@ -1,4 +1,4 @@ -{ makeWrapper, wrapGAppsHook, symlinkJoin, configFile ? null, termite }: +{ makeWrapper, symlinkJoin, configFile ? null, termite }: if configFile == null then termite else symlinkJoin { name = "termite-with-config-${termite.version}"; diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 961df1a4c530..12cf96580f74 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -1,12 +1,9 @@ { stdenv -, fetchFromGitHub , fetchurl , python27Packages -, substituteAll , gnome3 , gobject-introspection , wrapGAppsHook -, gtk3 , webkitgtk , libnotify , keybinder3 diff --git a/nixpkgs/pkgs/applications/misc/xcruiser/default.nix b/nixpkgs/pkgs/applications/misc/xcruiser/default.nix index 945072ce026e..8875c95fe578 100644 --- a/nixpkgs/pkgs/applications/misc/xcruiser/default.nix +++ b/nixpkgs/pkgs/applications/misc/xcruiser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gccmakedep, xorg, imake, libXt, libXaw, libXpm, libXext }: +{ stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: stdenv.mkDerivation { name = "xcruiser-0.30"; diff --git a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index 6280f24e22f9..3d4718990cb8 100644 --- a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchFromGitHub -, qmake, qtbase, qtquickcontrols, qtsvg -, python3, pyotherside, ncurses +{ stdenv, fetchurl +, qmake, qtbase, qtquickcontrols +, python3, pyotherside , pcsclite, yubikey-personalization , yubikey-manager, makeWrapper }: diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index e2c08a00da20..f3cacd21236e 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, meson, ninja, fetchurl, fetchFromGitHub +{ stdenv, lib, meson, ninja, fetchFromGitHub , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { |