From 124911f948b3140d42d36ef675333a601ea0d71d Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 10 Aug 2023 11:46:11 +0100
Subject: [PATCH] Override nimPackages and nim2Packages

---
 flake.lock | 12 +++++-------
 flake.nix  | 43 +++++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index bb79b3c..522b9f2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,18 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690881426,
-        "narHash": "sha256-PkcXpzQUI5bO0/bKIXTtpyg1i1eIuPvxnaXZSphQC8I=",
+        "lastModified": 1690860117,
+        "narHash": "sha256-srkCfjMlg777HxDVMfhkIFgRhhtuZjIOIyR2ejLYK+Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5ee889ca5a14cd0296ea3d9cf63ec680b933d62",
+        "rev": "96d403ee2479f2070050353b94808209f1352edb",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "release-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index 16cee57..d8e71b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
   description = "Syndicate utilities";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
     rust = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,19 +12,10 @@
     lib = nixpkgs.lib.extend (import ./lib.nix);
 
     overlays.default = final: prev:
-      let rust' = (prev.extend rust.overlay).rust-bin.nightly.latest.default;
-      in {
-        inherit (self) lib;
+      let
+        rust' = (prev.extend rust.overlay).rust-bin.nightly.latest.default;
 
-        acpi_actor = final.nimPackages.callPackage ./packages/acpi_actor { };
-
-        fontconfig_actor =
-          final.nimPackages.callPackage ./packages/fontconfig_actor { };
-
-        libnotify_actor =
-          final.nimPackages.callPackage ./packages/libnotify_actor { };
-
-        nimPackages = prev.nimPackages.overrideScope' (final': prev': {
+        nimOverlay = final': prev': {
           noiseprotocol = final'.callPackage ./packages/nim/noiseprotocol { };
           preserves = final'.callPackage ./packages/preserves-nim { };
           syndicate = final'.callPackage ./packages/syndicate-nim { };
@@ -35,9 +25,22 @@
           xdg_open_ng =
             builtins.trace "xdg_open_ng has been renamed to syndicated-open"
             final'.syndicated-open;
-        });
+        };
+      in {
+        inherit (self) lib;
 
-        nix_actor = final.nimPackages.callPackage ./packages/nix_actor { };
+        acpi_actor = final.nim2Packages.callPackage ./packages/acpi_actor { };
+
+        fontconfig_actor =
+          final.nim2Packages.callPackage ./packages/fontconfig_actor { };
+
+        libnotify_actor =
+          final.nim2Packages.callPackage ./packages/libnotify_actor { };
+
+        nimPackages = prev.nimPackages.overrideScope' nimOverlay;
+        nim2Packages = prev.nim2Packages.overrideScope' nimOverlay;
+
+        nix_actor = final.nim2Packages.callPackage ./packages/nix_actor { };
 
         noise-c = final.callPackage ./packages/noise-c { };
 
@@ -50,7 +53,7 @@
           final.callPackage ./packages/preserves-tools { rust = rust'; };
 
         sqlite_actor =
-          final.nimPackages.callPackage ./packages/sqlite_actor { };
+          final.nim2Packages.callPackage ./packages/sqlite_actor { };
 
         squeak = final.callPackage ./packages/squeak { };
         squeaker = final.python3Packages.callPackage ./packages/squeaker { };
@@ -61,7 +64,7 @@
         synit-pid1 = final.callPackage ./packages/synit-pid1 { rust = rust'; };
 
         xapian_actor =
-          final.nimPackages.callPackage ./packages/xapian_actor { };
+          final.nim2Packages.callPackage ./packages/xapian_actor { };
       };
 
     legacyPackages =
@@ -73,10 +76,10 @@
       with pkgs; {
         inherit fontconfig_actor libnotify_actor noise-c preserves-tools squeak
           squeaker syndicate-server;
-        inherit (nimPackages) syndicate_utils xdg_open_ng;
-        preserves-nim = nimPackages.preserves;
+        inherit (nim2Packages) syndicate_utils xdg_open_ng;
+        preserves-nim = nim2Packages.preserves;
         preserves-py = python3Packages.preserves;
-        syndicate-nim = nimPackages.syndicate;
+        syndicate-nim = nim2Packages.syndicate;
         syndicate-py = python3Packages.syndicate;
       }) self.legacyPackages;