diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:09:26 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:09:26 +0100 |
commit | 73b88e17dda6eb6546e0fdcefeb3251f806d88d3 (patch) | |
tree | 4ec0603851ec82737ccbc387fe1db1bb63a572fa /pkgs/applications/misc | |
parent | 539e94030c226562433e5ff96299dffb0641427a (diff) | |
parent | cf27abf534930ecb1657c4a4e7466ed15c4a2076 (diff) | |
download | nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.gz nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.bz2 nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.lz nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.xz nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.zst nixpkgs-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/appeditor/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch | 22 | ||||
-rw-r--r-- | pkgs/applications/misc/epr/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/misc/kanboard/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/lsd2dsl/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/misc/twmn/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/variety/default.nix | 73 | ||||
-rw-r--r-- | pkgs/applications/misc/verbiste/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/wego/default.nix | 2 |
10 files changed, 171 insertions, 10 deletions
diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 398e14a9c25..68cd91c1676 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { libgee ]; + patches = [ + # See: https://github.com/donadigo/appeditor/issues/88 + ./fix-build-vala-0.46.patch + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch b/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch new file mode 100644 index 00000000000..f6c0b4cfd28 --- /dev/null +++ b/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch @@ -0,0 +1,22 @@ +diff --git a/src/DesktopApp.vala b/src/DesktopApp.vala +index 0e6fa47..ebcde0c 100644 +--- a/src/DesktopApp.vala ++++ b/src/DesktopApp.vala +@@ -130,7 +130,7 @@ public class AppEditor.DesktopApp : Object { + + public unowned string get_path () { + if (path == null) { +- unowned string _path = info.get_string (KeyFileDesktop.KEY_PATH); ++ string _path = info.get_string (KeyFileDesktop.KEY_PATH); + if (_path == null) { + _path = ""; + } +@@ -150,7 +150,7 @@ public class AppEditor.DesktopApp : Object { + } + + public bool get_should_show () { +- return info.should_show () && !get_terminal (); ++ return info.should_show () && !get_terminal (); + } + + public string[] get_categories () { diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix new file mode 100644 index 00000000000..f67c15f0a99 --- /dev/null +++ b/pkgs/applications/misc/epr/default.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "epr"; + version = "2.3.0b"; + + src = fetchFromGitHub { + owner = "wustho"; + repo = pname; + rev = "v${version}"; + sha256 = "1a6md3015284hzmx0sby5kl59p7lwv73sq7sid35vrr15zrl0aw7"; + }; + + meta = with lib; { + description = "CLI Epub Reader"; + homepage = "https://github.com/wustho/epr"; + license = licenses.mit; + maintainers = [ maintainers.filalex77 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index e3c75b25b47..0bdf8e49d96 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0k45vfiacvwmrglpqwjq22pvdg4n0mf75x0r8nb79bmxp8sk0j0c"; + sha256 = "0if5nh4m4y3xlvlv86jph7ix5nvpgc1zjkp4cq5iig6z0041bw98"; }; dontBuild = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 8670371b006..6701c910a1f 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -26,6 +26,8 @@ , withKeePassKeeShareSecure ? true , withKeePassSSHAgent ? true , withKeePassNetworking ? false +, withKeePassTouchID ? true +, withKeePassFDOSecrets ? true }: with stdenv.lib; @@ -69,6 +71,8 @@ stdenv.mkDerivation rec { ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") ++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON") ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") + ++ (optional (withKeePassTouchID && stdenv.isDarwin) "-DWITH_XC_TOUCHID=ON") + ++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix new file mode 100644 index 00000000000..5dd5fa0f512 --- /dev/null +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -0,0 +1,36 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake +, boost, libvorbis, libsndfile, minizip, gtest }: + +mkDerivation rec { + pname = "lsd2dsl"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "nongeneric"; + repo = pname; + rev = "v${version}"; + sha256 = "15xjp5xxvl0qc4zp553n7djrbvdp63sfjw406idgxqinfmkqkqdr"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost libvorbis libsndfile minizip gtest ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + + installPhase = '' + install -Dm755 lsd2dsl $out/bin/lsd2dsl + install -m755 qtgui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + ''; + + meta = with lib; { + homepage = "https://rcebits.com/lsd2dsl/"; + description = "Lingvo dictionaries decompiler"; + longDescription = '' + A decompiler for ABBYY Lingvo’s proprietary dictionaries. + ''; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 2aef45748ca..cd58219721c 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: -stdenv.mkDerivation { +mkDerivation { name = "twmn-git-2018-10-01"; src = fetchFromGitHub { @@ -29,8 +29,8 @@ stdenv.mkDerivation { meta = { description = "A notification system for tiling window managers"; homepage = https://github.com/sboli/twmn; - platforms = with stdenv.lib.platforms; linux; - maintainers = [ stdenv.lib.maintainers.matejc ]; - license = stdenv.lib.licenses.lgpl3; + platforms = with lib.platforms; linux; + maintainers = [ lib.maintainers.matejc ]; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix new file mode 100644 index 00000000000..6d8da4a1007 --- /dev/null +++ b/pkgs/applications/misc/variety/default.nix @@ -0,0 +1,73 @@ +{ + fehSupport ? false, feh +, imagemagickSupport ? true, imagemagick +, stdenv +, lib +, python37Packages +, fetchFromGitHub +, intltool +, gtk3 +, gexiv2 +, libnotify +, wrapGAppsHook +, gobject-introspection +, hicolor-icon-theme +, librsvg +}: + +with python37Packages; + +buildPythonApplication rec { + pname = "variety"; + version = "0.7.2-96-g3afe3ab"; + + src = fetchFromGitHub { + owner = "varietywalls"; + repo = "variety"; + rev = "3afe3abf725e5db2aec0db575a17c9907ab20de1"; + sha256 = "10vw0202dwrwi497nsbq077v4qd3qn5b8cmkfcsgbvvjwlz7ldm5"; + }; + + nativeBuildInputs = [ intltool wrapGAppsHook ]; + + buildInputs = [ distutils_extra ]; + + doCheck = false; + + prePatch = '' + substituteInPlace variety_lib/varietyconfig.py \ + --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\"" + substituteInPlace data/scripts/set_wallpaper \ + --replace /bin/bash ${stdenv.shell} + substituteInPlace data/scripts/get_wallpaper \ + --replace /bin/bash ${stdenv.shell} + ''; + + propagatedBuildInputs = + [ gtk3 + gexiv2 + libnotify + beautifulsoup4 + lxml + pycairo + pygobject3 + configobj + pillow + setuptools + requests + httplib2 + dbus-python + gobject-introspection + hicolor-icon-theme + librsvg + ] + ++ lib.optional fehSupport feh + ++ lib.optional imagemagickSupport imagemagick; + + meta = with lib; { + description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more"; + homepage = https://github.com/varietywalls/variety; + license = licenses.gpl3; + maintainers = [ maintainers.zfnmxt ]; + }; +} diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index b6a8b567a50..680573fd304 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "verbiste"; - version = "0.1.46"; + version = "0.1.47"; src = fetchurl { url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0"; + sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 93f50fb5370..567d299fd3a 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "wego"; - version = "20170403-${stdenv.lib.strings.substring 0 7 rev}"; + version = "unstable-2017-04-03"; rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c"; goPackagePath = "github.com/schachmat/wego"; |