From 8d04ae7014991319e97d4280f0e9d7a70c89f10b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 13 Oct 2022 14:35:39 +0200
Subject: cargo2nix unstable (patched), rust 1.63.0, nixpkgs 22.05 (32-bit
 builds are broken)

---
 default.nix | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 7e44096c..170b1f21 100644
--- a/default.nix
+++ b/default.nix
@@ -5,13 +5,26 @@
 
 with import ./nix/common.nix;
 
-let 
+let
   pkgs = import pkgsSrc { };
   compile = import ./nix/compile.nix;
+
   build_debug_and_release = (target: {
-    debug = (compile { inherit target git_version; release = false; }).workspace.garage { compileMode = "build"; }; 
-    release = (compile { inherit target git_version; release = true; }).workspace.garage { compileMode = "build"; }; 
+    debug = (compile {
+      inherit target git_version;
+      release = false;
+    }).workspace.garage {
+      compileMode = "build";
+    };
+
+    release = (compile {
+      inherit target git_version;
+      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);
@@ -25,9 +38,23 @@ in {
     arm = build_debug_and_release "armv6l-unknown-linux-musleabihf";
   };
   test = {
-    amd64 = test (compile { inherit git_version; target = "x86_64-unknown-linux-musl"; });
+    amd64 = test (compile {
+      inherit git_version;
+      target = "x86_64-unknown-linux-musl";
+      features = [
+        "garage/bundled-libs"
+        "garage/sled"
+        "garage/k2v"
+        "garage/lmdb"
+        "garage/sqlite"
+      ];
+    });
   };
   clippy = {
-    amd64 = (compile { inherit git_version; compiler = "clippy"; }).workspace.garage { compileMode = "build"; } ;
+    amd64 = (compile {
+      inherit git_version;
+      target = "x86_64-unknown-linux-musl";
+      compiler = "clippy";
+    }).workspace.garage {} ;
   };
 }
-- 
cgit v1.2.3


From e89e047c5af33ac47dabbcfdc12305d544a13ade Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 14 Oct 2022 15:45:37 +0200
Subject: Fix i386 build with custom toolchain (armv6 unknown state)

---
 default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 170b1f21..efbc4c86 100644
--- a/default.nix
+++ b/default.nix
@@ -43,10 +43,13 @@ in {
       target = "x86_64-unknown-linux-musl";
       features = [
         "garage/bundled-libs"
-        "garage/sled"
         "garage/k2v"
+        "garage/sled"
         "garage/lmdb"
         "garage/sqlite"
+        "garage_db/sled"
+        "garage_db/lmdb"
+        "garage_db/sqlite"
       ];
     });
   };
-- 
cgit v1.2.3


From 667ca9d3e3971d57d1c95defbff790ab5dc26221 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Oct 2022 12:48:31 +0200
Subject: Cleanup nix scripts

---
 default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index efbc4c86..60a85e2f 100644
--- a/default.nix
+++ b/default.nix
@@ -47,9 +47,6 @@ in {
         "garage/sled"
         "garage/lmdb"
         "garage/sqlite"
-        "garage_db/sled"
-        "garage_db/lmdb"
-        "garage_db/sqlite"
       ];
     });
   };
@@ -58,6 +55,8 @@ in {
       inherit git_version;
       target = "x86_64-unknown-linux-musl";
       compiler = "clippy";
-    }).workspace.garage {} ;
+    }).workspace.garage {
+      compileMode = "build";
+    };
   };
 }
-- 
cgit v1.2.3