From 4e355be966743a1533901f0886460ac027205c15 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Mon, 15 Jan 2024 17:00:36 -0600
Subject: [PATCH] bump Harmony version to 3.3.0

---
 Makefile           |  6 ++++--
 default.nix        |  2 +-
 harmony.ipkg       |  2 +-
 node-packages.nix  | 12 ++++++------
 package-lock.json  | 10 +++++-----
 package.json       |  2 +-
 src/AppVersion.idr |  2 +-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 1c90511..abc1e03 100644
--- a/Makefile
+++ b/Makefile
@@ -102,14 +102,15 @@ build: ./node_modules/ depends/idris-adds-${idris-adds-version} depends/json-${i
 
 harmony: build
 
-node2nix ?= nix run nixpkgs\#node2nix
+nix ?= nix
+node2nix ?= $(nix) run nixpkgs\#node2nix
 
 # This executes a Nix build. Call as `make nix-build` from CLI, not
 # from a Nix file.
 nix-build:
 	${MAKE} clean
 	$(node2nix) -- --composition node2nix.nix # -l # <- can't use -l for lockfile because lockfile version 3 not supported yet.
-	nix build .
+	$(nix) build .
 
 version:
 	@(if [[ "${v}" == '' ]]; then echo "please set the 'v' variable."; exit 1; fi)
@@ -119,6 +120,7 @@ version:
 	sed -I '' "s/version = \".*\";/version = \"${v}\";/" ./default.nix
 	@npm update
 	@$(node2nix) -- --composition node2nix.nix # -l # <- can't use -l for lockfile because lockfile version 3 not supported yet.
+	@$(nix) fmt
 
 package: build
 	./version-check.sh
diff --git a/default.nix b/default.nix
index 9be7eb3..a6ce928 100644
--- a/default.nix
+++ b/default.nix
@@ -68,7 +68,7 @@
   };
 
   harmonyPkg = buildIdris {
-    version = "3.2.0";
+    version = "3.3.0";
     projectName = "harmony";
     src = ./.;
 
diff --git a/harmony.ipkg b/harmony.ipkg
index e255505..4548c90 100644
--- a/harmony.ipkg
+++ b/harmony.ipkg
@@ -1,5 +1,5 @@
 package harmony
-version = 3.2.0
+version = 3.3.0
 authors = "Mathew Polzin"
 license = "MIT"
 brief = "Harmony GitHub collaboration tool"
diff --git a/node-packages.nix b/node-packages.nix
index 7742466..775e6f0 100644
--- a/node-packages.nix
+++ b/node-packages.nix
@@ -279,13 +279,13 @@
         sha512 = "VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==";
       };
     };
-    "@types/node-20.10.8" = {
+    "@types/node-20.11.3" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "20.10.8";
+      version = "20.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz";
-        sha512 = "f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-20.11.3.tgz";
+        sha512 = "nrlmbvGPNGaj84IJZXMPhQuCMEVTT/hXZMJJG/aIqVL9fKxqk814sGGtJA4GI6hpJSLQjpi6cn0Qx9eOf9SDVg==";
       };
     };
     "aggregate-error-3.1.0" = {
@@ -598,7 +598,7 @@
   args = {
     name = "_at_mattpolzin_slash_harmony";
     packageName = "@mattpolzin/harmony";
-    version = "3.2.0";
+    version = "3.3.0";
     src = ./.;
     dependencies = [
       sources."@kwsites/file-exists-1.1.1"
@@ -631,7 +631,7 @@
       sources."@types/aws-lambda-8.10.131"
       sources."@types/btoa-lite-1.0.2"
       sources."@types/jsonwebtoken-9.0.5"
-      sources."@types/node-20.10.8"
+      sources."@types/node-20.11.3"
       sources."aggregate-error-3.1.0"
       sources."before-after-hook-2.2.3"
       sources."bottleneck-2.19.5"
diff --git a/package-lock.json b/package-lock.json
index ca8a97a..8769edc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@mattpolzin/harmony",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mattpolzin/harmony",
-      "version": "3.2.0",
+      "version": "3.3.0",
       "license": "MIT",
       "dependencies": {
         "octokit": "^3.1",
@@ -374,9 +374,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.10.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz",
-      "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==",
+      "version": "20.11.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.3.tgz",
+      "integrity": "sha512-nrlmbvGPNGaj84IJZXMPhQuCMEVTT/hXZMJJG/aIqVL9fKxqk814sGGtJA4GI6hpJSLQjpi6cn0Qx9eOf9SDVg==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
diff --git a/package.json b/package.json
index 7960ba6..62418f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mattpolzin/harmony",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "engines" : { 
     "node" : ">=18.0.0"
   },
diff --git a/src/AppVersion.idr b/src/AppVersion.idr
index c0d1321..8f255a9 100644
--- a/src/AppVersion.idr
+++ b/src/AppVersion.idr
@@ -4,7 +4,7 @@ module AppVersion
 
 export
 appVersion : String
-appVersion = "3.2.0"
+appVersion = "3.3.0"
 
 export
 printVersion : HasIO io => io ()