refactor(wpcarro): Remove briefcase references
TL;DR: - prefer WPCARRO env-var to BRIEFCASE - remove repository URLs from Emacs libraries - prefer tvl-depot-path where possible - reduce the scope of constants.el - prune (some not all) stale CI configuration Change-Id: I21e9130402502ec6fa2fc4b46753c890069be62d Reviewed-on: https://cl.tvl.fyi/c/depot/+/4545 Tested-by: BuildkiteCI Reviewed-by: wpcarro <wpcarro@gmail.com>
This commit is contained in:
		
							parent
							
								
									87981e7afd
								
							
						
					
					
						commit
						c1e381eecc
					
				
					 90 changed files with 76 additions and 280 deletions
				
			
		|  | @ -154,10 +154,9 @@ let | |||
|     "${wpcarrosEmacs.deps}/share/emacs/site-lisp:" | ||||
|   ]; | ||||
| 
 | ||||
|   withEmacsPath = { emacsBin, briefcasePath ? "$HOME/briefcase" }: | ||||
|   withEmacsPath = { emacsBin }: | ||||
|     writeShellScriptBin "wpcarros-emacs" '' | ||||
|       export XMODIFIERS=emacs | ||||
|       export BRIEFCASE=${briefcasePath} | ||||
|       export GOOGLE_BRIEFCASE="$HOME/google-briefcase" | ||||
|       export PATH="${emacsBinPath}:$PATH" | ||||
|       export EMACSLOADPATH="${loadPath}" | ||||
|  | @ -173,9 +172,8 @@ in { | |||
|   inherit initEl withEmacsPath; | ||||
| 
 | ||||
|   # I need to start my Emacs from CI without the call to `--load ${initEl}`. | ||||
|   runScript = { script, briefcasePath }: | ||||
|   runScript = { script }: | ||||
|     writeShellScript "run-emacs-script" '' | ||||
|       export BRIEFCASE=${briefcasePath} | ||||
|       export PATH="${emacsBinPath}:$PATH" | ||||
|       export EMACSLOADPATH="${wpcDir}:${vendorDir}:${wpcarrosEmacs.deps}/share/emacs/site-lisp" | ||||
|       exec ${wpcarrosEmacs}/bin/emacs \ | ||||
|  | @ -186,10 +184,9 @@ in { | |||
|         "$@" | ||||
|     ''; | ||||
| 
 | ||||
|   # Use `nix-env -f '<briefcase>' emacs.nixos` to install `wpcarros-emacs` on | ||||
|   # NixOS machines. | ||||
|   nixos = { briefcasePath ? "$HOME/briefcase" }: withEmacsPath { | ||||
|     inherit briefcasePath; | ||||
|   nixos = withEmacsPath { | ||||
|     emacsBin = "${wpcarrosEmacs}/bin/emacs"; | ||||
|   }; | ||||
| 
 | ||||
|   meta.targets = [ "nixos" ]; | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue