From 1c2a0a3450d3e26f2b7babbe14be681735154cd5 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Sun, 7 Jul 2024 23:04:06 -0600 Subject: [PATCH] Enable sandboxed builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, we ran into NixOS/nix#4119 with the homeConfigurations builds. But thanks to comments there, I managed to reduce the “pattern serialization length” enough to allow the builds to succeed. --- .config/project/default.nix | 2 -- flake.nix | 5 +---- garnix.yaml | 2 +- nix/modules/emacs.nix | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.config/project/default.nix b/.config/project/default.nix index 6cbcb57..e178b65 100644 --- a/.config/project/default.nix +++ b/.config/project/default.nix @@ -50,8 +50,6 @@ services.garnix = { enable = true; builds.exclude = [ - # TODO: Remove once NixOS/nix#4119 is fixed. - "homeConfigurations.aarch64-darwin-example" # TODO: Remove once garnix-io/garnix#285 is fixed. "homeConfigurations.x86_64-darwin-example" ]; diff --git a/flake.nix b/flake.nix index 6b26c34..c4c2f5e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,7 @@ ]; ## Isolate the build. registries = false; - ## Enable once NixOS/nix#4119 is fixed. This is commented out rather than - ## set to `false` because the default is `true` on some systems, and we want - ## to maintain that. - # sandbox = true; + sandbox = "relaxed"; }; outputs = { diff --git a/garnix.yaml b/garnix.yaml index e4af05f..03e81c5 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -1,2 +1,2 @@ # This file was generated by Project Manager. -{"builds":{"exclude":["*.x86_64-darwin","*.x86_64-darwin.*","homeConfigurations.aarch64-darwin-example","homeConfigurations.x86_64-darwin-example","devShells.*.lax-checks"],"include":["*.*","*.*.*"]}} \ No newline at end of file +{"builds":{"exclude":["*.x86_64-darwin","*.x86_64-darwin.*","homeConfigurations.x86_64-darwin-example","devShells.*.lax-checks"],"include":["*.*","*.*.*"]}} \ No newline at end of file diff --git a/nix/modules/emacs.nix b/nix/modules/emacs.nix index 2e7c643..58ef32e 100644 --- a/nix/modules/emacs.nix +++ b/nix/modules/emacs.nix @@ -55,7 +55,7 @@ ## NB: Bound so we can reference it in the the Emacs setup for `tex-mode`. texlive-combined = pkgs.texlive.combine { - inherit (pkgs.texlive) braids dvipng pgf scheme-small tikz-cd ulem xcolor; + inherit (pkgs.texlive) braids dvipng pgf scheme-basic tikz-cd ulem xcolor; }; in { enable = true;