From 8974fb84f4a9b9b0316ecb03e467fc8cfbcaf925 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Fri, 27 Aug 2021 02:02:24 -0600
Subject: [PATCH] upstreamable arion cfg
---
arion.nix | 4 ++--
morph/grid/local/arion-compose.nix | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arion.nix b/arion.nix
index 49553b84..e5f86d6f 100644
--- a/arion.nix
+++ b/arion.nix
@@ -3,7 +3,7 @@ let
owner = "tp-la";
repo = "arion";
rev = "hack";
- sha256 = "0wv4wbzzd926qm81h78v10wyhiaayx2jggpb1ijzk118a543sz84";
+ hash = "sha256-rWJCFu/RJLlUaW9XaPuI89wHnWipWQ10hbjnIeVwVWw=";
};
in
{ self ? ./.
@@ -12,7 +12,7 @@ in
, includeStorePaths ? false
, ourpkgs ? import ./nixpkgs-ps.nix {}
, arion-src ? arion-src' { inherit pkgs; }
-, arion-eval ? (import arion-src { inherit pkgs; }).arion.eval
+, arion-eval ? lib.attrByPath ["lib" "eval"] (import arion-src { inherit pkgs; }).arion.eval arion-src
}: rec {
inherit pkgs lib ourpkgs arion-src arion-eval;
local-grid = "${self}/morph/grid/local";
diff --git a/morph/grid/local/arion-compose.nix b/morph/grid/local/arion-compose.nix
index 3b17e403..41808d94 100644
--- a/morph/grid/local/arion-compose.nix
+++ b/morph/grid/local/arion-compose.nix
@@ -32,6 +32,7 @@ let
#service.useHostStore = true;
image.includeStorePaths = false;
+ image.includeNixDb = false;
service.volumes = ["nix:/nix:ro"];
out.service = {
--
GitLab