nix: Update dependencies to match versions on updated rtime

diff --git a/nix/sources.json b/nix/sources.json
index a9da897d3a45cacbd62e10c53d00e03a44b1110a..a545f29a0e086871c4c34beef5795129cdb27498 100644 (file)
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -12,15 +12,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-20.03",
+        "branch": "release-21.05",
         "description": "Nix Packages collection",
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "38bfbd5d6fed5d89d5a95a494443e82f1d14e07a",
-        "sha256": "1jsgvxlrbgx16j8d3j2smnl5yimzhx04m6sq75i91kawwxad25iy",
+        "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
+        "sha256": "0v12ylqxy1kl06dgln6h5k8vhlfzp8xvdymljj7bl0avr0nrgrcm",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/38bfbd5d6fed5d89d5a95a494443e82f1d14e07a.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/110a2c9ebbf5d4a94486854f18a37a938cfacbbb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

diff --git a/shell.nix b/shell.nix
index b31f7e138a618a8c596c2341936719a7204c83f6..bede05d3dc5ba84eada70292922f65dc1ac3e2c6 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -9,16 +9,21 @@ let
   pythonEnv = (let
     python = let
       packageOverrides = self: super: {
-        matplotlib = super.matplotlib.overridePythonAttrs(old: rec {
-          version = "3.0.2";
+        matplotlib = (super.matplotlib.override { enableTk = false; }).overridePythonAttrs(old: rec {
+          version = "3.3.4";
           src =  super.fetchPypi {
             pname = "matplotlib";
             inherit version;
-            sha256 = "1brn3ism9755wibylb24yzs3b6ndg89iiclyhnvavxiiyhm7jjy9";
+            sha256 = "1c15g3rhnp4pn46akwzqqgrwvalhsy44zi3nd169x4i2djvpsiry";
           };
+
+          # qhull library in nixpkgs in newer than expected by matplotlib 3.3.4 and has a different name
+          postPatch = old.postPatch + ''
+            substituteInPlace setupext.py --replace 'ext.libraries.append("qhull")' 'ext.libraries.append("qhull_r")'
+          '';
         });
         flask = super.flask.overridePythonAttrs(old: rec {
-          version = "1.0.2";
+          version = "1.1.2";
           src =  super.fetchPypi {
             pname = "Flask";
             inherit version;
@@ -29,7 +34,7 @@ let
           '';
         });
         flask-cors = super.flask-cors.overridePythonAttrs(old: rec {
-          version = "3.0.7";
+          version = "3.0.9";
           src =  super.fetchPypi {
             pname = "Flask-Cors";
             inherit version;
@@ -37,10 +42,10 @@ let
           };
         });
         jinja2 = super.jinja2.overridePythonAttrs(old: rec {
-          version = "2.10.3";
+          version = "2.11.3";
           src = old.src.override {
             inherit version;
-            sha256 = "1pi78nrpvr4ihdc540kbkj2yf55y43886rb52ylzmzkc50cmzscz";
+            sha256 = "1iiklf3wns67y5lfcacxma5vxfpb7h2a67xbghs01s0avqrq9md6";
           };
         });
 
@@ -70,7 +75,7 @@ let
           '';
         });
       };
-    in pkgs.python37.override {inherit packageOverrides; self = python;};
+    in pkgs.python39.override {inherit packageOverrides; self = python;};
 
   in python.withPackages(ps: with ps; [
     flake8                      # For syntax checking while editing .py files