From faacc6be31e0657785c4eaf634dabf0fab3c60f4 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Fri, 7 Oct 2022 21:05:51 +0200 Subject: [PATCH] Upgrade garage to 0.8.0-rc1 (untested still) --- docs/user/getting-started.md | 9 +++++++++ garage/default.nix | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/user/getting-started.md b/docs/user/getting-started.md index da279a8..b8e1eeb 100644 --- a/docs/user/getting-started.md +++ b/docs/user/getting-started.md @@ -28,6 +28,13 @@ project's root: nix-build -A appImage ``` +(*NOTE* Dependencies of `cryptic-net` seemingly compile all of musl and rust +from scratch (it's not clear why, blame garage!). If you have not otherwise +configured it, nix might be using a tmpfs as its build directory, and the +capacity of this tmpfs will probably be exceeded by this build. You can change +your build directory to somewhere on-disk by setting the TMPDIR environment +variable for `nix-daemon` (see [this github issue][tmpdir-gh].)) + The resulting binary can be found in the `result` directory which is created. In this case you will need an admin to provide you with a `bootstrap.tgz` for @@ -35,6 +42,8 @@ your host, rather than a custom binary. When running the daemon in the following steps you will need to provide the `--bootstrap-path` CLI argument to the daemon process. +[tmpdir-gh]: https://github.com/NixOS/nix/issues/2098#issuecomment-383243838 + ## Running the Daemon Once you have a binary, you will need to run the `daemon` sub-command as the diff --git a/garage/default.nix b/garage/default.nix index 351efcf..a7a3d7d 100644 --- a/garage/default.nix +++ b/garage/default.nix @@ -6,16 +6,18 @@ }: let + version = "0.8.0-rc1"; + src = fetchgit { - name = "garage-v0.6.0-unstable"; + name = "garage-v${version}"; url = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git"; - rev = "84613e66a286536dff9828d8aca2625d2c6c6bf2"; - sha256 = "sha256-ZVf+PPNL/DkJW4asJwW6/xpXVzZWIvLhsqaKh65eATM="; + rev = "2197753dfdb25944e55c25d911ae6d14b8506c4d"; + sha256 = "sha256-Rzwx1/vl3xg5bj4Chxj8VLBZ25zlPawOc+uMl3AHhkw="; }; in rec { - garage = (import "${src}/default.nix") { release = true; }; + garage = (import "${src}/default.nix") { git_version = version; }; minioClient = minio-client;