about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-10-22 09:15:19 +0200
committerGitHub <noreply@github.com>2019-10-22 09:15:19 +0200
commitd7a921cad9d646844c4b21977131ccb0ecf34e6f (patch)
tree159e098f5828d0fcb3dfa318858c8f9073395328 /pkgs/applications
parent3ca78c1a12a89c5e59fd39589a1092625a2e8e5a (diff)
parentb6ba25ce95e5a26839a1be58a8f26c19d5231192 (diff)
downloadnixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar
nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.gz
nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.bz2
nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.lz
nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.xz
nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.zst
nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.zip
Merge pull request #71221 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/graphics/potrace/default.nix7
-rw-r--r--pkgs/applications/networking/browsers/midori/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/wavebox/default.nix4
3 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index f50af2925a3a..35ab27bcbf63 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -2,17 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "potrace";
-  version = "1.15";
+  version = "1.16";
 
   src = fetchurl {
     url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
-    sha256 = "17ajildjp14shsy339xarh1lw1p0k60la08ahl638a73mh23kcx9";
+    sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my";
   };
 
   configureFlags = [ "--with-libpotrace" ];
 
   buildInputs = [ zlib ];
 
+  enableParallelBuilding = true;
+  doCheck = true;
+
   meta = with stdenv.lib; {
     homepage = http://potrace.sourceforge.net/;
     description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image";
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index f87ba43f2bba..1d1928d168b6 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -4,7 +4,7 @@
 , ninja
 , pkgconfig
 , intltool
-, vala_0_44
+, vala
 , wrapGAppsHook
 , gcr
 , libpeas
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     intltool
     ninja
     pkgconfig
-    vala_0_44
+    vala
     wrapGAppsHook
   ];
 
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 9dbff13aca6c..ceb9b4a11403 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 let
   bits = "x86_64";
 
-  version = "4.7.3";
+  version = "4.11.3";
 
   desktopItem = makeDesktopItem rec {
     name = "Wavebox";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
   inherit version;
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
-    sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23";
+    sha256 = "0z04071lq9bfyrlg034fmvd4346swgfhxbmsnl12m7c2m2b9z784";
   };
 
   # don't remove runtime deps