micropelago/garage
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windows and linux builds fully working

Browse Source
This commit is contained in:
Brian Picciano 2023-12-10 17:48:12 +01:00
parent e46bcfda3f
commit a34cec60d4
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
default.nix
View File

@ -93,28 +93,6 @@ let
rustc = toolchain; rustc = toolchain;
}; };
# TODO build all of these
#build_debug_and_release = (target: {
# debug = (compile {
# inherit system target gitVersion pkgsSrc cargo2nixOverlay;
# release = false;
# }).workspace.garage { compileMode = "build"; };
# release = (compile {
# inherit system target gitVersion pkgsSrc cargo2nixOverlay;
# release = true;
# }).workspace.garage { compileMode = "build"; };
#});
#test = (rustPkgs:
# pkgs.symlinkJoin {
# name = "garage-tests";
# paths =
# builtins.map (key: rustPkgs.workspace.${key} { compileMode = "test"; })
# (builtins.attrNames rustPkgs.workspace);
# });
builtFeatures = if features != null then builtFeatures = if features != null then
features features
else ( else (
@ -186,13 +164,4 @@ in {
} // buildEnv); } // buildEnv);
shell = pkgsCross.mkShell buildEnv; shell = pkgsCross.mkShell buildEnv;
# TODO
#clippy = {
# amd64 = (compile {
# inherit system gitVersion pkgsSrc cargo2nixOverlay;
# target = "x86_64-unknown-linux-musl";
# compiler = "clippy";
# }).workspace.garage { compileMode = "build"; };
#};
} }

4
flake.lock
View File

@ -80,10 +80,10 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1682109806,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "rev": "2362848adf8def2866fabbffc50462e929d7fffb",
"type": "github" "type": "github"
}, },
"original": { "original": {