From 2fa0810d11248a2767c9dae9a9c6dfea59252547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Ri=C3=9Fe?= <matthias.risze@t-online.de>
Date: Mon, 20 Sep 2021 15:09:59 +0200
Subject: [PATCH 1/3] eccodes: 2.12.5 -> 2.23.0

---
 pkgs/development/libraries/eccodes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 1050490a220b..76907e9dc87a 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -1,23 +1,23 @@
 { fetchurl, lib, stdenv
-, cmake, netcdf, openjpeg, libpng, gfortran
+, cmake, netcdf, openjpeg, libpng, gfortran, perl
 , enablePython ? false, pythonPackages
 , enablePosixThreads ? false
 , enableOpenMPThreads ? false}:
 with lib;
 stdenv.mkDerivation rec {
   pname = "eccodes";
-  version = "2.12.5";
+  version = "2.23.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "0576fccng4nvmq5gma1nb1v00if5cwl81w4nv5zkb80q5wicn50c";
+    sha256 = "sha256-y9yFMlN+loLxqT3bA0QEFrZpBqTMJd7Dy9c5QNGUvww=";
   };
 
   postPatch = ''
     substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir}
   '';
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [ netcdf
                   openjpeg

From c36249ac1d7ebcecb4a7bb0e77ec1374811ccaa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Ri=C3=9Fe?= <matthias.risze@t-online.de>
Date: Thu, 23 Sep 2021 15:12:39 +0200
Subject: [PATCH 2/3] eccodes: nixpkgs-fmt

---
 .../development/libraries/eccodes/default.nix | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 76907e9dc87a..e22c10772300 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -1,8 +1,18 @@
-{ fetchurl, lib, stdenv
-, cmake, netcdf, openjpeg, libpng, gfortran, perl
-, enablePython ? false, pythonPackages
+{ fetchurl
+, lib
+, stdenv
+, cmake
+, netcdf
+, openjpeg
+, libpng
+, gfortran
+, perl
+, enablePython ? false
+, pythonPackages
 , enablePosixThreads ? false
-, enableOpenMPThreads ? false}:
+, enableOpenMPThreads ? false
+}:
+
 with lib;
 stdenv.mkDerivation rec {
   pname = "eccodes";
@@ -19,21 +29,24 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake perl ];
 
-  buildInputs = [ netcdf
-                  openjpeg
-                  libpng
-                  gfortran
-                ];
-  propagatedBuildInputs = optionals enablePython [
-                  pythonPackages.python
-                  pythonPackages.numpy
-                ];
+  buildInputs = [
+    netcdf
+    openjpeg
+    libpng
+    gfortran
+  ];
 
-  cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
-                 "-DENABLE_PNG=ON"
-                 "-DENABLE_ECCODES_THREADS=${if enablePosixThreads then "ON" else "OFF"}"
-                 "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}"
-               ];
+  propagatedBuildInputs = optionals enablePython [
+    pythonPackages.python
+    pythonPackages.numpy
+  ];
+
+  cmakeFlags = [
+    "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
+    "-DENABLE_PNG=ON"
+    "-DENABLE_ECCODES_THREADS=${if enablePosixThreads then "ON" else "OFF"}"
+    "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}"
+  ];
 
   doCheck = true;
 

From ce598b2dd104a7461dad37837e9f46d10ed51551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Ri=C3=9Fe?= <matthias.risze@t-online.de>
Date: Thu, 23 Sep 2021 16:37:37 +0200
Subject: [PATCH 3/3] eccodes: remove top-level `with lib;`

---
 pkgs/development/libraries/eccodes/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index e22c10772300..ad8ee222f7f9 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -13,7 +13,6 @@
 , enableOpenMPThreads ? false
 }:
 
-with lib;
 stdenv.mkDerivation rec {
   pname = "eccodes";
   version = "2.23.0";
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
     gfortran
   ];
 
-  propagatedBuildInputs = optionals enablePython [
+  propagatedBuildInputs = lib.optionals enablePython [
     pythonPackages.python
     pythonPackages.numpy
   ];
@@ -57,7 +56,7 @@ stdenv.mkDerivation rec {
     ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://confluence.ecmwf.int/display/ECC/";
     license = licenses.asl20;
     maintainers = with maintainers; [ knedlsepp ];