potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

use upsream ex_cldr, remove some outdated overrides

Browse source
This commit is contained in:
778a69cd 2023-09-08 13:32:47 +02:00
parent 45b63be9f3
commit 5b910788b1
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
default.nix
View file

@ -46,30 +46,20 @@ mixRelease rec {
fast_html = prev.fast_html.override { fast_html = prev.fast_html.override {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
}; };
ex_cldr = prev.ex_cldr.overrideAttrs (old: { ex_cldr = prev.ex_cldr.overrideAttrs (old: rec {
version = "2.37.1"; version = "2.37.2";
preBuild = "touch config/prod.exs";
# We have to use the GitHub sources, as it otherwise tries to download # We have to use the GitHub sources, as it otherwise tries to download
# the locales at build time. # the locales at build time.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erictapen"; owner = "elixir-cldr";
repo = "cldr"; repo = "cldr";
rev = "7b293aa9f27e58a5168bb134aad9309043b0f431"; rev = "v${version}";
sha256 = "sha256-WJbj18TarCc4tEpvehFUbmeLaof7gmx+j5A0iJlpHRg="; sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4=";
}; };
postInstall = '' postInstall = ''
cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/ 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 # Upstream issue: https://github.com/bryanjos/geo_postgis/pull/87
geo_postgis = prev.geo_postgis.overrideAttrs (old: { geo_postgis = prev.geo_postgis.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.ecto ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.ecto ];
@ -98,16 +88,6 @@ mixRelease rec {
}; };
beamDeps = with final; [ mix_test_watch ex_doc timex ]; 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 { rajska = buildMix rec {
name = "rajska"; name = "rajska";
version = "1.3.3"; version = "1.3.3";