Update ERPNext
ERPNext integration with Plaid was broken, so we needed to update to the
latest master. To include https://github.com/blaggacao/frappix/pull/4 we
will switch to the ClicksCodes repo, however we will keep this in sync
(as a so-called "soft fork")
Change-Id: I6859d64dc619b65ad460cad8147ddb2f160beb4f
Reviewed-on: https://git.clicks.codes/c/Infra/NixFiles/+/634
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/flake.lock b/flake.lock
index 4572654..5194d71 100644
--- a/flake.lock
+++ b/flake.lock
@@ -195,21 +195,19 @@
"devshell": "devshell",
"microvm": "microvm",
"nixago": "nixago",
- "nixpkgs": [
- "nixpkgs"
- ],
+ "nixpkgs": "nixpkgs_2",
"std": "std"
},
"locked": {
- "lastModified": 1710429318,
- "narHash": "sha256-f7o84UJ3cNnmKkWjhPq+3i5iqTsAHKS2oDWDo3WG2IE=",
- "owner": "blaggacao",
+ "lastModified": 1713476834,
+ "narHash": "sha256-d7td89NDWr8iFmLogQT7B/Ip29EMZOnJl6LYIe5m+qc=",
+ "owner": "ClicksCodes",
"repo": "frappix",
- "rev": "15ba811aa19ba8bb5f2f03410d5dd8f11156ff70",
+ "rev": "b7125985618ddb40da381e02475e60a1a7fae18a",
"type": "github"
},
"original": {
- "owner": "blaggacao",
+ "owner": "ClicksCodes",
"repo": "frappix",
"type": "github"
}
@@ -217,7 +215,7 @@
"gerrit-oauth": {
"flake": false,
"locked": {
- "narHash": "sha256-khJkYXiSVUL2zNvWjYejwjLCz44nB0oBJNi8942hLj8=",
+ "narHash": "sha256-lGhoa4ojiwdYw+KcX5oMaZCXgk2WUrINB6qc7gN5MyM=",
"type": "file",
"url": "https://gerrit-ci.gerritforge.com/job/plugin-oauth-bazel-master-master/lastBuild/artifact/bazel-bin/plugins/oauth/oauth.jar"
},
@@ -251,7 +249,7 @@
},
"helpers": {
"inputs": {
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1700606678,
@@ -471,6 +469,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1708210246,
+ "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "release-23.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1697688401,
"narHash": "sha256-61QlajY7R9PbK25uFl55zh968CVNspwXX1zzimic4Uo=",
"owner": "NixOS",
@@ -483,7 +497,7 @@
"type": "indirect"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1710695816,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
@@ -569,7 +583,7 @@
"gerrit-oauth": "gerrit-oauth",
"helpers": "helpers",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"nixpkgs-clicksforms": "nixpkgs-clicksforms",
"nixpkgs-mongodb": "nixpkgs-mongodb",
"nixpkgs-privatebin": "nixpkgs-privatebin",
diff --git a/flake.nix b/flake.nix
index e7b7470..2af4e0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
inputs.helpers.url = "git+https://git.clicks.codes/Infra/NixHelpers";
- inputs.frappix.url = "github:blaggacao/frappix";
+ inputs.frappix.url = "github:ClicksCodes/frappix";
# follow settings
inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -31,8 +31,6 @@
flake = false;
};
- inputs.frappix.inputs.nixpkgs.follows = "nixpkgs";
-
outputs = { self, nixpkgs, nixpkgs-unstable, deploy-rs, home-manager, sops-nix, scalpel
, nixpkgs-privatebin, frappix, ... }@inputs:
let