Unverified Commit 955aaaa9 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #257668 from sund3RRR/collision-3.6.0 

collision: 3.5.0 -> 3.6.0
parents 4eeff803 c1885ddd

pkgs/applications/misc/collision/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 
}:

crystal.buildCrystalPackage rec {

  pname = "Collision";

  version = "3.5.0";

  version = "3.6.0";



  src = fetchFromGitHub {

    owner = "GeopJr";

    repo = "Collision";

    rev = "v${version}";

    hash = "sha256-YNMtiMSzDqBlJJTUntRtL6oXg+IuyAobQ4FYcwOdOas=";

    hash = "sha256-Qxe4ILDdfYfxu95EvKRTvkAOgDIZDiLymBlZouBWn0M=";

  };

  patches = [ ./make.patch ];

  shardsFile = ./collision-shards.nix;

  shardsFile = ./shards.nix;



  # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to

  # main_module:(.text+0x6f0): undefined reference to `SSL_library_init'

pkgs/applications/misc/collision/collision-shards.nix→pkgs/applications/misc/collision/shards.nix

+14 −19
Original line number Diff line number Diff line
@@ -4,16 +4,6 @@ 
    rev = "v1.0.0";

    sha256 = "1y27m4170rr4532j56grzhwbz8hj6z7j3zfkd0jnfwnsxclks1kc";

  };

  non-blocking-spawn = {

    url = "https://github.com/geopjr/non-blocking-spawn.git";

    rev = "v1.0.5";

    sha256 = "139gr87zlw0k9kf6pf9k2d88aa9x3kcnfg34qpbqrwsrck7708za";

  };

  version_from_shard = {

    url = "https://github.com/hugopl/version_from_shard.git";

    rev = "v1.2.5";

    sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";

  };

  gio = {

    url = "https://github.com/hugopl/gio.cr.git";

    rev = "v0.1.0";
@@ -21,22 +11,27 @@ 
  };

  gtk4 = {

    url = "https://github.com/hugopl/gtk4.cr.git";

    rev = "v0.13.0";

    sha256 = "0xsrcsh5qvwm9l7cywxpw49rfv94mkkqcliws4zkhxgr9isnirbm";

    rev = "v0.15.0";

    sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1";

  };

  harfbuzz = {

    url = "https://github.com/hugopl/harfbuzz.cr.git";

    rev = "v0.1.0";

    sha256 = "1lcb778b4k34sqxg979fpl425bbzf2gikjf2m5aj6x1fzxn46jg0";

    rev = "v0.2.0";

    sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";

  };

  libadwaita = {

    url = "https://github.com/geopjr/libadwaita.cr.git";

    rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446";

    sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3";

  };

  non-blocking-spawn = {

    url = "https://github.com/geopjr/non-blocking-spawn.git";

    rev = "v1.0.5";

    sha256 = "139gr87zlw0k9kf6pf9k2d88aa9x3kcnfg34qpbqrwsrck7708za";

  };

  pango = {

    url = "https://github.com/hugopl/pango.cr.git";

    rev = "v0.2.0";

    sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf";

  };

  libadwaita = {

    url = "https://github.com/geopjr/libadwaita.cr.git";

    rev = "203737fc96bb48e1a710cb68e896d2c5b9c1a6e5";

    sha256 = "11c2knxncjnwg4cgppfllxwgli1hf6sjyyx4ii8rgmnbird6xcmh";

  };

}