flake: Use master trunk for script inclusions

This commit is contained in:
traxys 2023-06-22 22:30:22 +02:00
parent e49a5829c4
commit 1cf2b50c8c
2 changed files with 24 additions and 2 deletions

19
flake.lock generated
View file

@ -105,7 +105,8 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay",
"trunk": "trunk"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -156,6 +157,22 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"trunk": {
"flake": false,
"locked": {
"lastModified": 1682443024,
"narHash": "sha256-TLBEUNCXHg6ArgQIlXPq9fGPDbSSkQ61Gn/CGH2S7CU=",
"owner": "thedodd",
"repo": "trunk",
"rev": "7769a17e517391b3b4077c21062725aa1600346d",
"type": "github"
},
"original": {
"owner": "thedodd",
"repo": "trunk",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -4,6 +4,10 @@
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.naersk.url = "github:nix-community/naersk"; inputs.naersk.url = "github:nix-community/naersk";
inputs.rust-overlay.url = "github:oxalica/rust-overlay"; inputs.rust-overlay.url = "github:oxalica/rust-overlay";
inputs.trunk = {
url = "github:thedodd/trunk";
flake = false;
};
outputs = { outputs = {
self, self,
@ -11,6 +15,7 @@
flake-utils, flake-utils,
naersk, naersk,
rust-overlay, rust-overlay,
trunk,
}: }:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -28,7 +33,7 @@
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
rust rust
pkgs.trunk (naersk'.buildPackage trunk)
pkgs.httpie pkgs.httpie
pkgs.sea-orm-cli pkgs.sea-orm-cli
]; ];