From 3a17476dacb752d2467a8b2465b31cce8d9220b6 Mon Sep 17 00:00:00 2001 From: Matias Zwinger Date: Fri, 26 Jul 2024 11:08:30 +0300 Subject: [PATCH] refactor: rename tarball builder --- .github/actions/build-wsl-tarball/action.yml | 2 +- .gitignore | 2 +- modules/build-tarball.nix | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/actions/build-wsl-tarball/action.yml b/.github/actions/build-wsl-tarball/action.yml index 04e57a8a..3df9b998 100644 --- a/.github/actions/build-wsl-tarball/action.yml +++ b/.github/actions/build-wsl-tarball/action.yml @@ -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 }} diff --git a/.gitignore b/.gitignore index d6835c74..f6992467 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ result result-* -nixos-wsl*.tar.gz +elmer-wsl*.tar.gz diff --git a/modules/build-tarball.nix b/modules/build-tarball.nix index 4f2adf33..a63436aa 100644 --- a/modules/build-tarball.nix +++ b/modules/build-tarball.nix @@ -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 @@ -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 '' @@ -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 \