Skip to content

Commit

Permalink
refactor: rename tarball builder
Browse files Browse the repository at this point in the history
  • Loading branch information
mk3z committed Jul 26, 2024
1 parent 9d4015f commit 3a17476
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-wsl-tarball/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ runs:

- name: Build tarball 📦
shell: bash
run: sudo ${{ steps.buildBuilder.outputs.derivation }}/bin/nixos-wsl-tarball-builder ${{ inputs.filename }}
run: sudo ${{ steps.buildBuilder.outputs.derivation }}/bin/elmer-wsl-tarball-builder ${{ inputs.filename }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
result
result-*
nixos-wsl*.tar.gz
elmer-wsl*.tar.gz
14 changes: 7 additions & 7 deletions modules/build-tarball.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ in
# These options make no sense without the wsl-distro module anyway
config = mkIf config.wsl.enable {
system.build.tarballBuilder = pkgs.writeShellApplication {
name = "nixos-wsl-tarball-builder";
name = "elmer-wsl-tarball-builder";

runtimeInputs = [
pkgs.coreutils
Expand All @@ -64,23 +64,23 @@ in
out=''${1:-elmer-wsl.tar.gz}
root=$(mktemp -p "''${TMPDIR:-/tmp}" -d nixos-wsl-tarball.XXXXXXXXXX)
root=$(mktemp -p "''${TMPDIR:-/tmp}" -d elmer-wsl-tarball.XXXXXXXXXX)
# FIXME: fails in CI for some reason, but we don't really care because it's CI
trap 'chattr -Rf -i "$root" || true && rm -rf "$root" || true' INT TERM EXIT
chmod o+rx "$root"
echo "[NixOS-WSL] Installing..."
echo "[Elmer-WSL] Installing..."
nixos-install \
--root "$root" \
--no-root-passwd \
--system ${config.system.build.toplevel} \
--substituters ""
echo "[NixOS-WSL] Adding channel..."
nixos-enter --root "$root" --command 'HOME=/root nix-channel --add https://github.com/nix-community/NixOS-WSL/archive/refs/heads/main.tar.gz nixos-wsl'
echo "[Elmer-WSL] Adding channel..."
nixos-enter --root "$root" --command 'HOME=/root nix-channel --add https://github.com/nix-community/Elmer-WSL/archive/refs/heads/main.tar.gz elmer-wsl'
echo "[NixOS-WSL] Adding default config..."
echo "[Elmer-WSL] Adding default config..."
${if cfg.configPath == null then ''
install -Dm644 ${defaultConfig} "$root/etc/nixos/configuration.nix"
'' else ''
Expand All @@ -89,7 +89,7 @@ in
chmod -R u+w "$root/etc/nixos"
''}
echo "[NixOS-WSL] Compressing..."
echo "[Elmer-WSL] Compressing..."
tar -C "$root" \
-c \
--sort=name \
Expand Down

0 comments on commit 3a17476

Please sign in to comment.