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

Commits on Apr 3, 2020

  1. armagetronad: 0.2.8.3.4 -> 0.2.8.3.5

    @prusnak
    prusnak committed Apr 3, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e3bdd6f View commit details

Commits on Apr 6, 2020

  1. Merge pull request #84210 from prusnak/armagetronad 

    armagetronad: 0.2.8.3.4 -> 0.2.8.3.5
    @ryantm
    ryantm authored Apr 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    98a8b5d View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/games/armagetronad/default.nix
6 changes: 3 additions & 3 deletions pkgs/games/armagetronad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
versionMajor = "0.2.8";
versionMinor = "3.4";
versionMinor = "3.5";
version = "${versionMajor}.${versionMinor}";
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3";
sha256 = "1vyja7mzivs3pacxb7kznndsgqhq4p0f7x2zg55dckvzqwprdhqx";
};

NIX_LDFLAGS = "-lSDL_image";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ];

meta = with stdenv.lib; {
homepage = http://armagetronad.org;
homepage = "http://armagetronad.org";
description = "An multiplayer networked arcade racing game in 3D similar to Tron";
license = licenses.gpl2;
platforms = platforms.linux;