From 0cb9ea7c09bd4963875cca345f81e56ae0e482ab Mon Sep 17 00:00:00 2001
From: Victor Engmark <vengmark@linz.govt.nz>
Date: Wed, 19 Jul 2023 12:32:39 +1200
Subject: [PATCH 1/2] build: Bump nixpkgs

Removes the need for a poetry2nix override.
---
 flooding/sentinel1_water_extraction/poetryPackages.nix | 4 ----
 nix/sources.json                                       | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/flooding/sentinel1_water_extraction/poetryPackages.nix b/flooding/sentinel1_water_extraction/poetryPackages.nix
index 5a2b6b8d..f94d2090 100644
--- a/flooding/sentinel1_water_extraction/poetryPackages.nix
+++ b/flooding/sentinel1_water_extraction/poetryPackages.nix
@@ -9,10 +9,6 @@ pkgs.poetry2nix.mkPoetryPackages {
     name = "sentinel1_water_extraction_packages";
   };
   overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
-    jupyter-ydoc = super.jupyter-ydoc.overridePythonAttrs (old: {
-      # TODO: Remove when using poetry2nix > 1.40.1
-      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [self.hatch-nodejs-version];
-    });
     jupyterlab = super.jupyterlab.overridePythonAttrs (old: {
       # TODO: Remove when https://github.com/nix-community/poetry2nix/pull/1173 is in use
       nativeBuildInputs = (old.nativeBuildInputs or []) ++ [self.hatchling self.hatch-jupyter-builder];
diff --git a/nix/sources.json b/nix/sources.json
index 914c4bce..65025779 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,14 +1,14 @@
 {
   "nixpkgs": {
-    "branch": "release-23.05",
+    "branch": "nixos-23.05",
     "description": "Nix Packages collection",
     "homepage": "",
     "owner": "NixOS",
     "repo": "nixpkgs",
-    "rev": "ff92c8e9949124cc2822be17122f6ad74a55fb4f",
-    "sha256": "0y5fx28sydawcaygyi52km6846gqvz61c5qlx7rh9faahj91wm8f",
+    "rev": "53657afe29748b3e462f1f892287b7e254c26d77",
+    "sha256": "1l9pwclmx7kw7kd5p3dxf67w3arh413pbasfgs1ckmjm9zdajsmv",
     "type": "tarball",
-    "url": "https://github.com/NixOS/nixpkgs/archive/ff92c8e9949124cc2822be17122f6ad74a55fb4f.tar.gz",
+    "url": "https://github.com/NixOS/nixpkgs/archive/53657afe29748b3e462f1f892287b7e254c26d77.tar.gz",
     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
   }
 }

From 6071884b3dcce4375ed1459a3b6584ffd501f167 Mon Sep 17 00:00:00 2001
From: Victor Engmark <vengmark@linz.govt.nz>
Date: Wed, 19 Jul 2023 13:13:57 +1200
Subject: [PATCH 2/2] chore: Remove reference to unused package

---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8191a9ad..1b444f9e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,6 @@ module = [
     "matplotlib", # https://github.com/matplotlib/matplotlib/issues/20504
     "matplotlib.pyplot", # https://github.com/matplotlib/matplotlib/issues/20504
     "rasterio", # https://github.com/rasterio/rasterio/issues/2322
-    "rasterio.crs", # https://github.com/rasterio/rasterio/issues/2322
     "rasterio.plot", # https://github.com/rasterio/rasterio/issues/2322
     "satsearch", # https://github.com/sat-utils/sat-search/issues/131
     "satstac", # https://github.com/sat-utils/sat-stac/issues/72