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

Commits on Apr 11, 2020

  1. spring: 104.0.1-1477-g8ecf38a -> 104.0.1-1480-gc9377ac

    @sorki
    sorki committed Apr 11, 2020
    Copy the full SHA
    bd20b4d View commit details

  2. spring: add sorki to maintainers

    @sorki
    sorki committed Apr 11, 2020
    Copy the full SHA
    9b8ee09 View commit details

  3. Merge pull request #84990 from sorki/spring 

    spring: 104.0.1-1477-g8ecf38a -> 104.0.1-1480-gc9377ac
    @domenkozar
    domenkozar authored Apr 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce41900 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/games/spring/default.nix
10 changes: 5 additions & 5 deletions pkgs/games/spring/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,17 +8,17 @@
stdenv.mkDerivation rec {
pname = "spring";
version = "104.0.1-${buildId}-g${shortRev}";
# usually the latest in https://github.com/spring/spring/commits/maintenance
rev = "8ecf38a784ed3c4e3d67bc8d59839a77e0f0b83e";
# usually the latest in https://github.com/spring/spring/commits/maintenance
rev = "c9377ac3d5779eca811080e1c98a3ac668a22b18";
shortRev = builtins.substring 0 7 rev;
buildId = "1477";
buildId = "1480";

# taken from https://github.com/spring/spring/commits/maintenance
src = fetchFromGitHub {
owner = "spring";
repo = "spring";
inherit rev;
sha256 = "0iai1wnd7msabgw2979cp2k54sgcfvidfmymhnck31jwbfa6y021";
sha256 = "0iha1bnb72hqijm41jppipqgghh15cw3rbyyzfal1b516431848p";
fetchSubmodules = true;
};

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://springrts.com/";
description = "A powerful real-time strategy (RTS) game engine";
license = licenses.gpl2;
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar maintainers.sorki ];
platforms = platforms.linux;
};
}