From 733d36370c383a9ef04d8e52f1238af974bde97c Mon Sep 17 00:00:00 2001
From: Victor Engmark <vengmark@linz.govt.nz>
Date: Wed, 4 Jan 2023 10:40:38 +1300
Subject: [PATCH] build: Bump nixpkgs

---
 nixpkgs.json |  6 ++--
 shell.nix    | 79 +++-------------------------------------------------
 2 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/nixpkgs.json b/nixpkgs.json
index 64af244c6..7847056c0 100644
--- a/nixpkgs.json
+++ b/nixpkgs.json
@@ -1,5 +1,5 @@
 {
-  "name": "release-22.11-2022-12-05T21-44-34Z",
-  "url": "https://github.com/NixOS/nixpkgs/archive/52e3e80afff4b16ccb7c52e9f0f5220552f03d04.tar.gz",
-  "sha256": "0x0pc4qm0adsdbr8n20ghl7byq9n0bvj9fjiiqzp9839cippp9hn"
+  "name": "release-22.11-2023-01-08T19-45-12Z",
+  "url": "https://github.com/NixOS/nixpkgs/archive/7f8b4595a7e5dfd4cc871e769209f3a85bdee30a.tar.gz",
+  "sha256": "15nv4nc2fs6h7ck5ng4grxwz6nigbcpmf1im7s3h7169f5by55i7"
 }
diff --git a/shell.nix b/shell.nix
index 2482ac579..9f347670c 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,87 +12,16 @@ let
   poetryEnv = pkgs.poetry2nix.mkPoetryEnv {
     inherit python projectDir;
     overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
-      aws-cdk-asset-awscli-v1 = super.aws-cdk-asset-awscli-v1.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      aws-cdk-asset-kubectl-v20 = super.aws-cdk-asset-kubectl-v20.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      aws-cdk-asset-node-proxy-agent-v5 = super.aws-cdk-asset-node-proxy-agent-v5.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      aws-cdk-aws-batch-alpha = super.aws-cdk-aws-batch-alpha.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      aws-cdk-aws-lambda-python-alpha = super.aws-cdk-aws-lambda-python-alpha.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      aws-cdk-lib = super.aws-cdk-lib.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      constructs = super.constructs.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
       filelock = super.filelock.overridePythonAttrs (
+        # In poetry2nix >1.39.1
         old: {
           nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.hatchling self.hatch-vcs ];
         }
       );
-      jsii = super.jsii.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      mypy-boto3-ssm = super.mypy-boto3-ssm.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      mypy-boto3-stepfunctions = super.mypy-boto3-stepfunctions.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      mypy-boto3-sts = super.mypy-boto3-sts.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      pystac = super.pystac.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      python-ulid = super.python-ulid.override {
-        preferWheel = true;
-      };
-      types-pkg-resources = super.types-pkg-resources.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      types-python-dateutil = super.types-python-dateutil.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
-        }
-      );
-      types-six = super.types-six.overridePythonAttrs (
+      python-ulid = super.python-ulid.overridePythonAttrs (
+        # https://github.com/nix-community/poetry2nix/pull/931
         old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools ];
+          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.setuptools-scm ];
         }
       );
     });