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: 2d95a6ab2208
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9acc59affdc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2017

  1. factorio: 0.15.34 -> 0.15.37

    @WhatNodyn
    WhatNodyn committed Nov 16, 2017
    Copy the full SHA
    fd8a174 View commit details

  2. Merge pull request #31740 from WhatNodyn/factorio-version 

    factorio: 0.15.34 -> 0.15.37
    @orivej
    orivej authored Nov 16, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c9acc59 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
@@ -16,8 +16,8 @@ let
# where the ultimate "_" (before the version) is changed to a "-".
binDists = {
x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
alpha = bdist { sha256 = "0phikwv00mbwpz4207wm6gz6blarm0b9p1f013ha2w5g7c2dxq4s"; fetcher = authenticatedFetch; };
headless = bdist { sha256 = "1m170cl8ji6k3d3jm6n48wx3b7xfsxp4wkaixh0qszaqzafsglp0"; };
alpha = bdist { sha256 = "0y6d7pvf3dgyll175323xp4zmrbyrjn73zrb478y1gpl6dqh064d"; fetcher = authenticatedFetch; };
headless = bdist { sha256 = "1agkra3qq11la307ymsfb7v358wc2s2mdpmfbc5n0sb4gnmnqazq"; };
demo = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; version = "0.15.33"; };
};
i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
@@ -29,7 +29,7 @@ let
actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform");

bdistForArch = arch: { sha256 ? null
, version ? "0.15.34"
, version ? "0.15.37"
, fetcher ? fetchurl
, nameMut ? x: x
}: