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

Commits on Mar 9, 2019

  1. Revert "stepmania: switch to clangStdenv" 

    This reverts commit ff6e4b4.
    @RubenAstudillo
    RubenAstudillo committed Mar 9, 2019
    Copy the full SHA
    14627ac View commit details

  2. stepmania: 5.0.12 -> 5.1.0-b2

    @RubenAstudillo
    RubenAstudillo committed Mar 9, 2019
    Copy the full SHA
    8bbe671 View commit details

Commits on Mar 14, 2019

  1. Merge pull request #56765 from RubenAstudillo/stepmania-5.1 

    stepmania: 5.0.12 -> 5.1.0-b2
    @infinisil
    infinisil authored Mar 14, 2019
    Copy the full SHA
    aa5df94 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/games/stepmania/default.nix
10 changes: 5 additions & 5 deletions pkgs/games/stepmania/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ clangStdenv, lib, fetchFromGitHub, cmake, nasm
{ stdenv, lib, fetchFromGitHub, cmake, nasm
, gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis
, glew, libpulseaudio, udev
}:

clangStdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "stepmania-${version}";
version = "5.0.12";
version = "5.1.0-b2";

src = fetchFromGitHub {
owner = "stepmania";
repo = "stepmania";
rev = "v${version}";
sha256 = "0ig5pnw78j45b35kfr76phaqbac9b2f6wg3c63l6mf0nrq17wslz";
sha256 = "0a7y9l7xm510vgnpmj1is7p9m6d6yd0fcaxrjcickz295k5w3rdn";
};

nativeBuildInputs = [ cmake nasm ];
@@ -29,7 +29,7 @@ clangStdenv.mkDerivation rec {

postInstall = ''
mkdir -p $out/bin
ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania
ln -s $out/stepmania-5.1/stepmania $out/bin/stepmania
'';

enableParallelBuilding = true;