Merge pull request #176001 from NixOS/update-and-fix-stuntrally

stuntrally: 2.6.1 -> 2.6.2

authored by Pascal Wittmann and committed by GitHub 48195904 705c834f

+4 -8
+3 -7
pkgs/games/stuntrally/default.nix
··· 18 19 stdenv.mkDerivation rec { 20 pname = "stunt-rally"; 21 - version = "2.6.1"; 22 23 src = fetchFromGitHub { 24 owner = "stuntrally"; 25 repo = "stuntrally"; 26 rev = version; 27 - hash = "sha256-1+Cc9I6TTa3b++/7Z2V+vAXcmFb2+wX7TnXEH6CRDWU="; 28 }; 29 tracks = fetchFromGitHub { 30 owner = "stuntrally"; 31 repo = "tracks"; 32 rev = version; 33 - hash = "sha256-FbZc87j/9cp4LxNaEO2wNTvwk1Aq/IWcKD3rTGkzqj0="; 34 }; 35 - 36 - # include/OGRE/OgreException.h:265:126: error: invalid conversion from 37 - # 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive] 38 - NIX_CFLAGS_COMPILE = "-fpermissive"; 39 40 preConfigure = '' 41 ln -s ${tracks} data/tracks
··· 18 19 stdenv.mkDerivation rec { 20 pname = "stunt-rally"; 21 + version = "2.6.2"; 22 23 src = fetchFromGitHub { 24 owner = "stuntrally"; 25 repo = "stuntrally"; 26 rev = version; 27 + hash = "sha256-9I6hXsosqx+yYiEOEnPXQJHZkGtSU+JqThorwjemlc0="; 28 }; 29 tracks = fetchFromGitHub { 30 owner = "stuntrally"; 31 repo = "tracks"; 32 rev = version; 33 + hash = "sha256-eZJAvkKe3PrXDzxTa5WFBHfltB3jhQh8puzOFDO9lso="; 34 }; 35 36 preConfigure = '' 37 ln -s ${tracks} data/tracks
+1 -1
pkgs/top-level/all-packages.nix
··· 32285 stt = callPackage ../tools/audio/stt { }; 32286 32287 stuntrally = callPackage ../games/stuntrally 32288 - { stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; 32289 32290 superTux = callPackage ../games/supertux { }; 32291
··· 32285 stt = callPackage ../tools/audio/stt { }; 32286 32287 stuntrally = callPackage ../games/stuntrally 32288 + { ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; 32289 32290 superTux = callPackage ../games/supertux { }; 32291