diff options
Diffstat (limited to 'pkgs/applications/misc')
5 files changed, 12 insertions, 100 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 4e928ff34f0..a41ee209a0b 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.3.0"; + version = "7.3.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,10 +30,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; + sha256 = "sha256-4UVC5lBoGsW99L6AgM+1Rs07LCrvp2qVevBrooTbee4="; }; installPhase = '' + # remove bundled jre + rm -rf jre + mkdir -p $out/ cp -r . $out/dbeaver diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 2fd29444dad..9b0ffe67f0c 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh", - "version": "1.5.2-bead991b", - "sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh", + "version": "1.5.15-28673d1c", + "sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2" } diff --git a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch deleted file mode 100644 index 34e4e6f0e7f..00000000000 --- a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001 -From: Arnout Engelen <arnout@bzzt.net> -Date: Tue, 24 Nov 2020 15:34:40 +0100 -Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself - -Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer -start since it'd try to invoke the inkcut.py from the extension -instead of the main application ---- - plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +- - plugins/inkscape/inkcut_cut.inx | 2 +- - plugins/inkscape/inkcut_cut.py | 2 +- - plugins/inkscape/inkcut_open.inx | 2 +- - plugins/inkscape/inkcut_open.py | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%) - -diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py -similarity index 98% -rename from plugins/inkscape/inkcut.py -rename to plugins/inkscape/inkcut4inkscape.py -index 5b90475..7dc8d86 100644 ---- a/plugins/inkscape/inkcut.py -+++ b/plugins/inkscape/inkcut4inkscape.py -@@ -2,7 +2,7 @@ - # -*- coding: utf-8 -*- - """ - Inkcut, Plot HPGL directly from Inkscape. -- inkcut.py -+ inkcut4inkscape.py - - Copyright 2018 The Inkcut Team - -diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx -index 4b44ae5..3db8721 100644 ---- a/plugins/inkscape/inkcut_cut.inx -+++ b/plugins/inkscape/inkcut_cut.inx -@@ -2,7 +2,7 @@ - <_name>Cut selection...</_name> - <id>org.ekips.filter.inkcut.cut</id> - <dependency type="executable" location="extensions">inkcut_cut.py</dependency> -- <dependency type="executable" location="extensions">inkcut.py</dependency> -+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> - <dependency type="executable" location="extensions">inkex.py</dependency> - <effect> - <object-type>all</object-type> -diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py -index acaf812..777629a 100644 ---- a/plugins/inkscape/inkcut_cut.py -+++ b/plugins/inkscape/inkcut_cut.py -@@ -37,7 +37,7 @@ - else: - inkex.localize() - import subprocess --from inkcut import contains_text, convert_objects_to_paths -+from inkcut4inkscape import contains_text, convert_objects_to_paths - - - -diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx -index 45ee585..2dcd38e 100644 ---- a/plugins/inkscape/inkcut_open.inx -+++ b/plugins/inkscape/inkcut_open.inx -@@ -2,7 +2,7 @@ - <_name>Open current document...</_name> - <id>org.ekips.filter.inkcut.open</id> - <dependency type="executable" location="extensions">inkcut_open.py</dependency> -- <dependency type="executable" location="extensions">inkcut.py</dependency> -+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> - <dependency type="executable" location="extensions">inkex.py</dependency> - <effect> - <object-type>all</object-type> -diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py -index b4652eb..e4c2d62 100644 ---- a/plugins/inkscape/inkcut_open.py -+++ b/plugins/inkscape/inkcut_open.py -@@ -38,7 +38,7 @@ - inkex.localize() - import subprocess - --from inkcut import convert_objects_to_paths -+from inkcut4inkscape import convert_objects_to_paths - - DEBUG = False - try: diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 481069feac0..4ca373ee275 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -8,21 +8,15 @@ with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; + sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; }; - patches = [ - # https://github.com/inkcut/inkcut/pull/292 but downloaded - # because of https://github.com/NixOS/nixpkgs/issues/32084 - ./avoid-name-clash-between-inkcut-and-extension.patch - ]; - nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b33c091a581..3379e2e9b9d 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.22"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ="; + sha256 = "wnCgW4EAcg0Oc1fqOZBYKN2g8N27riL+yonoIy0AfxA="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; |