From 42c35bc95f6c70da304165b613537bd14cb9b777 Mon Sep 17 00:00:00 2001 From: Brynley Llewellyn-Roux Date: Mon, 16 Sep 2024 08:32:32 +1000 Subject: [PATCH 1/2] feat: switch to indirect inputs --- flake.lock | 17 ++++++++--------- flake.nix | 9 +++++++-- npmDepsHash | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4e6263c3..f0bbeaf9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -39,17 +39,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1724748625, - "narHash": "sha256-aJn/QBY200UOvRCtsBbWdlixHoYxSp+UHlxSZ25HTpE=", + "lastModified": 1726018991, + "narHash": "sha256-/CuJ75h6NW0UR0Nv/4XCCYhNsVTDn2ezCepRN26eMbM=", "owner": "MatrixAI", "repo": "nixpkgs-matrix", - "rev": "850aaa543b8913ee2ef69f145265211f344ca9b2", + "rev": "e0cff071d16c8b601558d4a597e9d5d39a0db7af", "type": "github" }, "original": { - "owner": "MatrixAI", - "repo": "nixpkgs-matrix", - "type": "github" + "id": "nixpkgs-matrix", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index 67fab15c..984e6f47 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,10 @@ { inputs = { - nixpkgs-matrix.url = "github:MatrixAI/nixpkgs-matrix"; + nixpkgs-matrix = { + type = "indirect"; + id = "nixpkgs-matrix"; + }; + flake-utils.url = "github:numtide/flake-utils"; }; @@ -17,7 +21,8 @@ utils = pkgs.callPackage ./utils.nix { }; - commitHash = toString (self.rev or self.dirtyRev); + commitHash = builtins.replaceStrings [ "-dirty" ] [ "" ] + (toString (self.rev or self.dirtyRev)); npmDepsHash = builtins.readFile ./npmDepsHash; polykey-cli = pkgs.buildNpmPackage { diff --git a/npmDepsHash b/npmDepsHash index 34721a94..d764abc8 100644 --- a/npmDepsHash +++ b/npmDepsHash @@ -1 +1 @@ -sha256-FDJmb93Xgols7SXWv/ETyDm0uggBmVuVWiD+vJOcKcc= +sha256-VzfqKBphM815xXCKyJIpHQHLeCLyKmdnGOukGj7NCx4= From d942d24f7991a659fc7c4cbc305045dbcda1b4b7 Mon Sep 17 00:00:00 2001 From: Brynley Llewellyn-Roux Date: Fri, 20 Sep 2024 12:34:53 +1000 Subject: [PATCH 2/2] 0.8.1 --- npmDepsHash | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npmDepsHash b/npmDepsHash index d764abc8..325a11ba 100644 --- a/npmDepsHash +++ b/npmDepsHash @@ -1 +1 @@ -sha256-VzfqKBphM815xXCKyJIpHQHLeCLyKmdnGOukGj7NCx4= +sha256-b0i9iHXmAhdNqDCzcGJmv1NJKsPUmy7n7UjXeeYhRWU= diff --git a/package-lock.json b/package-lock.json index c48c7e79..fc964d91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "polykey-cli", - "version": "0.8.0", + "version": "0.8.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "polykey-cli", - "version": "0.8.0", + "version": "0.8.1", "license": "GPL-3.0", "bin": { "pk": "dist/polykey.js", diff --git a/package.json b/package.json index 522b1bba..547524c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "polykey-cli", - "version": "0.8.0", + "version": "0.8.1", "homepage": "https://polykey.com", "author": "Roger Qiu", "contributors": [