From ee6301b54c5558f2b3182a4affec460b8f3451d4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 13 Sep 2016 04:18:05 +0200 Subject: better names --- customized/factorio-fetch.nix | 5 ++--- customized/factorio.nix | 4 ++-- ymir/factorio.nix | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/customized/factorio-fetch.nix b/customized/factorio-fetch.nix index 04b31ac1..4b9b9995 100644 --- a/customized/factorio-fetch.nix +++ b/customized/factorio-fetch.nix @@ -13,14 +13,13 @@ # SHA256 of the fetched URL. , sha256 ? "" +, name }: stdenv.mkDerivation { - name = "factorio.tar.gz"; - buildInputs = [ curl xidel ]; - inherit url loginUrl username password cacert; + inherit name url loginUrl username password cacert; builder = ./fetch.sh; diff --git a/customized/factorio.nix b/customized/factorio.nix index b2832aad..bab0d3d2 100644 --- a/customized/factorio.nix +++ b/customized/factorio.nix @@ -27,11 +27,11 @@ let name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; x64 = { headless = fetchurl { inherit name url; sha256 = "153sx7rvh9s5nsq0jyw0mnzqwlvhy4qrs4zqz0639akb2j4kcjvk"; }; - alpha = authenticatedFetch { inherit url; sha256 = null; }; + alpha = authenticatedFetch { inherit name url; sha256 = null; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = null; }; + alpha = authenticatedFetch { inherit name url; sha256 = null; }; }; }; diff --git a/ymir/factorio.nix b/ymir/factorio.nix index b056899e..8fb6c44b 100644 --- a/ymir/factorio.nix +++ b/ymir/factorio.nix @@ -7,6 +7,7 @@ let }; 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; }; -- cgit v1.2.3