Unverified Commit daf48681 authored by isabel's avatar isabel Committed by GitHub
Browse files

colobot: 0.2.1-alpha -> 0.2.2-alpha (#398836)

parents f9ae8ec8 351bf0e8

pkgs/by-name/co/colobot/data.nix

+9 −10
Original line number Diff line number Diff line
@@ -10,15 +10,15 @@ 
  python3,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "colobot-data";

  version = "0.2.0-alpha";

  version = "0.2.2-alpha";



  src = fetchFromGitHub {

    owner = "colobot";

    repo = "colobot-data";

    rev = "colobot-gold-${version}";

    sha256 = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms=";

    tag = "colobot-gold-${finalAttrs.version}";

    hash = "sha256-Voxfc5iCFT7gyahaai5wLPi6fe7dWryYLjfNjfXpwWs=";

  };



  nativeBuildInputs = [
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec { 
  ];

  buildInputs = [ gettext ];



  enableParallelBuilding = false;

  # Build procedure requires the data folder

  patchPhase = ''

    cp -r $src localSrc
@@ -45,11 +44,11 @@ stdenv.mkDerivation rec { 
    cd localSrc

  '';



  meta = with lib; {

  meta = {

    homepage = "https://colobot.info/";

    description = "Game data for colobot";

    license = licenses.gpl3;

    maintainers = with maintainers; [ freezeboy ];

    platforms = platforms.linux;

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [ freezeboy ];

    platforms = lib.platforms.linux;

  };

}
 
})

pkgs/by-name/co/colobot/package.nix

+9 −11
Original line number Diff line number Diff line
@@ -24,17 +24,17 @@ 
let

  colobot-data = callPackage ./data.nix { };

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "colobot";

  # Maybe require an update to package colobot-data as well

  # in file data.nix next to this one

  version = "0.2.1-alpha";

  version = "0.2.2-alpha";



  src = fetchFromGitHub {

    owner = "colobot";

    repo = "colobot";

    rev = "colobot-gold-${version}";

    hash = "sha256-3iea2+5xCT0//NAjMHrynZKSoiOSgLTNMUQkRhXuXg8=";

    tag = "colobot-gold-${finalAttrs.version}";

    hash = "sha256-QhNHtAG+hKq7qJhKWCJcP4ejm5YDOU8pyYtitJppVlU=";

  };



  nativeBuildInputs = [
@@ -58,8 +58,6 @@ stdenv.mkDerivation rec { 
    openal

  ];



  enableParallelBuilding = false;



  # The binary ends in games directory

  postInstall = ''

    mv $out/games $out/bin
@@ -68,11 +66,11 @@ stdenv.mkDerivation rec { 
    done

  '';



  meta = with lib; {

  meta = {

    homepage = "https://colobot.info/";

    description = "Colobot: Gold Edition is a real-time strategy game, where you can program your bots";

    license = licenses.gpl3;

    maintainers = with maintainers; [ freezeboy ];

    platforms = platforms.linux;

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [ freezeboy ];

    platforms = lib.platforms.linux;

  };

}
 
})