simplify factorio again

5 files changed, 10 insertions, 244 deletions

diff --git a/.gitignore b/.gitignore
index 15eafda5..3b10a887 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 configuration.nix
 config.nix
-**/\#*\#
-factorio-credentials.nix
\ No newline at end of file
+**/\#*\#
\ No newline at end of file
diff --git a/customized/factorio-fetch.nix b/customized/factorio-fetch.nix
deleted file mode 100644
index 4b9b9995..00000000
--- a/customized/factorio-fetch.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, curl, xidel, cacert
-# Begin download parameters
-, username ? ""
-, password ? ""
-}:
-
-{
-  # URL to fetch.
-  url ? ""
-
-  # Login URL.
-, loginUrl ? "https://www.factorio.com/login"
-
-  # SHA256 of the fetched URL.
-, sha256 ? ""
-, name
-}:
-
-stdenv.mkDerivation {
-  buildInputs = [ curl xidel ];
-
-  inherit name url loginUrl username password cacert;
-
-  builder = ./fetch.sh;
-
-  outputHashAlgo = "sha256";
-  outputHash = sha256;
-  outputHashMode = "flat";
-
-  # There's no point in downloading remotely, we'd just slow things down.
-  preferLocalBuild = true;
-}
diff --git a/customized/factorio.nix b/customized/factorio.nix
deleted file mode 100644
index bab0d3d2..00000000
--- a/customized/factorio.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{ stdenv, callPackage, fetchurl, makeWrapper
-, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu
-, factorio-utils, factorio-fetch
-, releaseType
-, mods ? []
-}:
-
-assert releaseType == "alpha" || releaseType == "headless";
-
-with stdenv.lib;
-let
-  version = "0.14.5";
-  isHeadless = releaseType == "headless";
-
-  arch = if stdenv.system == "x86_64-linux" then {
-    inUrl = "linux64";
-    inTar = "x64";
-  } else if stdenv.system == "i686-linux" then {
-    inUrl = "linux32";
-    inTar = "i386";
-  } else abort "Unsupported platform";
-
-  authenticatedFetch = factorio-fetch;
-
-  fetch = rec {
-    url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
-    x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "153sx7rvh9s5nsq0jyw0mnzqwlvhy4qrs4zqz0639akb2j4kcjvk"; };
-      alpha = authenticatedFetch { inherit name url; sha256 = null; };
-    };
-    i386 = {
-      headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit name url; sha256 = null; };
-    };
-  };
-
-  configBaseCfg = ''
-    use-system-read-write-data-directories=false
-    [path]
-    read-data=$out/share/factorio/data/
-    [other]
-    check_updates=false
-  '';
-
-  updateConfigSh = ''
-    #! $SHELL
-    if [[ -e ~/.factorio/config.cfg ]]; then
-      # Config file exists, but may have wrong path.
-      # Try to edit it. I'm sure this is perfectly safe and will never go wrong.
-      sed -i 's|^read-data=.*|read-data=$out/share/factorio/data/|' ~/.factorio/config.cfg
-    else
-      # Config file does not exist. Phew.
-      install -D $out/share/factorio/config-base.cfg ~/.factorio/config.cfg
-    fi
-  '';
-
-  modDir = factorio-utils.mkModDirDrv mods;
-
-  base = {
-    name = "factorio-${releaseType}-${version}";
-
-    src = fetch.${arch.inTar}.${releaseType};
-
-    preferLocalBuild = true;
-    dontBuild = true;
-
-    installPhase = ''
-      mkdir -p $out/{bin,share/factorio}
-      cp -a data $out/share/factorio
-      cp -a bin/${arch.inTar}/factorio $out/bin/factorio
-      patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        $out/bin/factorio
-    '';
-
-    meta = {
-      description = "A game in which you build and maintain factories";
-      longDescription = ''
-        Factorio is a game in which you build and maintain factories.
-
-        You will be mining resources, researching technologies, building
-        infrastructure, automating production and fighting enemies. Use your
-        imagination to design your factory, combine simple elements into
-        ingenious structures, apply management skills to keep it working and
-        finally protect it from the creatures who don't really like you.
-
-        Factorio has been in development since spring of 2012 and it is
-        currently in late alpha.
-      '';
-      homepage = https://www.factorio.com/;
-      license = stdenv.lib.licenses.unfree;
-      maintainers = with stdenv.lib.maintainers; [ Baughn elitak ];
-      platforms = [ "i686-linux" "x86_64-linux" ];
-    };
-  };
-  headless = base;
-  alpha = base // {
-
-    buildInputs = [ makeWrapper ];
-
-    libPath = stdenv.lib.makeLibraryPath [
-      alsaLib
-      libX11
-      libXcursor
-      libXinerama
-      libXrandr
-      libXi
-      mesa_noglu
-    ];
-
-    installPhase = base.installPhase + ''
-      wrapProgram $out/bin/factorio                                \
-        --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
-        --run "$out/share/factorio/update-config.sh"               \
-        --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}"
-
-        # TODO Currently, every time a mod is changed/added/removed using the
-        # modlist, a new derivation will take up the entire footprint of the
-        # client. The only way to avoid this is to remove the mods arg from the
-        # package function. The modsDir derivation will have to be built
-        # separately and have the user specify it in the .factorio config or
-        # right along side it using a symlink into the store I think i will
-        # just remove mods for the client derivation entirely. this is much
-        # cleaner and more useful for headless mode.
-
-        # TODO: trying to toggle off a mod will result in read-only-fs-error.
-        # not much we can do about that except warn the user somewhere. In
-        # fact, no exit will be clean, since this error will happen on close
-        # regardless. just prints an ugly stacktrace but seems to be otherwise
-        # harmless, unless maybe the user forgets and tries to use the mod
-        # manager.
-
-      install -m0644 <(cat << EOF
-      ${configBaseCfg}
-      EOF
-      ) $out/share/factorio/config-base.cfg
-
-      install -m0755 <(cat << EOF
-      ${updateConfigSh}
-      EOF
-      ) $out/share/factorio/update-config.sh
-
-      cp -a doc-html $out/share/factorio
-    '';
-  };
-in stdenv.mkDerivation (if isHeadless then headless else alpha)
diff --git a/customized/fetch.sh b/customized/fetch.sh
deleted file mode 100644
index 8ea615a1..00000000
--- a/customized/fetch.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-source $stdenv/setup
-
-# Curl flags to increase reliability a bit.
-#
-# Can't use fetchurl, for several reasons. One is that we definitely
-# don't want --insecure for the login, though we need it for the
-# download as their download cert isn't in the standard linux bundle.
-curl="curl \
- --max-redirs 20 \
- --retry 3 \
- --cacert $cacert/etc/ssl/certs/ca-bundle.crt \
- -b cookies \
- -c cookies \
- $curlOpts \
- $NIX_CURL_FLAGS"
-
-# We don't want the password to be on any program's argv, as it may be
-# visible in /proc. Writing it to file with echo should be safe, since
-# it's a shell builtin.
-echo -n "$password" > password
-# Might as well hide the username as well.
-echo -n "$username" > username
-
-# Get a CSRF token.
-csrf=$($curl $loginUrl | xidel - -e '//input[@id="csrf_token"]/@value')
-
-# Log in. We don't especially care about the result, but let's check if login failed.
-$curl --data-urlencode csrf_token="$csrf" \
-      --data-urlencode username@username \
-      --data-urlencode password@password \
-      -d action=Login \
-      $loginUrl -D headers > /dev/null
-
-if grep -q 'Location: https://' headers; then
-    # Now download. We need --insecure for this, but the sha256 should cover us.
-    $curl --insecure --location $url > $out
-    set +x
-else
-    set +x
-    echo "Login failed (username: ‘$username’)"
-    echo 'Please set username and password with config.nix,'
-    echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.'
-    echo
-    echo 'Example:'
-    echo '{'
-    echo '  packageOverrides = pkgs: rec {'
-    echo '    factorio = pkgs.factorio.override {'
-    echo '      username = "<username or email address>";'
-    echo '      password = "<password>";'
-    echo '    };'
-    echo '  };'
-    echo '}'
-
-    exit 1
-fi
diff --git a/ymir/factorio.nix b/ymir/factorio.nix
index 6c0dc246..a7bac033 100644
--- a/ymir/factorio.nix
+++ b/ymir/factorio.nix
@@ -6,10 +6,15 @@ let
     allOptionalMods = false;
   };
   modPortalDrv = { id, name, version, sha256, deps ? [], optionalDeps ? [], recommendedDeps ? [] }: modDrv {
-    src = pkgs.factorio-fetch {
-      name = ''${name}_${version}.zip'';
-      url = ''https://mods.factorio.com/api/downloads/data/mods/${id}_${version}.zip'';
-      inherit sha256;
+    # src = pkgs.factorio-fetch {
+    #   name = ''${name}_${version}.zip'';
+    #   url = ''https://mods.factorio.com/api/downloads/data/mods/${id}_${version}.zip'';
+    #   inherit sha256;
+    #   loginUrl = "";
+    # };
+    src = pkgs.fetchurl {
+      url = ''https://f.141.li/${name}_${version}.zip'';
+      inherit name sha256;
     };
     inherit deps optionalDeps recommendedDeps;
   };
@@ -65,8 +70,6 @@ let
     };
   };
 in {
-  imports = [ ../factorio-credentials.nix ];
-
   services.factorio = {
     enable = true;
     saveName = config.networking.hostName;
@@ -87,7 +90,5 @@ in {
 
   nixpkgs.config.packageOverrides = pkgs: {
     factorio-mkModDirDrv = pkgs.factorio-utils.mkModDirDrv;
-    factorio = pkgs.callPackage ../customized/factorio.nix { releaseType = "alpha"; };
-    factorio-headless = pkgs.callPackage ../customized/factorio.nix { releaseType = "headless"; };
   };
 }