From fe5d5694f4adac605b71fb513696775c58104d77 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Mon, 31 Jan 2022 15:04:03 +0800 Subject: [PATCH 1/3] add mkbootimage and rustplatform to flake outputs --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 671ea97..55071e2 100644 --- a/flake.nix +++ b/flake.nix @@ -259,7 +259,7 @@ ) "mkdir $out\n" targets); allOutputs = { - inherit cargo-xbuild szl; + inherit cargo-xbuild szl mkbootimage rustPlatform; zc706-fsbl = fsbl { board = "zc706"; }; } // allTargetCrates ; in rec { @@ -267,6 +267,8 @@ hydraJobs = packages.x86_64-linux; + inherit rustPlatform; + devShell.x86_64-linux = pkgs.mkShell { name = "zynq-rs-dev-shell"; buildInputs = with pkgs; [ -- 2.44.1 From f8a9e501234f051106473a7506d60c9561c59991 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 4 Feb 2022 11:53:55 +0800 Subject: [PATCH 2/3] cleanup, remove alloutputs --- flake.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 55071e2..6225172 100644 --- a/flake.nix +++ b/flake.nix @@ -257,13 +257,12 @@ in commands + "ln -s ${szlResult}/szl.elf $out/szl-${target}.elf\n" ) "mkdir $out\n" targets); - - allOutputs = { +· + in rec { + packages.x86_64-linux = { inherit cargo-xbuild szl mkbootimage rustPlatform; zc706-fsbl = fsbl { board = "zc706"; }; } // allTargetCrates ; - in rec { - packages.x86_64-linux = allOutputs; hydraJobs = packages.x86_64-linux; -- 2.44.1 From 2547aa963bc29914803f81b69eab7e31dadf7477 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 4 Feb 2022 17:24:38 +0800 Subject: [PATCH 3/3] flake: remove rustplatform from packages --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6225172..a2935bb 100644 --- a/flake.nix +++ b/flake.nix @@ -257,10 +257,9 @@ in commands + "ln -s ${szlResult}/szl.elf $out/szl-${target}.elf\n" ) "mkdir $out\n" targets); -· in rec { packages.x86_64-linux = { - inherit cargo-xbuild szl mkbootimage rustPlatform; + inherit cargo-xbuild szl mkbootimage; zc706-fsbl = fsbl { board = "zc706"; }; } // allTargetCrates ; -- 2.44.1