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

Commits on Oct 20, 2019

  1. openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18 

    - Updated repo owner
    @sengaya
    sengaya committed Oct 20, 2019
    Copy the full SHA
    b09794c View commit details

Commits on Oct 21, 2019

  1. Merge pull request #71469 from sengaya/openxcom-1.0.0.2019.10.18 

    openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18
    @cpages
    cpages authored Oct 21, 2019
    Copy the full SHA
    4ee309a View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/games/openxcom/default.nix
8 changes: 4 additions & 4 deletions pkgs/games/openxcom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost
, SDL, SDL_image, SDL_mixer, SDL_gfx }:

let version = "1.0.0.2018.10.08"; in
let version = "1.0.0.2019.10.18"; in
stdenv.mkDerivation {
pname = "openxcom";
inherit version;
src = fetchFromGitHub {
owner = "SupSuper";
owner = "OpenXcom";
repo = "OpenXcom";
rev = "13049d617fe762b91893faaf7c14ddefa49e2f1d";
sha256 = "0vpcfk3g1bnwwmrln14jkj2wvw2z8igxw2mdb7c3y66466wm93ig";
rev = "f9853b2cb8c8f741ac58707487ef493416d890a3";
sha256 = "0kbfawj5wsp1mwfcm5mwpkq6s3d13pailjm5w268gqpxjksziyq0";
};

nativeBuildInputs = [ cmake ];