Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

2 files changed, 9 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/development/libraries/medfile/default.nix b/nixpkgs/pkgs/development/libraries/medfile/default.nix
index c8ff0c05aded..9593781f2270 100644
--- a/nixpkgs/pkgs/development/libraries/medfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/medfile/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "medfile";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz";
-    sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4";
+    sha256 = "sha256-3CtdVOvwZm4/8ul0BB0qsNqQYGEyNTcCOrFl1XM4ndA=";
   };
 
   patches = [
-    ./hdf5-1.12.patch
+    ./hdf5-1.14.patch
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/medfile/hdf5-1.12.patch b/nixpkgs/pkgs/development/libraries/medfile/hdf5-1.14.patch
index ab73e00487ce..294e87c023a7 100644
--- a/nixpkgs/pkgs/development/libraries/medfile/hdf5-1.12.patch
+++ b/nixpkgs/pkgs/development/libraries/medfile/hdf5-1.14.patch
@@ -25,7 +25,7 @@
  #error "Don't forget to update the test version here when you change the major version of the library !"
  #endif
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
++#if H5_VERS_MINOR > 14
  #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
  #error "Cf. _MEDfileCreate ..."
  #endif
@@ -36,7 +36,7 @@
     * Un test autoconf permet de fixer un intervalle de version HDF à MED.
     */
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
++#if H5_VERS_MINOR > 14
  #error "Don't forget to change the compatibility version of the library !"
  #endif
     
@@ -47,7 +47,7 @@
     •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
    */
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
++#if H5_VERS_MINOR > 14
  #error "Don't forget to change the compatibility version of the library !"
  #endif
  /* L'avantage de bloquer le modèle interne HDF5 
@@ -58,7 +58,7 @@
    }
  
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
++#if H5_VERS_MINOR > 14
  #error "Don't forget to change the compatibility version of the library !"
  #endif
    if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
@@ -69,7 +69,7 @@
     * Un test autoconf permet de fixer un intervalle de version HDF à MED.
     */
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
++#if H5_VERS_MINOR > 14
  #error "Don't forget to change the compatibility version of the library !"
  #endif
     
@@ -80,7 +80,7 @@
      goto ERROR;
    }
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
++#if H5_VERS_MINOR > 14
  #error "Don't forget to change the compatibility version of the library !"
  #endif
    if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {