build: Bump nixpkgs

Also comment out broken pre-commit meta hook <NixOS/nixpkgs#270805>.
linz · Feb 27, 2024 · 5e1eb87 · 5e1eb87
1 parent 228b84a
commit 5e1eb87
Show file tree

Hide file tree

Showing 12 changed files with 423 additions and 416 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -152,7 +152,7 @@ repos:
         pass_filenames: false
         language: system
         stages: [commit]
-
-  - repo: meta
-    hooks:
-      - id: check-useless-excludes
+# TODO: Re-enable when https://github.com/NixOS/nixpkgs/issues/270805 is fixed
+#  - repo: meta
+#    hooks:
+#      - id: check-useless-excludes
diff --git a/flooding/sentinel1_water_extraction/poetryPackages.nix b/flooding/sentinel1_water_extraction/poetryPackages.nix
@@ -1,21 +1,11 @@
 {
-  pkgs,
+  poetry2nix,
   python,
 }:
-pkgs.poetry2nix.mkPoetryPackages {
+poetry2nix.mkPoetryPackages {
   inherit python;
   projectDir = builtins.path {
     path = ./.;
     name = "sentinel1_water_extraction_packages";
   };
-  overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
-    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];
-    });
-    overrides = super.overrides.overridePythonAttrs (old: {
-      # TODO: Remove when https://github.com/nix-community/poetry2nix/pull/1173 is in use
-      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [self.setuptools];
-    });
-  });
 }
diff --git a/flooding/sentinel1_water_extraction/shell.nix b/flooding/sentinel1_water_extraction/shell.nix
@@ -3,8 +3,11 @@ let
   python = import ../../python.nix {
     inherit pkgs;
   };
+  poetry2nix = import ../../poetry2nix.nix {
+    inherit pkgs;
+  };
   poetryPackages = import ./poetryPackages.nix {
-    inherit pkgs python;
+    inherit poetry2nix python;
   };
 in
   pkgs.mkShell {

diff --git a/flooding/sentinel2_water_extraction/poetryPackages.nix b/flooding/sentinel2_water_extraction/poetryPackages.nix
@@ -1,22 +1,11 @@
 {
-  pkgs,
+  poetry2nix,
   python,
 }:
-pkgs.poetry2nix.mkPoetryPackages {
+poetry2nix.mkPoetryPackages {
   inherit python;
   projectDir = builtins.path {
     path = ./.;
     name = "sentinel2_water_extraction_packages";
   };
-  overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
-    annotated-types = super.annotated-types.overridePythonAttrs (old: {
-      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [self.hatchling];
-    });
-    pydantic = super.pydantic.overridePythonAttrs (old: {
-      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [self.hatchling self.hatch-fancy-pypi-readme];
-    });
-    pydantic-core = super.pydantic-core.override {
-      preferWheel = true;
-    };
-  });
 }
diff --git a/flooding/sentinel2_water_extraction/shell.nix b/flooding/sentinel2_water_extraction/shell.nix
@@ -3,8 +3,11 @@ let
   python = import ../../python.nix {
     inherit pkgs;
   };
+  poetry2nix = import ../../poetry2nix.nix {
+    inherit pkgs;
+  };
   poetryPackages = import ./poetryPackages.nix {
-    inherit pkgs python;
+    inherit poetry2nix python;
   };
 in
   pkgs.mkShell {

diff --git a/machine-readable-to-human-readable-date-time/test/human-readable-local-date-time.spec.mjs b/machine-readable-to-human-readable-date-time/test/human-readable-local-date-time.spec.mjs
@@ -15,8 +15,8 @@ describe("humanReadableLocalDateTime", function () {
             humanReadableLocalDateTime(
                 "2000-01-01T00:00:00Z",
                 "en-NZ",
-                "Pacific/Auckland"
-            )
+                "Pacific/Auckland",
+            ),
         );
     });
     it("should support non-New Zealand time zones and locales", function () {
@@ -25,8 +25,8 @@ describe("humanReadableLocalDateTime", function () {
             humanReadableLocalDateTime(
                 "2000-01-01T00:00:00Z",
                 "nb-NO",
-                "Europe/Oslo"
-            )
+                "Europe/Oslo",
+            ),
         );
     });
     it("should use defaults for locale and time zone (must run in a Node.js process with `TZ=UTC` and `LC_MESSAGES=C`)", function () {
@@ -39,13 +39,13 @@ describe("humanReadableLocalDateTime", function () {
         }
         assertEqual(
             "Saturday, January 1, 2000 at 00:00:00",
-            humanReadableLocalDateTime("2000-01-01T00:00:00Z")
+            humanReadableLocalDateTime("2000-01-01T00:00:00Z"),
         );
     });
     it("should return 'Invalid Date' for invalid date", function () {
         assertEqual(
             "Invalid Date",
-            humanReadableLocalDateTime("not a date/time")
+            humanReadableLocalDateTime("not a date/time"),
         );
     });
 });
diff --git a/machine-readable-to-human-readable-date-time/test/index.html b/machine-readable-to-human-readable-date-time/test/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
     <head>
         <meta charset="utf-8" />

diff --git a/machine-readable-to-human-readable-date-time/test/mocha.css b/machine-readable-to-human-readable-date-time/test/mocha.css
@@ -71,7 +71,11 @@ body {
 }
 
 #mocha {
-    font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font:
+        20px/1.5 "Helvetica Neue",
+        Helvetica,
+        Arial,
+        sans-serif;
     margin: 60px 50px;
 }
 
@@ -208,7 +212,9 @@ body {
     display: block;
     float: left;
     clear: left;
-    font: 12px/1.5 monaco, monospace;
+    font:
+        12px/1.5 monaco,
+        monospace;
     margin: 5px;
     padding: 15px;
     border: 1px solid var(--mocha-box-shadow-color);
@@ -250,7 +256,9 @@ body {
     display: block;
     float: left;
     clear: left;
-    font: 12px/1.5 monaco, monospace;
+    font:
+        12px/1.5 monaco,
+        monospace;
     margin: 5px;
     padding: 15px;
     border: 1px solid var(--mocha-box-shadow-color);