diff --git a/checks/lints.nu b/checks/lints.nu index ffc2047..b70766b 100644 --- a/checks/lints.nu +++ b/checks/lints.nu @@ -1,10 +1,8 @@ #!/usr/bin/env nu -let shell_files = ls **/*.sh | get name let nix_files = ls **/*.nix | where name !~ "hardware-configuration.nix|_sources" | get name let linters = [ - ([shellcheck] ++ $shell_files) ([nixfmt --check --strict] ++ $nix_files) ([deadnix --fail] ++ $nix_files) ([statix check] ++ $nix_files) diff --git a/pkgs/default.nix b/pkgs/default.nix index 0e5de7a..40383f6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,4 @@ { pkgs }: { crowdsec = import ./crowdsec { inherit pkgs; }; - starbound = pkgs.callPackage ./starbound { }; } diff --git a/pkgs/starbound/default.nix b/pkgs/starbound/default.nix deleted file mode 100644 index 26f2184..0000000 --- a/pkgs/starbound/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - stdenv, - lib, - makeWrapper, - patchelf, - steamPackages, - replace-secret, -}: -let - # Use the directory in which starbound is installed so steamcmd - # doesn't have to be reinstalled constantly (we're using DynamicUser - # with StateDirectory to persist this). - steamcmd = steamPackages.steamcmd.override { steamRoot = "/var/lib/starbound/.steamcmd"; }; - wrapperPath = lib.makeBinPath [ - patchelf - steamcmd - replace-secret - ]; -in -stdenv.mkDerivation { - name = "starbound-update-script"; - nativeBuildInputs = [ makeWrapper ]; - dontUnpack = true; - patchPhase = '' - interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" - substitute ${./launch-starbound.sh} launch-starbound --subst-var interpreter - ''; - installPhase = '' - mkdir -p $out/bin - cp launch-starbound $out/bin/launch-starbound - chmod +x $out/bin/launch-starbound - ''; - postFixup = '' - wrapProgram $out/bin/launch-starbound \ - --prefix PATH : "${wrapperPath}" - ''; -} diff --git a/pkgs/starbound/launch-starbound.sh b/pkgs/starbound/launch-starbound.sh deleted file mode 100644 index 24d4db1..0000000 --- a/pkgs/starbound/launch-starbound.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -set -eu - -if ! [[ -v STATE_DIRECTORY && -v CREDENTIALS_DIRECTORY ]]; then - echo "Error: Runtime dir or credential not set" - exit 1 -fi - -# Update the server to the latest version -echo "Updating/installing starbound" - -mkdir -p "${STATE_DIRECTORY}/.steamcmd" -steamcmd <