Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2262f892302a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60ba38fd8a9f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 28, 2017

  1. factorio: 0.15.1 -> 0.15.16

    @jbarthelmes
    jbarthelmes committed May 28, 2017
    Copy the full SHA
    636ce2d View commit details

  2. Merge pull request #26163 from jbarthelmes/factorio-0.15.16 

    factorio: 0.15.1 -> 0.15.16
    @pSub
    pSub authored May 28, 2017
    Copy the full SHA
    60ba38f View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/games/factorio/default.nix
6 changes: 3 additions & 3 deletions pkgs/games/factorio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de

with stdenv.lib;
let
version = if releaseType != "demo" then "0.15.1" else "0.14.23";
version = if releaseType != "demo" then "0.15.16" else "0.14.23";

arch = if stdenv.system == "x86_64-linux" then {
inUrl = "linux64";
@@ -27,8 +27,8 @@ let
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
name = "factorio_${releaseType}_${arch.inTar}-${version}.${extension}";
x64 = {
headless = fetchurl { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
headless = fetchurl { inherit name url; sha256 = "0ig0nrvqllb9294qn2ci5j5s31ycsjn23bp6hc633xqkgfmklmic"; };
alpha = authenticatedFetch { inherit name url; sha256 = "0bf0z6fi0cpbq487hz4sz8ljapchzhld01sj767wsldakjfkm9g9"; };
demo = fetchurl { inherit name url; sha256 = "10a2lwmspqviwgymn3zhjgpiynsa6dplgnikdirma5sl2hhcfb6s"; };
};
i386 = {