From 4fe957ef474cc0703a6c5c39f68e23ebdf082f2d Mon Sep 17 00:00:00 2001 From: haruki7049 Date: Sun, 14 Jul 2024 19:31:43 +0900 Subject: [PATCH 1/2] chore: Init crane --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 05097f8..6ae0246 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "crane": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720546058, + "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -52,6 +72,7 @@ }, "root": { "inputs": { + "crane": "crane", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" diff --git a/flake.nix b/flake.nix index 895090e..7322514 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,13 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; rust-overlay.url = "github:oxalica/rust-overlay"; + crane = { + url = "github:ipetkov/crane"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { nixpkgs, flake-utils, rust-overlay, ... }: + outputs = { nixpkgs, flake-utils, rust-overlay, crane, ... }: flake-utils.lib.eachDefaultSystem (system: let overlays = [ (import rust-overlay) ]; From cdf4420bed185e4923473d954ce507a02208a5e1 Mon Sep 17 00:00:00 2001 From: haruki7049 Date: Sun, 14 Jul 2024 19:42:13 +0900 Subject: [PATCH 2/2] feat: Init gateway-stable but with error --- flake.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/flake.nix b/flake.nix index 7322514..2a63c22 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,28 @@ rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; rust-beta = pkgs.rust-bin.beta.latest.default; rust-nightly = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default); + + craneLib = crane.mkLib pkgs; + + commonArgs = { source, rust }: { + src = craneLib.cleanCargoSource source; + strictDeps = true; + + nativeBuildInputs = [ + pkgs.libiconv + rust + ]; + }; + + gateway-stable-args = commonArgs { source = ./gateway; inherit rust; }; + gateway-stable = craneLib.buildPackage (gateway-stable-args // { + cargoArtifacts = craneLib.buildDepsOnly gateway-stable-args; + }); in { + packages = { + inherit gateway-stable; + }; + devShells = { default = pkgs.mkShell { nativeBuildInputs = [