NixOS · Jul 29, 2017 · Jul 29, 2017
Showing with 39 additions and 23 deletions.

+24 −15 pkgs/development/libraries/gdal/default.nix

+15 −8 pkgs/servers/sql/mariadb/default.nix
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
@@ -7,13 +7,13 @@
 
 with stdenv.lib;
 
-composableDerivation.composableDerivation {} (fixed: rec {
-  version = "2.1.3";
+stdenv.mkDerivation rec {
+  version = "2.2.1";
   name = "gdal-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf";
+    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
@@ -22,16 +22,6 @@ composableDerivation.composableDerivation {} (fixed: rec {
   ++ stdenv.lib.optional stdenv.isDarwin libiconv
   ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
-  hardeningDisable = [ "format" ];
-
-  # - Unset CC and CXX as they confuse libtool.
-  # - teach gdal that libdf is the legacy name for libhdf
-  preConfigure = ''
-      unset CC CXX
-      substituteInPlace configure \
-      --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
-    '';
-
   configureFlags = [
     "--with-jpeg=${libjpeg.dev}"
     "--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
@@ -50,6 +40,25 @@ composableDerivation.composableDerivation {} (fixed: rec {
     (if netcdfSupport then "--with-netcdf=${netcdf}" else "")
   ];
 
+  hardeningDisable = [ "format" ];
+
+  CXXFLAGS = "-fpermissive";
+
+  postPatch = ''
+    sed -i '/ifdef bool/i\
+      #ifdef swap\
+      #undef swap\
+      #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h
+  '';
+
+  # - Unset CC and CXX as they confuse libtool.
+  # - teach gdal that libdf is the legacy name for libhdf
+  preConfigure = ''
+      unset CC CXX
+      substituteInPlace configure \
+      --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
+    '';
+
   preBuild = ''
     substituteInPlace swig/python/GNUmakefile \
       --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)"
@@ -66,4 +75,4 @@ composableDerivation.composableDerivation {} (fixed: rec {
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
-})
+}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
@@ -15,26 +15,33 @@ mariadb = everything // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.2.6";
+  version = "10.2.7";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
-    sha256 = "1rd2b1b6s87ymr5qhlggr4q4ljazv82ih0msgrbz1rfn81pcg1f3";
+    sha256 = "1g60fskf8w633icjjjj08a7h4ha6vaczyczlm4was9c3qjxs2nr2";
     name   = "mariadb-${version}.tar.gz";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [
+    ncurses openssl zlib pcre jemalloc
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/MariaDB/server/commit/7fc75c420a47fd29a399468b920641ebb43fa75c.patch";
+      sha256 = "0rgppcycw4gjkayz8fn4412dkplghpfzs3bq8ib1jqb9xzi3zvww";
+    })
+  ];
+
   prePatch = ''
     substituteInPlace cmake/libutils.cmake \
       --replace /usr/bin/libtool libtool
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
   '';
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [
-    ncurses openssl zlib pcre jemalloc
-  ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
 
   cmakeFlags = [
     "-DBUILD_CONFIG=mysql_release"