From 1cf2b50c8cc6c776d2b49c745944704139ef0b6d Mon Sep 17 00:00:00 2001 From: traxys Date: Thu, 22 Jun 2023 22:30:22 +0200 Subject: [PATCH] flake: Use master trunk for script inclusions --- flake.lock | 19 ++++++++++++++++++- flake.nix | 7 ++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index e908f21..37e8f3e 100644 --- a/flake.lock +++ b/flake.lock @@ -105,7 +105,8 @@ "flake-utils": "flake-utils", "naersk": "naersk", "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay", + "trunk": "trunk" } }, "rust-overlay": { @@ -156,6 +157,22 @@ "repo": "default", "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", diff --git a/flake.nix b/flake.nix index a49df69..f820d88 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,10 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.naersk.url = "github:nix-community/naersk"; inputs.rust-overlay.url = "github:oxalica/rust-overlay"; + inputs.trunk = { + url = "github:thedodd/trunk"; + flake = false; + }; outputs = { self, @@ -11,6 +15,7 @@ flake-utils, naersk, rust-overlay, + trunk, }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { @@ -28,7 +33,7 @@ devShell = pkgs.mkShell { nativeBuildInputs = [ rust - pkgs.trunk + (naersk'.buildPackage trunk) pkgs.httpie pkgs.sea-orm-cli ];