diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/by-name/mi/mint/package.nix similarity index 60% rename from pkgs/development/compilers/mint/default.nix rename to pkgs/by-name/mi/mint/package.nix index 62e19008d468..68f827aa562c 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/by-name/mi/mint/package.nix @@ -2,18 +2,19 @@ lib, fetchFromGitHub, crystal, + libxml2, openssl, }: crystal.buildCrystalPackage rec { - version = "0.19.0"; pname = "mint"; + version = "0.22.0"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - hash = "sha256-s/ehv8Z71nWnxpajO7eR4MxoHppqkdleFluv+e5Vv6I="; + hash = "sha256-82Oi9UJ530rZNGa6XxC1hNvRfZQx3fTZxhfSQeZmz54="; }; format = "shards"; @@ -23,18 +24,22 @@ crystal.buildCrystalPackage rec { # with mint's shard.lock file in the current directory shardsFile = ./shards.nix; + nativeBuildInputs = [ + libxml2 # xmllint + ]; + buildInputs = [ openssl ]; - preConfigure = '' - export HOME=$(mktemp -d) + preCheck = '' + substituteInPlace spec/spec_helper.cr \ + --replace-fail "clear_env: true" "clear_env: false" ''; - meta = with lib; { + meta = { description = "Refreshing language for the front-end web"; mainProgram = "mint"; homepage = "https://www.mint-lang.com/"; - license = licenses.bsd3; - maintainers = with maintainers; [ manveru ]; - broken = lib.versionOlder crystal.version "1.0"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ manveru ]; }; } diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/by-name/mi/mint/shards.nix similarity index 55% rename from pkgs/development/compilers/mint/shards.nix rename to pkgs/by-name/mi/mint/shards.nix index 47cd9a779173..2579fbe3b23f 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/by-name/mi/mint/shards.nix @@ -6,19 +6,14 @@ }; ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.5.0"; - sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; + rev = "v1.6.4"; + sha256 = "1kzr4ynd4r5w87y2czzrlir1dvqmv43ijm07804kgsy1g20k00fs"; }; ansi-escapes = { url = "https://github.com/gtramontina/ansi-escapes.cr.git"; rev = "v1.0.0"; sha256 = "106cy7bq0j438cfs0zqcxhj84msjj9dybxlcjr8qhs1fpm02s00b"; }; - backtracer = { - url = "https://github.com/sija/backtracer.cr.git"; - rev = "v1.2.2"; - sha256 = "1rknyylsi14m7i77x7c3138wdw27i4f6sd78m3srw851p47bwr20"; - }; baked_file_system = { url = "https://github.com/schovi/baked_file_system.git"; rev = "v0.10.0"; @@ -29,24 +24,9 @@ rev = "v1.0.0"; sha256 = "00pdawysns1w1iqwh6j3shilpwh41ljz1chsqkacn6dj2yn21n0r"; }; - exception_page = { - url = "https://github.com/crystal-loot/exception_page.git"; - rev = "v0.3.1"; - sha256 = "00fpkhwaf94mz9d9qiinsa7hdbs3x2yqjwwzvbjwv86dv8s5008n"; - }; - kemal = { - url = "https://github.com/kemalcr/kemal.git"; - rev = "v1.4.0"; - sha256 = "0pmcnbfzb0bqrnwbqikci4j0hbxsabmkz8a879vprf5gswnr7b63"; - }; markd = { url = "https://github.com/icyleaf/markd.git"; rev = "v0.5.0"; sha256 = "1a677z57kwjq6lp4ws7br1ga8jgpgi8990glhd1r8756bdyd8mg0"; }; - radix = { - url = "https://github.com/luislavena/radix.git"; - rev = "v0.4.1"; - sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg"; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48fe1a18ad2e..84e92b4eab81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6419,8 +6419,6 @@ with pkgs; jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - mint = callPackage ../development/compilers/mint { crystal = crystal_1_9; }; - mitscheme = callPackage ../development/compilers/mit-scheme { texinfo = texinfo6; };