From ae2d9e57ab1d9df7e18fd8768ad54cd9dea0b2ee Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 11 Jun 2025 13:53:50 +0200 Subject: [PATCH] pkgs/distro-packages: Remove the distro packages Remove the distro packages for now. They can be added back, if we actually need them again. --- formatter.nix | 1 - pkgs/distro-packages/flake-module.nix | 28 -------- .../gui-installer/flake-module.nix | 38 ----------- .../gui-installer/gui-installer.sh | 66 ------------------- pkgs/distro-packages/vagrant_insecure_key | 27 -------- pkgs/flake-module.nix | 1 - 6 files changed, 161 deletions(-) delete mode 100644 pkgs/distro-packages/flake-module.nix delete mode 100644 pkgs/distro-packages/gui-installer/flake-module.nix delete mode 100755 pkgs/distro-packages/gui-installer/gui-installer.sh delete mode 100644 pkgs/distro-packages/vagrant_insecure_key diff --git a/formatter.nix b/formatter.nix index aed47c4d7..cebbd276f 100644 --- a/formatter.nix +++ b/formatter.nix @@ -59,7 +59,6 @@ "pkgs/clan-cli/clan_cli/tests/data/sshd_config" "pkgs/clan-vm-manager/.vscode/lhebendanz.weaudit" "pkgs/clan-vm-manager/bin/clan-vm-manager" - "pkgs/distro-packages/vagrant_insecure_key" "sops/secrets/test-backup-age.key/secret" ]; treefmt.settings.formatter.ruff-format.includes = [ diff --git a/pkgs/distro-packages/flake-module.nix b/pkgs/distro-packages/flake-module.nix deleted file mode 100644 index 5b1feb771..000000000 --- a/pkgs/distro-packages/flake-module.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - imports = [ ./gui-installer/flake-module.nix ]; - perSystem = - { - self', - lib, - pkgs, - ... - }: - { - checks = lib.mkIf (pkgs.hostPlatform.system == "x86_64-linux") { - deb-gui-install-test = pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "deb-gui-install-test" { } '' - ${pkgs.dpkg}/bin/dpkg -i ${self'.checks.package-gui-installer-deb}/*.deb - ls -la /usr/bin/clan-app - while IFS= read -r line; do - if [[ "$line" == "Clan requires Nix to be installed. Would you like to install it now? (y/n)" ]]; then - echo "n" - elif [[ "$line" == "Clan cannot run without Nix. Exiting." ]]; then - break - fi - done < <(/usr/bin/clan-app) - touch $out - '' - ); - }; - }; -} diff --git a/pkgs/distro-packages/gui-installer/flake-module.nix b/pkgs/distro-packages/gui-installer/flake-module.nix deleted file mode 100644 index 4a4bd155f..000000000 --- a/pkgs/distro-packages/gui-installer/flake-module.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ self, ... }: -{ - perSystem = - { pkgs, ... }: - let - nfpmConfig = pkgs.writeText "clan-nfpm-config.yaml" ( - builtins.toJSON { - name = "clan-gui-installer"; - version = "0.0.${self.lastModifiedDate}"; - maintainer = "clan core team"; - homepage = "https://clan.lol"; - description = "Peer-to-Peer self-hosting made easy for developers"; - license = "MIT"; - contents = [ - { - src = "${./gui-installer.sh}"; - dst = "/usr/bin/clan-app"; - } - ]; - } - ); - installerFor = - packager: - pkgs.runCommand "gui-installer" { } '' - mkdir build - cd build - ${pkgs.nfpm}/bin/nfpm package --config ${nfpmConfig} --packager ${packager} - mkdir $out - mv * $out/ - ''; - in - { - packages.gui-installer-apk = installerFor "apk"; - packages.gui-installer-archlinux = installerFor "archlinux"; - packages.gui-installer-deb = installerFor "deb"; - packages.gui-installer-rpm = installerFor "rpm"; - }; -} diff --git a/pkgs/distro-packages/gui-installer/gui-installer.sh b/pkgs/distro-packages/gui-installer/gui-installer.sh deleted file mode 100755 index bc7f73d91..000000000 --- a/pkgs/distro-packages/gui-installer/gui-installer.sh +++ /dev/null @@ -1,66 +0,0 @@ -#! /bin/sh - -# create temp dir and ensure it is always cleaned -trap 'clean_temp_dir' EXIT -temp_dir=$(mktemp -d) - -clean_temp_dir() { - rm -rf "$temp_dir" -} - -is_installed() { - name=$1 - if [ -n "$(command -v "$name")" ]; then - return 0 - else - return 1 - fi -} - -install_nix() { - if is_installed curl; then - curl --proto '=https' --tlsv1.2 -sSf -L \ - https://install.determinate.systems/nix \ - > "$temp_dir"/install_nix.sh - elif is_installed wget; then - wget -qO- \ - https://install.determinate.systems/nix \ - > "$temp_dir"/install_nix.sh - else - echo "Either curl or wget is required to install Nix. Exiting." - exit 1 - fi - NIX_INSTALLER_DIAGNOSTIC_ENDPOINT="" sh "$temp_dir"/install_nix.sh install -} - -ask_then_install_nix() { - echo "Clan requires Nix to be installed. Would you like to install it now? (y/n)" - read -r response - if [ "$response" = "y" ]; then - install_nix - else - echo "Clan cannot run without Nix. Exiting." - exit 1 - fi -} - -ensure_nix_installed() { - if ! is_installed nix; then - ask_then_install_nix - fi -} - -start_clan_gui() { - PATH="${PATH:+$PATH:}/nix/var/nix/profiles/default/bin" \ - exec nix run \ - https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-app \ - --no-accept-flake-config \ - --extra-experimental-features "flakes nix-command" -- "$@" -} - -main() { - ensure_nix_installed - start_clan_gui "$@" -} - -main "$@" diff --git a/pkgs/distro-packages/vagrant_insecure_key b/pkgs/distro-packages/vagrant_insecure_key deleted file mode 100644 index 7d6a08390..000000000 --- a/pkgs/distro-packages/vagrant_insecure_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI -w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP -kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2 -hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO -Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW -yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd -ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1 -Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf -TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK -iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A -sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf -4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP -cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk -EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN -CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX -3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG -YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj -3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+ -dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz -6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC -P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF -llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ -kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH -+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ -NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s= ------END RSA PRIVATE KEY----- diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix index fdfcb6a9f..046ca8882 100644 --- a/pkgs/flake-module.nix +++ b/pkgs/flake-module.nix @@ -5,7 +5,6 @@ ./clan-cli/flake-module.nix ./clan-vm-manager/flake-module.nix ./installer/flake-module.nix - ./distro-packages/flake-module.nix ./icon-update/flake-module.nix ./generate-test-vars/flake-module.nix ./clan-core-flake/flake-module.nix