From 7c42da3a1e48ce74b79ec72f734cc624965427bd Mon Sep 17 00:00:00 2001
From: Josef Kemetmüller <josef.kemetmueller@gmail.com>
Date: Sun, 16 Dec 2018 16:03:37 +0100
Subject: eccodes: 2.9.2 -> 2.10.0

Python3 is now officially supported as "beta", see relase notes at:
https://confluence.ecmwf.int/display/ECC/ecCodes+version+2.10.0+released
---
 pkgs/development/libraries/eccodes/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix             | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 57a55cfc39b9..c26956f6ea24 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
-  version = "2.9.2";
+  version = "2.10.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "18gjzhz7bkibc34a0djq1r4b2y3hpn7ym0zs0nj07yq58v4pdx08";
+    sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4bb2c0ed0f6..adafdb40e4d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1613,11 +1613,10 @@ in {
 
   easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
 
-  eccodes = disabledIf (!isPy27)
-    (toPythonModule (pkgs.eccodes.override {
-      enablePython = true;
-      pythonPackages = self;
-    }));
+  eccodes = toPythonModule (pkgs.eccodes.override {
+    enablePython = true;
+    pythonPackages = self;
+  });
 
   EditorConfig = callPackage ../development/python-modules/editorconfig { };
 
-- 
cgit 1.4.1