Skip to content

Commit

Permalink
Workaround for png (#26)
Browse files Browse the repository at this point in the history 
* Workaround for png

Like grpcbox, png won't compile unless it is in a directory called
'png'.

See the grpcbox PR for more context: #22

* Fix missed copypasta

* update test deps and combine like overrides

---------

Co-authored-by: Elisha Hastings <tshakah@gmail.com>
  • Loading branch information
@ydlr @tshakah
ydlr and tshakah committed Feb 29, 2024
1 parent 4680e76 commit da2ebc2
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 40 deletions.
13 changes: 7 additions & 6 deletions lib/mix2nix.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ defmodule Mix2nix do
beamDeps = #{deps};
"""
<> hexpm_expression_extras(name, version)
<> hexpm_expression_extras(name)
<> " };\n"
end

Expand All @@ -154,19 +154,20 @@ defmodule Mix2nix do
"""
end

defp hexpm_expression_extras("grpcbox", version) do
@override_src_root ["grpcbox", "png"]
defp hexpm_expression_extras(pkg_name) when pkg_name in @override_src_root do
"""
unpackPhase = ''
runHook preUnpack
unpackFile "$src"
chmod -R u+w -- hex-source-grpcbox-#{version}
mv hex-source-grpcbox-#{version} grpcbox
sourceRoot=grpcbox
chmod -R u+w -- hex-source-#{pkg_name}-${version}
mv hex-source-#{pkg_name}-${version} #{pkg_name}
sourceRoot=#{pkg_name}
runHook postUnpack
'';
"""
end

defp hexpm_expression_extras(_, _), do: ""
defp hexpm_expression_extras(_), do: ""
end
18 changes: 9 additions & 9 deletions test/mix.lock
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
%{
"acceptor_pool": {:hex, :acceptor_pool, "1.0.0", "43c20d2acae35f0c2bcd64f9d2bde267e459f0f3fd23dab26485bf518c281b21", [:rebar3], [], "hexpm", "0cbcd83fdc8b9ad2eee2067ef8b91a14858a5883cb7cd800e6fcd5803e158788"},
"chatterbox": {:hex, :ts_chatterbox, "0.13.0", "6f059d97bcaa758b8ea6fffe2b3b81362bd06b639d3ea2bb088335511d691ebf", [:rebar3], [{:hpack, "~> 0.2.3", [hex: :hpack_erl, repo: "hexpm", optional: false]}], "hexpm", "b93d19104d86af0b3f2566c4cba2a57d2e06d103728246ba1ac6c3c0ff010aa7"},
"cowboy": {:hex, :cowboy, "2.9.0", "865dd8b6607e14cf03282e10e934023a1bd8be6f6bacf921a7e2a96d800cd452", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde"},
"cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
"chatterbox": {:hex, :ts_chatterbox, "0.15.1", "5cac4d15dd7ad61fc3c4415ce4826fc563d4643dee897a558ec4ea0b1c835c9c", [:rebar3], [{:hpack, "~> 0.3.0", [hex: :hpack_erl, repo: "hexpm", optional: false]}], "hexpm", "4f75b91451338bc0da5f52f3480fa6ef6e3a2aeecfc33686d6b3d0a0948f31aa"},
"cowboy": {:hex, :cowboy, "2.11.0", "356bf784599cf6f2cdc6ad12fdcfb8413c2d35dab58404cf000e1feaed3f5645", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "0fa395437f1b0e104e0e00999f39d2ac5f4082ac5049b67a5b6d56ecc31b1403"},
"cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
"ctx": {:hex, :ctx, "0.6.0", "8ff88b70e6400c4df90142e7f130625b82086077a45364a78d208ed3ed53c7fe", [:rebar3], [], "hexpm", "a14ed2d1b67723dbebbe423b28d7615eb0bdcba6ff28f2d1f1b0a7e1d4aa5fc2"},
"decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
"ecto": {:hex, :ecto, "3.9.4", "3ee68e25dbe0c36f980f1ba5dd41ee0d3eb0873bccae8aeaf1a2647242bffa35", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "de5f988c142a3aa4ec18b85a4ec34a2390b65b24f02385c1144252ff6ff8ee75"},
"gproc": {:hex, :gproc, "0.8.0", "cea02c578589c61e5341fce149ea36ccef236cc2ecac8691fba408e7ea77ec2f", [:rebar3], [], "hexpm", "580adafa56463b75263ef5a5df4c86af321f68694e7786cb057fd805d1e2a7de"},
"grpcbox": {:hex, :grpcbox, "0.16.0", "b83f37c62d6eeca347b77f9b1ec7e9f62231690cdfeb3a31be07cd4002ba9c82", [:rebar3], [{:acceptor_pool, "~> 1.0.0", [hex: :acceptor_pool, repo: "hexpm", optional: false]}, {:chatterbox, "~> 0.13.0", [hex: :ts_chatterbox, repo: "hexpm", optional: false]}, {:ctx, "~> 0.6.0", [hex: :ctx, repo: "hexpm", optional: false]}, {:gproc, "~> 0.8.0", [hex: :gproc, repo: "hexpm", optional: false]}], "hexpm", "294df743ae20a7e030889f00644001370a4f7ce0121f3bbdaf13cf3169c62913"},
"hpack": {:hex, :hpack_erl, "0.2.3", "17670f83ff984ae6cd74b1c456edde906d27ff013740ee4d9efaa4f1bf999633", [:rebar3], [], "hexpm", "06f580167c4b8b8a6429040df36cc93bba6d571faeaec1b28816523379cbb23a"},
"jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
"decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
"ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
"gproc": {:hex, :gproc, "0.9.1", "f1df0364423539cf0b80e8201c8b1839e229e5f9b3ccb944c5834626998f5b8c", [:rebar3], [], "hexpm", "905088e32e72127ed9466f0bac0d8e65704ca5e73ee5a62cb073c3117916d507"},
"grpcbox": {:hex, :grpcbox, "0.17.1", "6e040ab3ef16fe699ffb513b0ef8e2e896da7b18931a1ef817143037c454bcce", [:rebar3], [{:acceptor_pool, "~> 1.0.0", [hex: :acceptor_pool, repo: "hexpm", optional: false]}, {:chatterbox, "~> 0.15.1", [hex: :ts_chatterbox, repo: "hexpm", optional: false]}, {:ctx, "~> 0.6.0", [hex: :ctx, repo: "hexpm", optional: false]}, {:gproc, "~> 0.9.1", [hex: :gproc, repo: "hexpm", optional: false]}], "hexpm", "4a3b5d7111daabc569dc9cbd9b202a3237d81c80bf97212fbc676832cb0ceb17"},
"hpack": {:hex, :hpack_erl, "0.3.0", "2461899cc4ab6a0ef8e970c1661c5fc6a52d3c25580bc6dd204f84ce94669926", [:rebar3], [], "hexpm", "d6137d7079169d8c485c6962dfe261af5b9ef60fbc557344511c1e65e3d95fb0"},
"png": {:hex, :png, "0.2.1", "b25c17c8dcdc40096d46ae2d7c2777c63fede48fa8c8312cc708c88554049d3b", [:rebar3], [], "hexpm", "279345e07108c604871a21f1c91f716810ab559af2b20d6f302e0a98265ef72e"},
"ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
"telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
}
59 changes: 34 additions & 25 deletions test/result.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,38 @@ let

chatterbox = buildRebar3 rec {
name = "chatterbox";
version = "0.13.0";
version = "0.15.1";

src = fetchHex {
pkg = "ts_chatterbox";
version = "${version}";
sha256 = "b93d19104d86af0b3f2566c4cba2a57d2e06d103728246ba1ac6c3c0ff010aa7";
sha256 = "4f75b91451338bc0da5f52f3480fa6ef6e3a2aeecfc33686d6b3d0a0948f31aa";
};

beamDeps = [ hpack ];
};

cowboy = buildErlangMk rec {
name = "cowboy";
version = "2.9.0";
version = "2.11.0";

src = fetchHex {
pkg = "cowboy";
version = "${version}";
sha256 = "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde";
sha256 = "0fa395437f1b0e104e0e00999f39d2ac5f4082ac5049b67a5b6d56ecc31b1403";
};

beamDeps = [ cowlib ranch ];
};

cowlib = buildRebar3 rec {
name = "cowlib";
version = "2.11.0";
version = "2.12.1";

src = fetchHex {
pkg = "cowlib";
version = "${version}";
sha256 = "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9";
sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0";
};

beamDeps = [];
Expand All @@ -75,89 +75,98 @@ let

decimal = buildMix rec {
name = "decimal";
version = "2.0.0";
version = "2.1.1";

src = fetchHex {
pkg = "decimal";
version = "${version}";
sha256 = "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577";
sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc";
};

beamDeps = [];
};

ecto = buildMix rec {
name = "ecto";
version = "3.9.4";
version = "3.11.1";

src = fetchHex {
pkg = "ecto";
version = "${version}";
sha256 = "de5f988c142a3aa4ec18b85a4ec34a2390b65b24f02385c1144252ff6ff8ee75";
sha256 = "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b";
};

beamDeps = [ decimal jason telemetry ];
beamDeps = [ decimal telemetry ];
};

gproc = buildRebar3 rec {
name = "gproc";
version = "0.8.0";
version = "0.9.1";

src = fetchHex {
pkg = "gproc";
version = "${version}";
sha256 = "580adafa56463b75263ef5a5df4c86af321f68694e7786cb057fd805d1e2a7de";
sha256 = "905088e32e72127ed9466f0bac0d8e65704ca5e73ee5a62cb073c3117916d507";
};

beamDeps = [];
};

grpcbox = buildRebar3 rec {
name = "grpcbox";
version = "0.16.0";
version = "0.17.1";

src = fetchHex {
pkg = "grpcbox";
version = "${version}";
sha256 = "294df743ae20a7e030889f00644001370a4f7ce0121f3bbdaf13cf3169c62913";
sha256 = "4a3b5d7111daabc569dc9cbd9b202a3237d81c80bf97212fbc676832cb0ceb17";
};

beamDeps = [ acceptor_pool chatterbox ctx gproc ];

unpackPhase = ''
runHook preUnpack
unpackFile "$src"
chmod -R u+w -- hex-source-grpcbox-0.16.0
mv hex-source-grpcbox-0.16.0 grpcbox
chmod -R u+w -- hex-source-grpcbox-${version}
mv hex-source-grpcbox-${version} grpcbox
sourceRoot=grpcbox
runHook postUnpack
'';
};

hpack = buildRebar3 rec {
name = "hpack";
version = "0.2.3";
version = "0.3.0";

src = fetchHex {
pkg = "hpack_erl";
version = "${version}";
sha256 = "06f580167c4b8b8a6429040df36cc93bba6d571faeaec1b28816523379cbb23a";
sha256 = "d6137d7079169d8c485c6962dfe261af5b9ef60fbc557344511c1e65e3d95fb0";
};

beamDeps = [];
};

jason = buildMix rec {
name = "jason";
version = "1.4.0";
png = buildRebar3 rec {
name = "png";
version = "0.2.1";

src = fetchHex {
pkg = "jason";
pkg = "png";
version = "${version}";
sha256 = "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121";
sha256 = "279345e07108c604871a21f1c91f716810ab559af2b20d6f302e0a98265ef72e";
};

beamDeps = [ decimal ];
beamDeps = [];

unpackPhase = ''
runHook preUnpack
unpackFile "$src"
chmod -R u+w -- hex-source-png-${version}
mv hex-source-png-${version} png
sourceRoot=png
runHook postUnpack
'';
};

ranch = buildRebar3 rec {
Expand Down

0 comments on commit da2ebc2

Please sign in to comment.