summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorrys ostrovid <nek0@chelnok.de>2018-06-19 10:09:20 +0200
committerJörg Thalheim <Mic92@users.noreply.github.com>2018-06-19 09:09:20 +0100
commitc89b6f47a739f02f08a9441bd3628463fde3f4e2 (patch)
tree93f48a60ede7780d8f84f42ec3df789a2e69af93 /pkgs
parent93befc0197aae8b65a63f62da87f7e85ab9a5213 (diff)
downloadnixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.tar
nixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.tar.gz
nixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.tar.bz2
nixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.tar.lz
nixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.tar.xz
nixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.tar.zst
nixlib-c89b6f47a739f02f08a9441bd3628463fde3f4e2.zip
vym: 2.2.4 -> 2.6.11 (#42186)
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/vym/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index e06242f7a024..48818ca3b8b1 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }:
+{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
 
 stdenv.mkDerivation rec {
   name = "vym-${version}";
-  version = "2.2.4";
+  version = "2.6.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2";
-    sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs";
+    url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2";
+    sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
   };
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ qt4 qmake4Hook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ qtsvg ];
 
   meta = with stdenv.lib; {
     description = "A mind-mapping software";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe4b9f74641..fd778deea95d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18590,7 +18590,7 @@ with pkgs;
 
   vwm = callPackage ../applications/window-managers/vwm { };
 
-  vym = callPackage ../applications/misc/vym { };
+  vym = qt5.callPackage ../applications/misc/vym { };
 
   w3m = callPackage ../applications/networking/browsers/w3m {
     graphicsSupport = !stdenv.isDarwin;