From 20812393c55b8daa6c63fc74b7a4eb5cdb08faeb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 10:06:52 -0300 Subject: [PATCH 1/3] vym: 2.8.42 -> 2.9.0 --- pkgs/applications/misc/vym/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 306d9995ae38..4d6fd20dd76f 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,7 +1,7 @@ { lib , stdenv -, fetchFromGitHub , cmake +, fetchFromGitHub , pkg-config , qtbase , qtscript @@ -14,15 +14,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "vym"; - version = "2.8.42"; + version = "2.9.0"; src = fetchFromGitHub { owner = "insilmaril"; repo = "vym"; - rev = "89f50bcba953c410caf459b0a4bfbd09018010b7"; # not tagged yet (why??) - hash = "sha256-xMXvc8gt3nfKWbU+WoS24wCUTGDQRhG0Q9m7yDhY5/w="; + rev = "v${finalAttrs.version}"; + hash = "sha256-ruT8BGin6CsgsmhQzcCTZoj8NfP43+xmM46Av3W8qZM="; }; + outputs = [ "out" "man" ]; + patches = [ (substituteAll { src = ./000-fix-zip-paths.diff; @@ -43,11 +45,13 @@ stdenv.mkDerivation (finalAttrs: { qtsvg ]; + strictDeps = true; + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}" ]; - meta = with lib; { + meta = { homepage = "http://www.insilmaril.de/vym/"; description = "A mind-mapping software"; longDescription = '' @@ -61,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: { drawn by hand or any drawing software vym offers much more features to work with such maps. ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; }) From 9671dc9aea99ff7d0991f6735dde2b14bf2846af Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 10:19:03 -0300 Subject: [PATCH 2/3] vym: 2.9.0 -> 2.9.22 --- pkgs/applications/misc/vym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 4d6fd20dd76f..432a662c2f1e 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vym"; - version = "2.9.0"; + version = "2.9.22"; src = fetchFromGitHub { owner = "insilmaril"; repo = "vym"; rev = "v${finalAttrs.version}"; - hash = "sha256-ruT8BGin6CsgsmhQzcCTZoj8NfP43+xmM46Av3W8qZM="; + hash = "sha256-zeQYnJsVlHn79qaipk+lhTwSLKDRyUivY6vn5uQYch0="; }; outputs = [ "out" "man" ]; From 4f1186ef15c4530cbae297161d1565b5416bf4b2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 10:21:05 -0300 Subject: [PATCH 3/3] vym: 2.9.22 -> 2.9.26 --- pkgs/applications/misc/vym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 432a662c2f1e..4815a7bc10af 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vym"; - version = "2.9.22"; + version = "2.9.26"; src = fetchFromGitHub { owner = "insilmaril"; repo = "vym"; rev = "v${finalAttrs.version}"; - hash = "sha256-zeQYnJsVlHn79qaipk+lhTwSLKDRyUivY6vn5uQYch0="; + hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M="; }; outputs = [ "out" "man" ];