diff options
author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-09-13 04:18:05 +0200 |
---|---|---|
committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-09-13 04:18:05 +0200 |
commit | ee6301b54c5558f2b3182a4affec460b8f3451d4 (patch) | |
tree | b2c32dca05f26a7f9eac6078e7efd94d2da18fdb /customized | |
parent | 0027a7f88a2804ddfcb5159c4f9e21a6f330d491 (diff) | |
download | nixos-ee6301b54c5558f2b3182a4affec460b8f3451d4.tar nixos-ee6301b54c5558f2b3182a4affec460b8f3451d4.tar.gz nixos-ee6301b54c5558f2b3182a4affec460b8f3451d4.tar.bz2 nixos-ee6301b54c5558f2b3182a4affec460b8f3451d4.tar.xz nixos-ee6301b54c5558f2b3182a4affec460b8f3451d4.zip |
better names
Diffstat (limited to 'customized')
-rw-r--r-- | customized/factorio-fetch.nix | 5 | ||||
-rw-r--r-- | customized/factorio.nix | 4 |
2 files changed, 4 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 @@ | |||
13 | 13 | ||
14 | # SHA256 of the fetched URL. | 14 | # SHA256 of the fetched URL. |
15 | , sha256 ? "" | 15 | , sha256 ? "" |
16 | , name | ||
16 | }: | 17 | }: |
17 | 18 | ||
18 | stdenv.mkDerivation { | 19 | stdenv.mkDerivation { |
19 | name = "factorio.tar.gz"; | ||
20 | |||
21 | buildInputs = [ curl xidel ]; | 20 | buildInputs = [ curl xidel ]; |
22 | 21 | ||
23 | inherit url loginUrl username password cacert; | 22 | inherit name url loginUrl username password cacert; |
24 | 23 | ||
25 | builder = ./fetch.sh; | 24 | builder = ./fetch.sh; |
26 | 25 | ||
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 | |||
27 | name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; | 27 | name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; |
28 | x64 = { | 28 | x64 = { |
29 | headless = fetchurl { inherit name url; sha256 = "153sx7rvh9s5nsq0jyw0mnzqwlvhy4qrs4zqz0639akb2j4kcjvk"; }; | 29 | headless = fetchurl { inherit name url; sha256 = "153sx7rvh9s5nsq0jyw0mnzqwlvhy4qrs4zqz0639akb2j4kcjvk"; }; |
30 | alpha = authenticatedFetch { inherit url; sha256 = null; }; | 30 | alpha = authenticatedFetch { inherit name url; sha256 = null; }; |
31 | }; | 31 | }; |
32 | i386 = { | 32 | i386 = { |
33 | headless = abort "Factorio 32-bit headless binaries are not available for download."; | 33 | headless = abort "Factorio 32-bit headless binaries are not available for download."; |
34 | alpha = authenticatedFetch { inherit url; sha256 = null; }; | 34 | alpha = authenticatedFetch { inherit name url; sha256 = null; }; |
35 | }; | 35 | }; |
36 | }; | 36 | }; |
37 | 37 | ||