Skip to content

Commit f5de194

Browse files
authored
mint: 0.19.0 -> 0.22.0 and drop dependency on crystal 1.9 (#381728)
2 parents 02f33af + 5f60939 commit f5de194

File tree

3 files changed

+15
-32
lines changed

3 files changed

+15
-32
lines changed

pkgs/development/compilers/mint/default.nix renamed to pkgs/by-name/mi/mint/package.nix

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
lib,
33
fetchFromGitHub,
44
crystal,
5+
libxml2,
56
openssl,
67
}:
78

89
crystal.buildCrystalPackage rec {
9-
version = "0.19.0";
1010
pname = "mint";
11+
version = "0.22.0";
1112

1213
src = fetchFromGitHub {
1314
owner = "mint-lang";
1415
repo = "mint";
1516
rev = version;
16-
hash = "sha256-s/ehv8Z71nWnxpajO7eR4MxoHppqkdleFluv+e5Vv6I=";
17+
hash = "sha256-82Oi9UJ530rZNGa6XxC1hNvRfZQx3fTZxhfSQeZmz54=";
1718
};
1819

1920
format = "shards";
@@ -23,18 +24,22 @@ crystal.buildCrystalPackage rec {
2324
# with mint's shard.lock file in the current directory
2425
shardsFile = ./shards.nix;
2526

27+
nativeBuildInputs = [
28+
libxml2 # xmllint
29+
];
30+
2631
buildInputs = [ openssl ];
2732

28-
preConfigure = ''
29-
export HOME=$(mktemp -d)
33+
preCheck = ''
34+
substituteInPlace spec/spec_helper.cr \
35+
--replace-fail "clear_env: true" "clear_env: false"
3036
'';
3137

32-
meta = with lib; {
38+
meta = {
3339
description = "Refreshing language for the front-end web";
3440
mainProgram = "mint";
3541
homepage = "https://www.mint-lang.com/";
36-
license = licenses.bsd3;
37-
maintainers = with maintainers; [ manveru ];
38-
broken = lib.versionOlder crystal.version "1.0";
42+
license = lib.licenses.bsd3;
43+
maintainers = with lib.maintainers; [ manveru ];
3944
};
4045
}

pkgs/development/compilers/mint/shards.nix renamed to pkgs/by-name/mi/mint/shards.nix

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@
66
};
77
ameba = {
88
url = "https://github.com/crystal-ameba/ameba.git";
9-
rev = "v1.5.0";
10-
sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d";
9+
rev = "v1.6.4";
10+
sha256 = "1kzr4ynd4r5w87y2czzrlir1dvqmv43ijm07804kgsy1g20k00fs";
1111
};
1212
ansi-escapes = {
1313
url = "https://github.com/gtramontina/ansi-escapes.cr.git";
1414
rev = "v1.0.0";
1515
sha256 = "106cy7bq0j438cfs0zqcxhj84msjj9dybxlcjr8qhs1fpm02s00b";
1616
};
17-
backtracer = {
18-
url = "https://github.com/sija/backtracer.cr.git";
19-
rev = "v1.2.2";
20-
sha256 = "1rknyylsi14m7i77x7c3138wdw27i4f6sd78m3srw851p47bwr20";
21-
};
2217
baked_file_system = {
2318
url = "https://github.com/schovi/baked_file_system.git";
2419
rev = "v0.10.0";
@@ -29,24 +24,9 @@
2924
rev = "v1.0.0";
3025
sha256 = "00pdawysns1w1iqwh6j3shilpwh41ljz1chsqkacn6dj2yn21n0r";
3126
};
32-
exception_page = {
33-
url = "https://github.com/crystal-loot/exception_page.git";
34-
rev = "v0.3.1";
35-
sha256 = "00fpkhwaf94mz9d9qiinsa7hdbs3x2yqjwwzvbjwv86dv8s5008n";
36-
};
37-
kemal = {
38-
url = "https://github.com/kemalcr/kemal.git";
39-
rev = "v1.4.0";
40-
sha256 = "0pmcnbfzb0bqrnwbqikci4j0hbxsabmkz8a879vprf5gswnr7b63";
41-
};
4227
markd = {
4328
url = "https://github.com/icyleaf/markd.git";
4429
rev = "v0.5.0";
4530
sha256 = "1a677z57kwjq6lp4ws7br1ga8jgpgi8990glhd1r8756bdyd8mg0";
4631
};
47-
radix = {
48-
url = "https://github.com/luislavena/radix.git";
49-
rev = "v0.4.1";
50-
sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg";
51-
};
5232
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6419,8 +6419,6 @@ with pkgs;
64196419
jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
64206420
};
64216421

6422-
mint = callPackage ../development/compilers/mint { crystal = crystal_1_9; };
6423-
64246422
mitscheme = callPackage ../development/compilers/mit-scheme {
64256423
texinfo = texinfo6;
64266424
};

0 commit comments

Comments
 (0)