JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33957 from seanparsons/add-factorio-experimental-support

Browse Source 
Added support for Factorio's experimental branch.
This commit is contained in:
Joachim F 2018-02-16 15:14:44 +00:00 committed by GitHub
commit 1628e40069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/games/factorio/default.nix
View File

@ -4,6 +4,7 @@
, releaseType , releaseType
, mods ? [] , mods ? []
, username ? "" , password ? "" , username ? "" , password ? ""
, experimental ? false
}: }:
assert releaseType == "alpha" assert releaseType == "alpha"
@ -14,19 +15,38 @@ let
# NB If you nix-prefetch-url any of these, be sure to add a --name arg, # NB If you nix-prefetch-url any of these, be sure to add a --name arg,
# where the ultimate "_" (before the version) is changed to a "-". # where the ultimate "_" (before the version) is changed to a "-".
branch = if experimental then "experimental" else "stable";
binDists = { binDists = {
x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
alpha = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; }; alpha = {
headless = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; }; stable = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; };
demo = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; }; experimental = bdist { sha256 = "0s7cn5xhzwn793bmvlhlmibhbxdpfmpnpn33k5a4hdprc5gc27rg"; version = "0.16.24"; fetcher = authenticatedFetch; };
};
headless = {
stable = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; };
experimental = bdist { sha256 = "1ff4yjybiqr5kw583hmxkbrbxa3haj4bkjj8sx811c3s269gspi2"; version = "0.16.24"; };
};
demo = {
stable = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; };
experimental = bdist { };
};
}; };
i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
alpha = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; alpha = {
headless = bdist { }; stable = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; };
demo = bdist { }; experimental = bdist { };
};
headless = {
stable = bdist { };
experimental = bdist { };
};
demo = {
stable = bdist { };
experimental = bdist { };
};
}; };
}; };
actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform"); actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform");
bdistForArch = arch: { sha256 ? null bdistForArch = arch: { sha256 ? null
, version ? "0.15.40" , version ? "0.15.40"

2
pkgs/top-level/all-packages.nix
View File

@ -18444,6 +18444,8 @@ with pkgs;
factorio = callPackage ../games/factorio { releaseType = "alpha"; }; factorio = callPackage ../games/factorio { releaseType = "alpha"; };
factorio-experimental = callPackage ../games/factorio { releaseType = "alpha"; experimental = true; };
factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; factorio-demo = callPackage ../games/factorio { releaseType = "demo"; };