Merge master into staging-next

2019-08-18 12:53:44 +02:00
parent b8a79ac677 ffbb4d26f9
commit f65aa21bb2
125 changed files with 3217 additions and 885 deletions
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, unzip }:

 stdenv.mkDerivation rec {
-
  pname = "cimg";
-  version = "2.6.7";
+  version = "2.7.0";

  src = fetchurl {
    url = "http://cimg.eu/files/CImg_${version}.zip";
-    sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m";
+    sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv";
  };

  nativeBuildInputs = [ unzip ];