From 313b9ef4004dca50238ffddff8124e6eb0ec8af7 Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Sun, 26 May 2024 14:59:40 +1000 Subject: [PATCH] Remove "full" build flag No longer used. --- build-helpers/dump | 5 ++--- default.nix | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build-helpers/dump b/build-helpers/dump index b217ac8..6921dc6 100755 --- a/build-helpers/dump +++ b/build-helpers/dump @@ -18,12 +18,11 @@ (require 'json) (defcli! dump - ((output-directory ("-o" dir) "Directory to dump into.") - (&flag full? ("--full"))) + ((output-directory ("-o" dir) "Directory to dump into.")) "Dump intermediates for nix-doom-emacs-unstraightened." ;; Load the user's init.el, or we'll dump only core packages. (load! doom-module-init-file doom-user-dir t) - (let* ((all-packages (doom-package-list full?)) + (let* ((all-packages (doom-package-list)) ;; For built-in packages, the :ignore property is the location of the ;; built-in library, which is a Nix store path. We do not want that ;; path to escape: avoid it by just filtering ignored packages here. diff --git a/default.nix b/default.nix index f986c13..9adc80e 100644 --- a/default.nix +++ b/default.nix @@ -32,9 +32,6 @@ doomSource, /* Emacs package to build against. */ emacs, - /* Whether to enable all default dependencies. Primarily useful for CI / - testing. */ - full ? false, /* Name of doom profile to use. */ profileName ? "nix", /* Disable profile early in startup, so "normal" cache/state dirs are used. */ @@ -98,8 +95,7 @@ let } '' mkdir $out export DOOMLOCALDIR=$(mktemp -d) - ${runtimeShell} ${doomSource}/bin/doomscript ${./build-helpers/dump} \ - ${optionalString full "--full"} -o $out + ${runtimeShell} ${doomSource}/bin/doomscript ${./build-helpers/dump} -o $out ''; doomPackageSet = lib.importJSON "${doomIntermediates}/packages.json";