From a34cec60d45e3908098a6e37b61cc261a2cf1a73 Mon Sep 17 00:00:00 2001
From: Brian Picciano <me@mediocregopher.com>
Date: Sun, 10 Dec 2023 17:48:12 +0100
Subject: [PATCH] windows and linux builds fully working

---
 default.nix | 31 -------------------------------
 flake.lock  |  4 ++--
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/default.nix b/default.nix
index 54865ba7..24564003 100644
--- a/default.nix
+++ b/default.nix
@@ -93,28 +93,6 @@ let
       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
       features
   else (
@@ -186,13 +164,4 @@ in {
   } // 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"; };
-  #};
 }
diff --git a/flake.lock b/flake.lock
index 48c20355..8de99c3e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,10 +80,10 @@
     "nixpkgs": {
       "locked": {
         "lastModified": 1682109806,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "2362848adf8def2866fabbffc50462e929d7fffb",
         "type": "github"
       },
       "original": {