collision: 3.9.0 -> 3.10.0

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

@@ -21,13 +21,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "Collision";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Collision";
     rev = "v${version}";
-    hash = "sha256-c/74LzDM63w5zW8z2T8o4Efvuzj791/zTSKEDN32uak=";
+    hash = "sha256-ZXGhMicwlkXUw8I6HUNVxY4vCaVixdV76+wYn34Py6Q=";
   };
 
   postPatch = ''
@@ -39,20 +39,23 @@ crystal.buildCrystalPackage rec {
   copyShardDeps = true;
 
   preBuild = ''
-    cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug
-    cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/
+    cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug && \
+    install -Dm755 bin/gi-crystal ../../bin/gi-crystal && cd ../..
   '';
 
   # 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'
   # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/
   # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue.
-
-  nativeBuildInputs = [
-    wrapGAppsHook4
-    pkg-config
-    gobject-introspection
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  nativeBuildInputs =
+    [
+      wrapGAppsHook4
+      pkg-config
+      gobject-introspection
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      desktopToDarwinBundle
+    ];
 
   buildInputs = [
     libadwaita
@@ -82,7 +85,7 @@ crystal.buildCrystalPackage rec {
   passthru = {
     updateScript = _experimental-update-script-combinators.sequence [
       (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" ./shard.lock)
+      (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" "./shard.lock")
       {
         command = [
           (writeShellScript "update-lock" "cd $1; ${lib.getExe crystal2nix}")
@@ -93,7 +96,7 @@ crystal.buildCrystalPackage rec {
       {
         command = [
           "rm"
-          ./shard.lock
+          "./shard.lock"
         ];
         supportedFeatures = [ "silent" ];
       }

pkgs/by-name/co/collision/shards.nix

@@ -1,8 +1,8 @@
 {
   blake3 = {
     url = "https://github.com/geopjr/blake3.cr.git";
-    rev = "v1.3.0";
-    sha256 = "0pc3h7b5gfkmxlw708qaqjfzjvv5ig3iwxxainq6pwfhpff4a5wd";
+    rev = "v1.4.0";
+    sha256 = "1kp3rqddcsjj15syfnfvsx694nmpjzxmgawnf7y7dxdakk3przlw";
   };
   gettext = {
     url = "https://github.com/geopjr/gettext.cr.git";
@@ -11,8 +11,8 @@
   };
   gi-crystal = {
     url = "https://github.com/hugopl/gi-crystal.git";
-    rev = "v0.24.0";
-    sha256 = "0x356xn35008l573qhyl1sdddc9cc5i3bsa4c7865kgq9521ifyh";
+    rev = "v0.25.0";
+    sha256 = "0lgs85khg6yzmw7vnkjxygrga1618440hayjc51jmjcfh2lff1k2";
   };
   gtk4 = {
     url = "https://github.com/hugopl/gtk4.cr.git";
@@ -25,9 +25,9 @@
     sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
   };
   libadwaita = {
-    url = "https://github.com/geopjr/libadwaita.cr.git";
-    rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446";
-    sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3";
+    url = "https://github.com/hugopl/libadwaita.cr.git";
+    rev = "v0.1.0";
+    sha256 = "13iqij1rwqdlsd9gls3gz4i4frlsda3yasdbbmrzpa8d3qm3p8yq";
   };
   non-blocking-spawn = {
     url = "https://github.com/geopjr/non-blocking-spawn.git";

pkgs/top-level/all-packages.nix

@@ -351,8 +351,6 @@ with pkgs;
     perlPackages = perl538Packages;
   };
 
-  collision = callPackage ../applications/misc/collision { };
-
   coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
 
   copilot-language-server-fhs = copilot-language-server.fhs;