diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-07-13 21:59:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:59:12 +0200 |
| commit | 220db537871846ae122296733a193dee7527aecc (patch) | |
| tree | b36f00a88bb5107f71902b417330ef3f9746a05e | |
| parent | 50e16b7d3aeff0d1c5d9b040aa2f0f2d7d2bed99 (diff) | |
| parent | 2733706dd8c2316f9d5679edf20cb6e91cf852e9 (diff) | |
| download | nixpkgs-220db537871846ae122296733a193dee7527aecc.tar nixpkgs-220db537871846ae122296733a193dee7527aecc.tar.gz nixpkgs-220db537871846ae122296733a193dee7527aecc.tar.bz2 nixpkgs-220db537871846ae122296733a193dee7527aecc.tar.lz nixpkgs-220db537871846ae122296733a193dee7527aecc.tar.xz nixpkgs-220db537871846ae122296733a193dee7527aecc.tar.zst nixpkgs-220db537871846ae122296733a193dee7527aecc.zip | |
Merge pull request #243317 from tjni/ameba
ameba: patch to build against crystal 1.9
| -rw-r--r-- | pkgs/development/tools/ameba/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 17b444c1dfe..674e136c9f9 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -16,6 +16,24 @@ crystal.buildCrystalPackage rec { url = "https://github.com/crystal-ameba/ameba/commit/c7f2cba409787a1928fbb54494b4645ec11005cc.patch"; hash = "sha256-tYEPke6omMdCGG2llJGXDZ3jTO4YAqpknzTPi2576UI="; }) + (fetchpatch { + # Fixes: Error: type must be Ameba::Severity, not (Ameba::Severity | Nil) + name = "crystal-1.9-compatibility-1.patch"; + url = "https://github.com/crystal-ameba/ameba/commit/d0d8b18c8365fd956d1e65ae6051e83a5e129f18.patch"; + hash = "sha256-NmA3OoS5aOW+28TV/D/LUKEEu3lzHlcpolggHBB/wHE="; + }) + (fetchpatch { + # Ignore some failing lints on the Ameba codebase run during the check phase. + name = "crystal-1.9-compatibility-2.patch"; + url = "https://github.com/crystal-ameba/ameba/commit/c9d25f3409e6a127bbd7188267810657a2c2924e.patch"; + hash = "sha256-JMKiO0izSXfgw7uM9XXQ0r/ntOwRnjzYeVHqVLAvLXo="; + }) + (fetchpatch { + # Fixes test failures due to Crystal compiler error messages changing. + name = "crystal-1.9-compatibility-3.patch"; + url = "https://github.com/crystal-ameba/ameba/commit/db59b23f9bfcf53dbe53d2918bd9c3d79ac24bb6.patch"; + hash = "sha256-MKbEm9CR4+VzioCjcOFuFF0xnc1Ty0Ij4d3FcvQO6hY="; + }) ]; format = "make"; |