diff --git a/default.nix b/default.nix index 2ad819dd8..ecc822b00 100644 --- a/default.nix +++ b/default.nix @@ -46,30 +46,20 @@ mixRelease rec { fast_html = prev.fast_html.override { nativeBuildInputs = [ cmake ]; }; - ex_cldr = prev.ex_cldr.overrideAttrs (old: { - version = "2.37.1"; - preBuild = "touch config/prod.exs"; + ex_cldr = prev.ex_cldr.overrideAttrs (old: rec { + version = "2.37.2"; # We have to use the GitHub sources, as it otherwise tries to download # the locales at build time. src = fetchFromGitHub { - owner = "erictapen"; + owner = "elixir-cldr"; repo = "cldr"; - rev = "7b293aa9f27e58a5168bb134aad9309043b0f431"; - sha256 = "sha256-WJbj18TarCc4tEpvehFUbmeLaof7gmx+j5A0iJlpHRg="; + rev = "v${version}"; + sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4="; }; postInstall = '' cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/ ''; }); - ex_cldr_currencies = prev.ex_cldr_currencies.override { - preBuild = "touch config/prod.exs"; - }; - ex_cldr_numbers = prev.ex_cldr_numbers.override { - preBuild = "touch config/prod.exs"; - }; - ex_cldr_dates_times = prev.ex_cldr_dates_times.override { - preBuild = "touch config/prod.exs"; - }; # Upstream issue: https://github.com/bryanjos/geo_postgis/pull/87 geo_postgis = prev.geo_postgis.overrideAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.ecto ]; @@ -98,16 +88,6 @@ mixRelease rec { }; beamDeps = with final; [ mix_test_watch ex_doc timex ]; }; - erlport = buildRebar3 rec { - name = "erlport"; - version = "0.10.1-compat"; - src = fetchFromGitHub { - owner = "tcitworld"; - repo = name; - rev = "04bcfd732fa458735001328b44e8b3a1764316a5"; - sha256 = "sha256-VzGnhHeD5zC+HyUt41FJfLH7Q7I9fJzfcqxTv7uLKnI="; - }; - }; rajska = buildMix rec { name = "rajska"; version = "1.3.3";