Rebase in changes from development branch

pull/100/head
Skyler Grey 3 years ago committed by TheCodedProf
parent 83311511d7
commit 9b6992a7a6
No known key found for this signature in database
GPG Key ID: 803E7CCB5577E6A2

@ -12,15 +12,15 @@
"locked": {
"lastModified": 1686252801,
"narHash": "sha256-ASguQr5onfE7HzawjAvhck2y7NDZ3bdhqFC8O3/XrXU=",
"owner": "clicksminuteper",
"repo": "nixfiles",
"ref": "refs/heads/production",
"rev": "7f3559f9a56d28b8f5352040f18305082a6dacc0",
"type": "github"
"revCount": 53,
"type": "git",
"url": "ssh://git@github.com/clicksminuteper/nixfiles"
},
"original": {
"owner": "clicksminuteper",
"repo": "nixfiles",
"type": "github"
"type": "git",
"url": "ssh://git@github.com/clicksminuteper/nixfiles"
}
},
"deploy-rs": {
@ -193,15 +193,15 @@
"locked": {
"lastModified": 1686173255,
"narHash": "sha256-G9HiMDCnK+YeIb+lpLxsRg+/Kk2pz/PSlEtFe8Yi138=",
"owner": "clicksminuteper",
"repo": "pnpm2nix",
"ref": "refs/heads/master",
"rev": "f91bc86c6d2b1c2c3c4f476835b5ec01b750e898",
"type": "github"
"revCount": 98,
"type": "git",
"url": "ssh://git@github.com/clicksminuteper/pnpm2nix"
},
"original": {
"owner": "clicksminuteper",
"repo": "pnpm2nix",
"type": "github"
"type": "git",
"url": "ssh://git@github.com/clicksminuteper/pnpm2nix"
}
},
"root": {

@ -2,8 +2,8 @@
description = "A basic flake with a shell";
inputs.nixpkgs.follows = "clicks-server/nixpkgs";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.clicks-server.url = "github:clicksminuteper/nixfiles";
inputs.pnpm2nix.url = "github:clicksminuteper/pnpm2nix";
inputs.clicks-server.url = "git+ssh://git@github.com/clicksminuteper/nixfiles";
inputs.pnpm2nix.url = "git+ssh://git@github.com/clicksminuteper/pnpm2nix";
inputs.pnpm2nix.inputs.nixpkgs.follows = "nixpkgs";

Loading…
Cancel
Save