Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
Ellie Hermaszewska
commit
7c0dcba282
73 changed files with 448 additions and 1340 deletions
|
|
@ -1197,6 +1197,12 @@
|
|||
email = "sivaraman.balaji@gmail.com";
|
||||
name = "Balaji Sivaraman";
|
||||
};
|
||||
balodja = {
|
||||
email = "balodja@gmail.com";
|
||||
github = "balodja";
|
||||
githubId = 294444;
|
||||
name = "Vladimir Korolev";
|
||||
};
|
||||
baloo = {
|
||||
email = "nixpkgs@superbaloo.net";
|
||||
github = "baloo";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in
|
|||
};
|
||||
|
||||
config = mkOption {
|
||||
type = types.attrs;
|
||||
type = with types; attrsOf (attrsOf anything);
|
||||
default = { };
|
||||
example = {
|
||||
init.defaultBranch = "main";
|
||||
|
|
|
|||
|
|
@ -152,6 +152,8 @@ in
|
|||
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}'
|
||||
'' + optionalString cfg.settings.incomplete-dir-enabled ''
|
||||
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}'
|
||||
'' + optionalString cfg.settings.watch-dir-enabled ''
|
||||
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}'
|
||||
'';
|
||||
|
||||
assertions = [
|
||||
|
|
|
|||
|
|
@ -144,6 +144,8 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
caddy.enable = mkEnableOption "Whether to enablle caddy reverse proxy to expose jitsi-meet";
|
||||
|
||||
prosody.enable = mkOption {
|
||||
type = bool;
|
||||
default = true;
|
||||
|
|
@ -322,6 +324,42 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
services.caddy = mkIf cfg.caddy.enable {
|
||||
enable = mkDefault true;
|
||||
virtualHosts.${cfg.hostName} = {
|
||||
extraConfig =
|
||||
let
|
||||
templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" {} ''
|
||||
cp -R ${pkgs.jitsi-meet}/* .
|
||||
for file in *.html **/*.html ; do
|
||||
${pkgs.sd}/bin/sd '<!--#include virtual="(.*)" -->' '{{ include "$1" }}' $file
|
||||
done
|
||||
rm config.js
|
||||
rm interface_config.js
|
||||
cp -R . $out
|
||||
cp ${overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig} $out/config.js
|
||||
cp ${overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""} $out/interface_config.js
|
||||
cp ./libs/external_api.min.js $out/external_api.js
|
||||
'';
|
||||
in ''
|
||||
handle /http-bind {
|
||||
header Host ${cfg.hostName}
|
||||
reverse_proxy 127.0.0.1:5280
|
||||
}
|
||||
handle /xmpp-websocket {
|
||||
reverse_proxy 127.0.0.1:5280
|
||||
}
|
||||
handle {
|
||||
templates
|
||||
root * ${templatedJitsiMeet}
|
||||
try_files {path} {path}
|
||||
try_files {path} /index.html
|
||||
file_server
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.jitsi-videobridge = mkIf cfg.videobridge.enable {
|
||||
enable = true;
|
||||
xmppConfigs."localhost" = {
|
||||
|
|
|
|||
|
|
@ -383,5 +383,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
docker.succeed(
|
||||
"tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null"
|
||||
)
|
||||
|
||||
with subtest("Ensure bare paths in contents are loaded correctly"):
|
||||
docker.succeed(
|
||||
"docker load --input='${examples.build-image-with-path}'",
|
||||
"docker run --rm build-image-with-path bash -c '[[ -e /hello.txt ]]'",
|
||||
"docker rmi build-image-with-path",
|
||||
)
|
||||
docker.succeed(
|
||||
"${examples.layered-image-with-path} | docker load",
|
||||
"docker run --rm layered-image-with-path bash -c '[[ -e /hello.txt ]]'",
|
||||
"docker rmi layered-image-with-path",
|
||||
)
|
||||
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.2.2"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.2.3"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "6FQd7UGX19Ez/updybia/tzl+9GYyPPzPGFsV67Enq0=";
|
||||
sha256 = "0xu/uMMloCUuhKs392kn6qJzlobDNuvwlHGdS/gGAB8=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
dontFixup = true;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "VHOIK6sOAP+O9HicUiE2avLcppRzocPUf1XIcyuGw30=";
|
||||
outputHash = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }:
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_13 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.3.5";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "ruJALAI0YQNwG8An5VzoJX06Qu/pXZ9zsrPZ7EH+5Pk=";
|
||||
sha256 = "BEDScQtGfkp74Gx3RKK8ItNQ9JD8AJkl1zdS/gZqyXk=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
makeWrapper ${electron_13}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ symlinkJoin {
|
|||
description = "An open-source Modelica-based modeling and simulation environment intended for industrial and academic usage";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ stdenv.mkDerivation (pkg // {
|
|||
inherit omtarget postPatch preAutoreconf configureFlags configurePhase preBuild makeFlags installFlags;
|
||||
|
||||
src = fetchgit (import ./src-main.nix);
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg
|
||||
++ [ autoconf automake libtool cmake autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
url = "https://github.com/OpenModelica/OpenModelica/";
|
||||
rev = "08fd3f9144235f209a4ed7602bfadb32b1823628";
|
||||
sha256 = "0clgqk9ilnr43iyl5sdzwfzqpnw9amfy1npdgkpgm1wfnsvz6xrw";
|
||||
rev = "49be4faa5a625a18efbbd74cc2f5be86aeea37bb";
|
||||
sha256 = "0klqiy4sdizl1djb9hb0arcvfcjz2mmnakrjx81mmxcbr8yq2016";
|
||||
fetchSubmodules = true;
|
||||
}
|
||||
# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.17.0' --fetch-submodules
|
||||
# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.18.0' --fetch-submodules
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ mkOpenModelicaDerivation ({
|
|||
description = "Modelica compiler from OpenModelica suite";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // lib.optionalAttrs isCross {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ mkOpenModelicaDerivation rec {
|
|||
description = "A Modelica connection editor for OpenModelica";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ mkOpenModelicaDerivation {
|
|||
including Modelica Standard Library";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,83 +1,81 @@
|
|||
[
|
||||
{ url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "b00e01d911e2e54e148f24e36ee387a8b457d89c"; sha256 = "1sljddxkx208nill0975sz9b1xd701n97aia4wxihr140dgs4dgb"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "c2f564ae284726a2df6252a8561856691681572b"; sha256 = "01c2i2rlry7b4a6f2skkvzphcrfg5a2waxv4i7zgx5q275fg06i1"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "1e07bb475b921a4eedc6155c5310d1f9f3ef7550"; sha256 = "1xg831vqh6zw88cxxcb3sjgz44l7ygsgxddl05fp6xvz5sjpfcna"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; }
|
||||
# A broken one. The revision is lost.
|
||||
# { url = "https://github.com/AHaumer/EMOTH.git"; rev = "fa890c8c2781f0c0b2f8efe955ed8a27875dd9ac"; sha256 = ""; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "159518edd538b64e28cd70983a9cc47730323cc4"; sha256 = "0qjd5fk65bln3s1jhs0cqcv54c22m6x2akbmxj09y4x0lkd1kgqn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "614a148f61c1ab5d6788d8c11197803132ec7c2f"; sha256 = "0fg0pbahybx3srv5npk8pw49k23kaw2ns6c00f15iy93mvfrmfsk"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "34fe8cf3c7127ae09ca5f41e26b48fb6044e1e34"; sha256 = "0yz82k9dsp9d1jxqgxcm27fw1jz718km43qfginmgg0m9kfh2336"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lochel/PNlib.git"; rev = "ab9b6b8527c0c78140365e7b105ae469d4954a64"; sha256 = "0y7bfbnvzv9bnz4v8wvmy42dji3cqpy5b2fmd2jj0rhlzs1infzh"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/PowerSystems.git"; rev = "7369976265a9d7b62097340aba5e463c62cc5061"; sha256 = "1f0h148v2g057l6ixf646d8ymsx1jzqn14xlram8h62la2k6nmvw"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "d80fc335d1fa5d1628c45c2e73204bcb8a614b21"; sha256 = "18d8cqlh0ic2yfcxzkz0ar9z19486z9x4sc7c9mpggxib28p39aa"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/casella/ThermoPower.git"; rev = "82d21eba0d330005899dd50a6a0ceb7d09c4caeb"; sha256 = "0n83b40hjisy7lpnbz692947d2q3hw5hk4rak7fg0w5dbm4i719p"; fetchSubmodules = true; }
|
||||
{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; }
|
||||
{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "65e49ddf5c935846888a61aa303e52c909619079"; sha256 = "18xn8j3x3j4x9bpjgqnq0b6p3yzzsg5n62fv1ldqbbjcmi0vimd5"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "834fb3519ca8f89efe268582d39d00a7c3991150"; sha256 = "1iwqh4kr36wgxc0gci63gdgbqln2sap1w4bkydk1vkss2s302lg4"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "c3070d48015ee75c1577f349cb388a498bef7270"; sha256 = "0r876wm6f1xx4cli1lqlylpl3zgaddmy06hcafbnzry9j38vbz4y"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "6138312c96142ff3c01190147e6277991bfa2fca"; sha256 = "1d9g2hbdvgz13j7kdi1kglkkllj9f00x3dwdp5piyypvs464jsn5"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "4a91d52248b0f17415bba1d58881fc730bd94215"; sha256 = "19caxz6hvlrsls3b2387a24zwwnykbb138jpb42gwpy8jlh93yzi"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "cab27240a4a3ed4ea137226f056bbc0d79543f7a"; sha256 = "06y911i2hs7hg4ykhb8wngvxhwnaww8rsakwa7ssd047a7glzsb0"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lochel/PNlib.git"; rev = "059545d48dd9ceeccfa3b4e47689ec8dd334dcd8"; sha256 = "1a0hxkgsi4klw9c8zav1dy2p1c85ald29gx82hfacwv55xl9f127"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/PowerSystems.git"; rev = "f0721333f4875143565147a7d043bee1c300873b"; sha256 = "0gbvx0gzf3akb0w7yvdxfq2y4ps91cy5b93iwnvnw7652x716813"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "203fb5af3b95c731c7fcbe2833d51fd420e80796"; sha256 = "1bh4y4igzd0k59xm8j14p52gnlbwkiwwy6bhhyarpr361yrchn33"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/casella/ThermoPower.git"; rev = "650be2c8cbd5abc3535e92b865e509073afc8aeb"; sha256 = "08ijrx8xw43dadz5s3kiwa17ax9faq2wyq9gm0vlz9ddbkj0hcaq"; fetchSubmodules = true; }
|
||||
{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; }
|
||||
{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; }
|
||||
{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; }
|
||||
]
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ mkOpenModelicaDerivation rec {
|
|||
suite";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ mkOpenModelicaDerivation rec {
|
|||
description = "Plotting tool for OpenModelica-generated results files";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ mkOpenModelicaDerivation rec {
|
|||
description = "Interactive OpenModelica session shell";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ mkOpenModelicaDerivation rec {
|
|||
description = "The OpenModelica FMI & SSP-based co-simulation environment";
|
||||
homepage = "https://openmodelica.org";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
maintainers = with maintainers; [ balodja smironov ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pijul";
|
||||
version = "1.0.0-alpha.53";
|
||||
version = "1.0.0-alpha.54";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "1y5wnqscyfhd806qs6gfmssm7hvfdi7mxc9p1125jnmzca4wcsm2";
|
||||
sha256 = "0b9494kwchfds8hk566k3fkwdvcskpgw0ajlrdry9lmmvx3vj7dc";
|
||||
};
|
||||
|
||||
cargoSha256 = "0m9zjagq59rxf5pysklal030f4n0dqgmjsgwcnljajxc2r26665h";
|
||||
cargoSha256 = "0rgd6mfxbxgzpj2nj2y315kgvxiayr9xbma4j014bc61ms7cnys7";
|
||||
|
||||
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "317a9636587182280debc85d483f6d21987ceb6cd96ab36a2399836780eca822";
|
||||
sha256 = "a20978538ae9a51bdbe5ef5aa0f87ede0f8efd2817ab240980de56eac36982e3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloud-hypervisor";
|
||||
version = "18.0";
|
||||
version = "19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-hypervisor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0k9gclkba2bhmyqhyigjgfgcnqpg16v3yczhh08ljxmbrsbs02ig";
|
||||
sha256 = "0h3varacv9696mih8zrz3fp6xa8hxxvwzkrslhpf9ilcjs1bjihd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
|
||||
|
||||
cargoSha256 = "086ldzb1rbbrzjbklay4nvhc18ipyxi9gnp56f06393zvfbhc5dl";
|
||||
cargoSha256 = "015r9m9fr634ppn4qy0b8w1khjlxsv3wbpf3s7crmklzy57wakxl";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@
|
|||
|
||||
let
|
||||
|
||||
inherit (lib)
|
||||
escapeShellArgs
|
||||
toList
|
||||
;
|
||||
|
||||
mkDbExtraCommand = contents:
|
||||
let
|
||||
contentsList = if builtins.isList contents then contents else [ contents ];
|
||||
|
|
@ -402,7 +407,7 @@ rec {
|
|||
|
||||
preMount = lib.optionalString (contents != null && contents != [ ]) ''
|
||||
echo "Adding contents..."
|
||||
for item in ${toString contents}; do
|
||||
for item in ${escapeShellArgs (map (c: "${c}") (toList contents))}; do
|
||||
echo "Adding $item..."
|
||||
rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/
|
||||
done
|
||||
|
|
|
|||
|
|
@ -553,4 +553,16 @@ rec {
|
|||
|
||||
# Example export of the bash image
|
||||
exportBash = pkgs.dockerTools.exportImage { fromImage = bash; };
|
||||
|
||||
build-image-with-path = buildImage {
|
||||
name = "build-image-with-path";
|
||||
tag = "latest";
|
||||
contents = [ pkgs.bashInteractive ./test-dummy ];
|
||||
};
|
||||
|
||||
layered-image-with-path = pkgs.dockerTools.streamLayeredImage {
|
||||
name = "layered-image-with-path";
|
||||
tag = "latest";
|
||||
contents = [ pkgs.bashInteractive ./test-dummy ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terminology";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz";
|
||||
sha256 = "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs data/colorschemes/*.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Powerful terminal emulator based on EFL";
|
||||
homepage = "https://www.enlightenment.org/about-terminology";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,291 +0,0 @@
|
|||
diff --git a/mx.py b/mx.py
|
||||
index a0b9315..b7d67a0 100755
|
||||
--- a/mx.py
|
||||
+++ b/mx.py
|
||||
@@ -238,21 +238,7 @@ def _check_file_with_sha1(path, sha1, sha1path, mustExist=True, newFile=False, l
|
||||
f.write(value or sha1OfFile(path))
|
||||
|
||||
if exists(path):
|
||||
- if sha1Check and sha1:
|
||||
- if not _sha1CachedValid() or (newFile and sha1 != _sha1Cached()):
|
||||
- logv('Create/update SHA1 cache file ' + sha1path)
|
||||
- _writeSha1Cached()
|
||||
-
|
||||
- if sha1 != _sha1Cached():
|
||||
- computedSha1 = sha1OfFile(path)
|
||||
- if sha1 == computedSha1:
|
||||
- warn('Fixing corrupt SHA1 cache file ' + sha1path)
|
||||
- _writeSha1Cached(computedSha1)
|
||||
- return True
|
||||
- if logErrors:
|
||||
- size = os.path.getsize(path)
|
||||
- log_error('SHA1 of {} [size: {}] ({}) does not match expected value ({})'.format(TimeStampFile(path), size, computedSha1, sha1))
|
||||
- return False
|
||||
+ return True
|
||||
elif mustExist:
|
||||
if logErrors:
|
||||
log_error("'{}' does not exist".format(path))
|
||||
@@ -1057,46 +1043,8 @@ class SuiteImport:
|
||||
version = import_dict.get("version")
|
||||
suite_dir = None
|
||||
version_from = import_dict.get("versionFrom")
|
||||
- if version_from and version:
|
||||
- abort("In import for '{}': 'version' and 'versionFrom' can not be both set".format(name), context=context)
|
||||
- if version is None and version_from is None:
|
||||
- if not (in_subdir and (importer.vc_dir != importer.dir or isinstance(importer, BinarySuite))):
|
||||
- abort("In import for '{}': No version given and not a 'subdir' suite of the same repository".format(name), context=context)
|
||||
- if importer.isSourceSuite():
|
||||
- suite_dir = join(importer.vc_dir, name)
|
||||
- version = importer.version()
|
||||
- if urls is None:
|
||||
- if not in_subdir:
|
||||
- if import_dict.get("subdir") is None and importer.vc_dir != importer.dir:
|
||||
- warn("In import for '{}': No urls given but 'subdir' is not set, assuming 'subdir=True'".format(name), context)
|
||||
- in_subdir = True
|
||||
- else:
|
||||
- abort("In import for '{}': No urls given and not a 'subdir' suite".format(name), context=context)
|
||||
- return SuiteImport(name, version, None, None, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
|
||||
- # urls a list of alternatives defined as dicts
|
||||
- if not isinstance(urls, list):
|
||||
- abort('suite import urls must be a list', context=context)
|
||||
- urlinfos = []
|
||||
- mainKind = None
|
||||
- for urlinfo in urls:
|
||||
- if isinstance(urlinfo, dict) and urlinfo.get('url') and urlinfo.get('kind'):
|
||||
- kind = urlinfo.get('kind')
|
||||
- if not VC.is_valid_kind(kind):
|
||||
- abort('suite import kind ' + kind + ' illegal', context=context)
|
||||
- else:
|
||||
- abort('suite import url must be a dict with {"url", kind", attributes', context=context)
|
||||
- vc = vc_system(kind)
|
||||
- if kind != 'binary':
|
||||
- assert not mainKind or mainKind == kind, "Only expecting one non-binary kind"
|
||||
- mainKind = kind
|
||||
- url = mx_urlrewrites.rewriteurl(urlinfo.get('url'))
|
||||
- urlinfos.append(SuiteImportURLInfo(url, kind, vc))
|
||||
- vc_kind = None
|
||||
- if mainKind:
|
||||
- vc_kind = mainKind
|
||||
- elif urlinfos:
|
||||
- vc_kind = 'binary'
|
||||
- return SuiteImport(name, version, urlinfos, vc_kind, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
|
||||
+ suite_dir = join(get_env('MX_GIT_CACHE_DIR'), name)
|
||||
+ return SuiteImport(name, version, [], None, True, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
|
||||
|
||||
@staticmethod
|
||||
def get_source_urls(source, kind=None):
|
||||
@@ -1467,8 +1415,6 @@ class Suite(object):
|
||||
:type dists: list[Distribution]
|
||||
"""
|
||||
def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False):
|
||||
- if primary is True and vc_dir is None:
|
||||
- abort("The primary suite must be in a vcs repository")
|
||||
self.imported_by = [] if primary else [importing_suite]
|
||||
self.mxDir = mxDir
|
||||
self.dir = dirname(mxDir)
|
||||
@@ -1496,7 +1442,7 @@ class Suite(object):
|
||||
self._outputRoot = None
|
||||
self._preloaded_suite_dict = None
|
||||
self.vc = vc
|
||||
- self.vc_dir = vc_dir
|
||||
+ self.vc_dir = get_env('MX_GIT_CACHE_DIR')
|
||||
self._preload_suite_dict()
|
||||
self._init_imports()
|
||||
if load:
|
||||
@@ -2405,7 +2351,9 @@ class Repository(SuiteConstituent):
|
||||
class SourceSuite(Suite):
|
||||
"""A source suite"""
|
||||
def __init__(self, mxDir, primary=False, load=True, internal=False, importing_suite=None, dynamicallyImported=False):
|
||||
- vc, vc_dir = VC.get_vc_root(dirname(mxDir), abortOnError=False)
|
||||
+ vc, vc_dir_test = VC.get_vc_root(dirname(mxDir), abortOnError=False)
|
||||
+ vc_dir = get_env('MX_GIT_CACHE_DIR')
|
||||
+ warn("LOOKING FOR: " + mxDir)
|
||||
Suite.__init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=dynamicallyImported)
|
||||
logvv("SourceSuite.__init__({}), got vc={}, vc_dir={}".format(mxDir, self.vc, self.vc_dir))
|
||||
self.projects = []
|
||||
@@ -2454,17 +2402,7 @@ class SourceSuite(Suite):
|
||||
"""
|
||||
Gets the release tag from VC or create a time based once if VC is unavailable
|
||||
"""
|
||||
- if snapshotSuffix not in self._releaseVersion:
|
||||
- _version = self._get_early_suite_dict_property('version')
|
||||
- if _version and self.getMxCompatibility().addVersionSuffixToExplicitVersion():
|
||||
- if not self.is_release():
|
||||
- _version = _version + '-' + snapshotSuffix
|
||||
- if not _version:
|
||||
- _version = self.vc.release_version_from_tags(self.vc_dir, self.name, snapshotSuffix=snapshotSuffix)
|
||||
- if not _version:
|
||||
- _version = 'unknown-{0}-{1}'.format(platform.node(), time.strftime('%Y-%m-%d_%H-%M-%S_%Z'))
|
||||
- self._releaseVersion[snapshotSuffix] = _version
|
||||
- return self._releaseVersion[snapshotSuffix]
|
||||
+ return get_env('version')
|
||||
|
||||
def scm_metadata(self, abortOnError=False):
|
||||
scm = self.scm
|
||||
@@ -2993,12 +2931,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load=
|
||||
Attempts to locate an existing suite in the local context
|
||||
Returns the path to the mx.name dir if found else None
|
||||
"""
|
||||
- if mode == 'binary':
|
||||
- # binary suites are always stored relative to the importing suite in mx-private directory
|
||||
- return importing_suite._find_binary_suite_dir(suite_import.name)
|
||||
+ warn("FAKE CLONE: " + str(suite_import))
|
||||
+ if (suite_import.name == "truffle"):
|
||||
+ return join(get_env('TMP'), "source", "truffle", "mx.truffle")
|
||||
+ if (suite_import.name == "graal-nodejs"):
|
||||
+ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs")
|
||||
+ if (suite_import.name == "truffleruby"):
|
||||
+ return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby")
|
||||
+ if (suite_import.name == "graalpython"):
|
||||
+ return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython")
|
||||
+ if (suite_import.name == "vm"):
|
||||
+ return join(get_env('TMP'), "source", "vm", "mx.vm")
|
||||
+ if (suite_import.name == "fastr"):
|
||||
+ return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr")
|
||||
+ if (suite_import.name == "sdk"):
|
||||
+ return join(get_env('TMP'), "source", "sdk", "mx.sdk")
|
||||
+ if (suite_import.name == "graal-js"):
|
||||
+ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js")
|
||||
+ if (suite_import.name == "regex"):
|
||||
+ return join(get_env('TMP'), "source", "regex", "mx.regex")
|
||||
+ if (suite_import.name == "substratevm"):
|
||||
+ return join(get_env('TMP'), "source", "substratevm", "mx.substratevm")
|
||||
+ if (suite_import.name == "tools"):
|
||||
+ return join(get_env('TMP'), "source", "tools", "mx.tools")
|
||||
+ if (suite_import.name == "sulong"):
|
||||
+ return join(get_env('TMP'), "source", "sulong", "mx.sulong")
|
||||
+ if (suite_import.name == "compiler"):
|
||||
+ return join(get_env('TMP'), "source", "compiler", "mx.compiler")
|
||||
else:
|
||||
- # use the SuiteModel to locate a local source copy of the suite
|
||||
- return _suitemodel.find_suite_dir(suite_import)
|
||||
+ return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name)
|
||||
|
||||
def _get_import_dir(url, mode):
|
||||
"""Return directory where the suite will be cloned to"""
|
||||
@@ -3816,7 +3777,7 @@ def getmtime(name):
|
||||
"""
|
||||
Wrapper for builtin open function that handles long path names on Windows.
|
||||
"""
|
||||
- return os.path.getmtime(_safe_path(name))
|
||||
+ return 315532800
|
||||
|
||||
|
||||
def stat(name):
|
||||
@@ -4062,57 +4023,8 @@ def _attempt_download(url, path, jarEntryName=None):
|
||||
return False
|
||||
|
||||
def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
|
||||
- """
|
||||
- Attempts to downloads content for each URL in a list, stopping after the first successful download.
|
||||
- If the content cannot be retrieved from any URL, the program is aborted, unless abortOnError=False.
|
||||
- The downloaded content is written to the file indicated by `path`.
|
||||
- """
|
||||
- if not verifyOnly:
|
||||
- ensure_dirname_exists(path)
|
||||
- assert not path.endswith(os.sep)
|
||||
-
|
||||
- # https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html
|
||||
- jarURLPattern = re.compile('jar:(.*)!/(.*)')
|
||||
- verify_errors = {}
|
||||
- for url in urls:
|
||||
- if not verifyOnly or verbose:
|
||||
- log('Downloading ' + url + ' to ' + path)
|
||||
- m = jarURLPattern.match(url)
|
||||
- jarEntryName = None
|
||||
- if m:
|
||||
- url = m.group(1)
|
||||
- jarEntryName = m.group(2)
|
||||
-
|
||||
- if not _opts.trust_http and (url.lower().startswith('http://') or url.lower().startswith('ftp://')):
|
||||
- warn('Downloading from non-https URL {}. Use --trust-http mx option to suppress this warning.'.format(url))
|
||||
-
|
||||
- if verifyOnly:
|
||||
- try:
|
||||
- conn = _urlopen(url, timeout=10)
|
||||
- conn.close()
|
||||
- except (IOError, socket.timeout) as e:
|
||||
- _suggest_tlsv1_error(e)
|
||||
- verify_errors[url] = e
|
||||
- else:
|
||||
- for i in range(4):
|
||||
- if i != 0:
|
||||
- time.sleep(1)
|
||||
- warn('Retry {} to download from {}'.format(i, url))
|
||||
- if _attempt_download(url, path, jarEntryName):
|
||||
- return True # Download was successful
|
||||
-
|
||||
- if verifyOnly and len(verify_errors) < len(urls): # verify-mode at least one success -> success
|
||||
- return True
|
||||
- else: # Either verification error or no download was successful
|
||||
- msg = 'Could not download to ' + path + ' from any of the following URLs: ' + ', '.join(urls)
|
||||
- if verifyOnly: # verify-mode -> print error details
|
||||
- for url, e in verify_errors.items():
|
||||
- msg += '\n ' + url + ': ' + str(e)
|
||||
- if abortOnError:
|
||||
- abort(msg)
|
||||
- else:
|
||||
- warn(msg)
|
||||
- return False
|
||||
+ print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
|
||||
+ return True
|
||||
|
||||
def update_file(path, content, showDiff=False):
|
||||
"""
|
||||
@@ -7887,30 +7799,6 @@ class PackedResourceLibrary(ResourceLibrary):
|
||||
|
||||
def get_path(self, resolve):
|
||||
extract_path = _make_absolute(self.extract_path, self.suite.dir)
|
||||
- download_path = super(PackedResourceLibrary, self).get_path(resolve)
|
||||
- if resolve and self._check_extract_needed(extract_path, download_path):
|
||||
- extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path))
|
||||
- try:
|
||||
- # extract archive
|
||||
- Extractor.create(download_path).extract(extract_path_tmp)
|
||||
- # ensure modification time is up to date
|
||||
- os.utime(extract_path_tmp, None)
|
||||
- logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path))
|
||||
- try:
|
||||
- # attempt atomic overwrite
|
||||
- os.rename(extract_path_tmp, extract_path)
|
||||
- except OSError:
|
||||
- # clean destination & re-try for cases where atomic overwrite doesn't work
|
||||
- rmtree(extract_path, ignore_errors=True)
|
||||
- os.rename(extract_path_tmp, extract_path)
|
||||
- except OSError as ose:
|
||||
- # Rename failed. Race with other process?
|
||||
- if self._check_extract_needed(extract_path, download_path):
|
||||
- # ok something really went wrong
|
||||
- abort("Extracting {} failed!".format(download_path), context=ose)
|
||||
- finally:
|
||||
- rmtree(extract_path_tmp, ignore_errors=True)
|
||||
-
|
||||
return extract_path
|
||||
|
||||
def _check_download_needed(self):
|
||||
@@ -8430,7 +8318,7 @@ class VC(_with_metaclass(ABCMeta, object)):
|
||||
:param str branch: a branch name
|
||||
:param bool abortOnError: if True abort on error
|
||||
"""
|
||||
- abort(self.kind + " update_to_branch is not implemented")
|
||||
+ self.run(['hg', vcdir] + cmd)
|
||||
|
||||
def is_release_from_tags(self, vcdir, prefix):
|
||||
"""
|
||||
@@ -8831,7 +8719,7 @@ class HgConfig(VC):
|
||||
return None
|
||||
|
||||
def parent_info(self, vcdir, abortOnError=True):
|
||||
- out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError)
|
||||
+ out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"])
|
||||
author, date = out.split("|||")
|
||||
ts, _ = date.split(" ")
|
||||
return self._sanitize_parent_info({
|
||||
@@ -14069,6 +13957,7 @@ class Archiver(SafeFileCreation):
|
||||
|
||||
def _add_zip(self, filename, archive_name, provenance):
|
||||
self._add_provenance(archive_name, provenance)
|
||||
+ os.utime(filename, (315532800, 315532800))
|
||||
self.zf.write(filename, archive_name)
|
||||
|
||||
def _add_str_zip(self, data, archive_name, provenance):
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
|
||||
index 16b869354d8..3691739d13b 100644
|
||||
--- a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
|
||||
+++ b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
|
||||
@@ -41,11 +41,3 @@ int sigsetjmp(sigjmp_buf env, int savesigs) {
|
||||
WARN_UNSUPPORTED(sigsetjmp);
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
-void longjmp(jmp_buf env, int val) {
|
||||
- ERR_UNSUPPORTED(longjmp);
|
||||
-}
|
||||
-
|
||||
-void siglongjmp(sigjmp_buf env, int val) {
|
||||
- ERR_UNSUPPORTED(siglongjmp);
|
||||
-}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
|
||||
index 8889c5ad810..add211a45c5 100644
|
||||
--- a/truffle/mx.truffle/mx_truffle.py
|
||||
+++ b/truffle/mx.truffle/mx_truffle.py
|
||||
@@ -695,6 +695,7 @@ class LibffiBuildTask(mx.AbstractNativeBuildTask):
|
||||
os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)]
|
||||
for patch in self.subject.patches:
|
||||
mx.run(git_apply + [patch], cwd=self.subject.suite.vc_dir)
|
||||
+ mx.run(['cp', os.path.join(os.getenv('TMP'), 'truffle.make'), os.path.join(self.subject.delegate.dir, 'Makefile')])
|
||||
|
||||
self.delegate.logBuild()
|
||||
self.delegate.build()
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/mx.jvmci/mx_jvmci.py b/mx.jvmci/mx_jvmci.py
|
||||
index 491fc19ab9..b4ddc03abb 100644
|
||||
--- a/mx.jvmci/mx_jvmci.py
|
||||
+++ b/mx.jvmci/mx_jvmci.py
|
||||
@@ -192,6 +192,7 @@ class HotSpotVMJDKDeployedDist(JDKDeployedDist):
|
||||
if m.name in _hs_deploy_map:
|
||||
targetDir = join(jdkDir, _hs_deploy_map[m.name])
|
||||
mx.logv('Deploying {} from {} to {}'.format(m.name, dist.name, targetDir))
|
||||
+ subprocess.call(["chmod", "-R", "+rw", targetDir])
|
||||
tar.extract(m, targetDir)
|
||||
|
||||
"""
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
diff --git a/tool/jt.rb b/tool/jt.rb
|
||||
index 870d88edcb..0a6e4c367b 100755
|
||||
--- a/tool/jt.rb
|
||||
+++ b/tool/jt.rb
|
||||
@@ -152,13 +152,16 @@ module Utilities
|
||||
end
|
||||
|
||||
def find_mx
|
||||
- if which('mx')
|
||||
- 'mx'
|
||||
+ if ENV.key?("MX_GIT_CACHE_DIR")
|
||||
+ "mx-internal"
|
||||
else
|
||||
- mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
|
||||
- "#{mx_repo}/mx"
|
||||
+ if which('mx')
|
||||
+ 'mx'
|
||||
+ else
|
||||
+ mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
|
||||
+ "#{mx_repo}/mx"
|
||||
+ end
|
||||
end
|
||||
- end
|
||||
|
||||
def find_launcher(use_native)
|
||||
if use_native
|
||||
@@ -444,8 +447,8 @@ module Commands
|
||||
--no-sforceimports do not run sforceimports before building
|
||||
parser build the parser
|
||||
options build the options
|
||||
- graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
|
||||
- available by default in mxbuild/truffleruby-jvm,
|
||||
+ graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
|
||||
+ available by default in mxbuild/truffleruby-jvm,
|
||||
the Ruby is symlinked into rbenv or chruby if available
|
||||
--graal include the GraalVM Compiler in the build
|
||||
--native build native ruby image as well, available in mxbuild/truffleruby-native
|
||||
@@ -491,7 +494,7 @@ module Commands
|
||||
jt test compiler run compiler tests
|
||||
jt test integration [TESTS] run integration tests
|
||||
jt test bundle [--jdebug] tests using bundler
|
||||
- jt test gems [TESTS] tests using gems
|
||||
+ jt test gems [TESTS] tests using gems
|
||||
jt test ecosystem [TESTS] tests using the wider ecosystem such as bundler, Rails, etc
|
||||
jt test cexts [--no-openssl] [--no-gems] [test_names...]
|
||||
run C extension tests (set GEM_HOME)
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
|
||||
index 4f57e1954..db45220d9 100644
|
||||
--- a/mx.fastr/mx_copylib.py
|
||||
+++ b/mx.fastr/mx_copylib.py
|
||||
@@ -54,6 +54,9 @@ def _copylib(lib, libpath, plain_libpath_base, target):
|
||||
else:
|
||||
try:
|
||||
if platform.system() == 'Linux':
|
||||
+ # https://github.com/oracle/fastr/issues/110
|
||||
+ if libpath.endswith("libgcc_s.so"):
|
||||
+ libpath = libpath + ".1"
|
||||
output = subprocess.check_output(['objdump', '-p', libpath])
|
||||
elif platform.system() == 'SunOS':
|
||||
output = subprocess.check_output(['elfdump', '-d', libpath])
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
diff --git a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
|
||||
index dcf081316..c2cb4879b 100644
|
||||
--- a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
|
||||
+++ b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
|
||||
@@ -20,8 +20,10 @@
|
||||
|
||||
#include <Rinternals.h>
|
||||
#include <stdlib.h>
|
||||
+#include <rlocale.h>
|
||||
|
||||
#include <R_ext/eventloop.h>
|
||||
+#include <R_ext/GraphicsEngine.h>
|
||||
#include <Defn.h>
|
||||
|
||||
Rboolean known_to_be_latin1 = FALSE;
|
||||
@@ -166,3 +168,69 @@ int Scollate(SEXP a, SEXP b) {
|
||||
void z_prec_r(Rcomplex *r, Rcomplex *x, double digits) {
|
||||
unimplemented("z_prec_r");
|
||||
}
|
||||
+
|
||||
+int Rf_AdobeSymbol2ucs2(int n) {
|
||||
+ unimplemented("Rf_AdobeSymbol2ucs2");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+size_t Mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps) {
|
||||
+ unimplemented("Mbrtowc");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+double R_GE_VStrHeight(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
|
||||
+ unimplemented("R_GE_VStrHeight");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void R_GE_VText(double x, double y, const char * const s, cetype_t enc,
|
||||
+ double x_justify, double y_justify, double rotation,
|
||||
+ const pGEcontext gc, pGEDevDesc dd) {
|
||||
+ unimplemented("R_GE_VText");
|
||||
+}
|
||||
+
|
||||
+double R_GE_VStrWidth(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
|
||||
+ unimplemented("R_GE_VStrWidth");
|
||||
+}
|
||||
+
|
||||
+void setulb(int n, int m, double *x, double *l, double *u, int *nbd,
|
||||
+ double *f, double *g, double factr, double *pgtol,
|
||||
+ double *wa, int * iwa, char *task, int iprint, int *isave) {
|
||||
+ unimplemented("setulb");
|
||||
+}
|
||||
+
|
||||
+void genptry(int n, double *p, double *ptry, double scale, void *ex) {
|
||||
+ unimplemented("genptry");
|
||||
+}
|
||||
+
|
||||
+double EXP(double x) {
|
||||
+ unimplemented("EXP");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+double LOG(double x) {
|
||||
+ unimplemented("LOG");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+Rwchar_t Rf_utf8toucs32(wchar_t high, const char *s) {
|
||||
+ unimplemented("Rf_utf8toucs32");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+size_t mbtoucs(unsigned int *wc, const char *s, size_t n) {
|
||||
+ unimplemented("mbtoucs");
|
||||
+ return (size_t) 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+int DispatchOrEval(SEXP call, SEXP op, const char *generic, SEXP args,
|
||||
+ SEXP rho, SEXP *ans, int dropmissing, int argsevald) {
|
||||
+ unimplemented("DispatchOrEval");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void ENSURE_NAMEDMAX (SEXP x) {
|
||||
+ unimplemented("ENSURE_NAMEDMAX");
|
||||
+}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
diff --git a/mx.jvmci/suite.py b/mx.jvmci/suite.py
|
||||
index 9690c0a38f..fa1d36b7e1 100644
|
||||
--- a/mx.jvmci/suite.py
|
||||
+++ b/mx.jvmci/suite.py
|
||||
@@ -241,18 +241,7 @@ suite = {
|
||||
"workingSets" : "JVMCI,HotSpot,SPARC",
|
||||
},
|
||||
|
||||
- "jdk.vm.ci.hotspot.jfr" : {
|
||||
- "subDir" : "jvmci",
|
||||
- "sourceDirs" : ["src"],
|
||||
- "dependencies" : [
|
||||
- "jdk.vm.ci.hotspot",
|
||||
- "JFR",
|
||||
- ],
|
||||
- "checkstyle" : "jdk.vm.ci.hotspot",
|
||||
- "javaCompliance" : "1.8",
|
||||
- "profile" : "",
|
||||
- "workingSets" : "JVMCI,HotSpot",
|
||||
- },
|
||||
+
|
||||
|
||||
"hotspot" : {
|
||||
"native" : True,
|
||||
@@ -354,7 +343,7 @@ suite = {
|
||||
"jdk.vm.ci.hotspot.aarch64",
|
||||
"jdk.vm.ci.hotspot.amd64",
|
||||
"jdk.vm.ci.hotspot.sparc",
|
||||
- "jdk.vm.ci.hotspot.jfr",
|
||||
+
|
||||
],
|
||||
"distDependencies" : [
|
||||
"JVMCI_SERVICES",
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
|
||||
index 23a76357fd2..f13694b6ed7 100644
|
||||
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
|
||||
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
|
||||
@@ -249,15 +249,6 @@ public final class SizeAndSignednessVerifier extends NativeInfoTreeVisitor {
|
||||
}
|
||||
|
||||
private void checkSignedness(boolean isUnsigned, ResolvedJavaType type, ResolvedJavaMethod method) {
|
||||
- if (isSigned(type)) {
|
||||
- if (isUnsigned) {
|
||||
- addError("Type " + type.toJavaName(false) + " is signed, but accessed C value is unsigned", method);
|
||||
- }
|
||||
- } else if (nativeLibs.isWordBase(type)) {
|
||||
- /* every Word type other than Signed is assumed to be unsigned. */
|
||||
- if (!isUnsigned) {
|
||||
- addError("Type " + type.toJavaName(false) + " is unsigned, but accessed C value is signed", method);
|
||||
- }
|
||||
- }
|
||||
+
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
|
||||
index b89163ef983..0fd0138b336 100644
|
||||
--- a/substratevm/mx.substratevm/mx_substratevm.py
|
||||
+++ b/substratevm/mx.substratevm/mx_substratevm.py
|
||||
@@ -189,7 +189,7 @@ if str(svm_java_compliance().value) not in GRAAL_COMPILER_FLAGS_MAP:
|
||||
mx.abort("Substrate VM does not support this Java version: " + str(svm_java_compliance()))
|
||||
GRAAL_COMPILER_FLAGS = GRAAL_COMPILER_FLAGS_BASE + GRAAL_COMPILER_FLAGS_MAP[str(svm_java_compliance().value)]
|
||||
|
||||
-IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases']
|
||||
+IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases', '-H:+ReportExceptionStackTraces']
|
||||
suite = mx.suite('substratevm')
|
||||
svmSuites = [suite]
|
||||
clibraryDists = ['SVM_HOSTED_NATIVE']
|
||||
|
|
@ -1,540 +0,0 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath,
|
||||
which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc,
|
||||
xcodebuild, gfortran, readline, bzip2, xz, pcre, curl, ed, libresolv, libiconv, writeScriptBin,
|
||||
openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa
|
||||
}:
|
||||
|
||||
let
|
||||
version = "19.2.1";
|
||||
mercurial = mercurial_4;
|
||||
truffleMake = ./truffle.make;
|
||||
makeMxGitCache = list: out: ''
|
||||
mkdir ${out}
|
||||
${lib.concatMapStrings ({ url, name, rev, sha256 }: ''
|
||||
mkdir -p ${out}/${name}
|
||||
cp -rf ${fetchgit { inherit url rev sha256; }}/* ${out}/${name}
|
||||
''
|
||||
) list}
|
||||
|
||||
# # GRAAL-NODEJS # #
|
||||
chmod -R +rw ${out}
|
||||
sed -i "s|#include \"../../../../mxbuild/trufflenode/coremodules/node_snapshots.h\"| \
|
||||
#include \"$NIX_BUILD_TOP/mxbuild/graal-nodejs/trufflenode/coremodules/node_snapshots.h\"|g" \
|
||||
${out}/graaljs/graal-nodejs/deps/v8/src/graal/callbacks.cc
|
||||
|
||||
# patch the shebang in python script runner
|
||||
chmod -R +rw ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2
|
||||
patchShebangs ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2/python
|
||||
|
||||
# # TUFFLE-RUBY # #
|
||||
(cd ${out}/truffleruby && git apply ${./005_tool_jt.rb.patch})
|
||||
patchShebangs ${out}/truffleruby/tool/query-versions-json.rb
|
||||
|
||||
substituteInPlace ${out}/truffleruby/src/main/c/Makefile \
|
||||
--replace '(MX_HOME)/mx' '(MX_HOME)/mx-internal'
|
||||
|
||||
substituteInPlace ${out}/truffleruby/src/processor/java/org/truffleruby/processor/BuildInformationProcessor.java \
|
||||
--replace 'trufflerubyHome = findHome();' \
|
||||
'trufflerubyHome = new File(System.getenv("MX_GIT_CACHE_DIR"), "truffleruby");' \
|
||||
--replace tool/query-versions-json.rb 'ruby tool/query-versions-json.rb' \
|
||||
--replace 'revision = runCommand("git rev-parse --short=8 HEAD");' \
|
||||
'revision = "${version}";' \
|
||||
--replace 'compileDate = runCommand("git log -1 --date=short --pretty=format:%cd");' \
|
||||
'compileDate = "1970-01-01";'
|
||||
|
||||
substituteInPlace ${out}/truffleruby/mx.truffleruby/mx_truffleruby.py \
|
||||
--replace "mx_binary = join(mx._mx_home, 'mx')" "mx_binary = join(mx._mx_home, 'mx-internal')"
|
||||
|
||||
# # FASTR # #
|
||||
(cd ${out}/fastr && git apply ${ ./006_mx_copylib.py.patch })
|
||||
(cd ${out}/fastr && git apply ${ ./007_unimplemented.c.patch })
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java \
|
||||
--replace 'File suiteRoot = srcGenDir.getCanonicalFile().getParentFile().getParentFile().getParentFile();' \
|
||||
'File suiteRoot = new File(System.getenv("MX_GIT_CACHE_DIR"), "fastr");'
|
||||
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.libs \
|
||||
--replace 'mx -p' 'mx-internal -p'
|
||||
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/include/Makefile \
|
||||
--replace 'mx -p' 'mx-internal -p'
|
||||
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/fficall/Makefile \
|
||||
--replace 'mx -p' 'mx-internal -p'
|
||||
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.native.recommended/Makefile \
|
||||
--replace 'mx -p' 'mx-internal -p'
|
||||
|
||||
# Make sure that the logs aren't hidden when compiling gnur
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.gnur \
|
||||
--replace '> gnur_configure.log 2>&1' "" \
|
||||
--replace '> gnur_make.log 2>&1' ""
|
||||
|
||||
substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/run/Linux/Renviron \
|
||||
--replace /bin/ "" \
|
||||
--replace /usr/bin/ ""
|
||||
|
||||
sed -i "s|exec \$mx|exec mx-internal|g" ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
|
||||
chmod +x ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
|
||||
patchShebangs ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
|
||||
|
||||
cd ${out}
|
||||
hg init
|
||||
hg add
|
||||
hg commit -m 'dummy commit'
|
||||
hg tag ${lib.escapeShellArg "vm${version}"}
|
||||
hg checkout ${lib.escapeShellArg "vm${version}"}
|
||||
'';
|
||||
|
||||
# pre-download some cache entries ('mx' will not be able to download under nixbld)
|
||||
makeMxCache = list:
|
||||
stdenv.mkDerivation {
|
||||
name = "mx-cache";
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildCommand = with lib; ''
|
||||
mkdir $out
|
||||
${lib.concatMapStrings
|
||||
({url, name, sha1, isNinja ? false}: ''
|
||||
install -D ${fetchurl { inherit url sha1; }} $out/${name}
|
||||
echo -n ${sha1} > $out/${name}.sha1
|
||||
${if isNinja then ''
|
||||
export BASENAME=${removeSuffix ".zip" name}
|
||||
mkdir "$out/$BASENAME.extracted" &&
|
||||
unzip "$out/${name}" -d "$out/$BASENAME.extracted"
|
||||
|
||||
# Ninja is called later in the build process
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
if [ -f $out/$BASENAME.extracted/ninja ]; then
|
||||
patchelf --set-interpreter \
|
||||
"$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${stdenv.cc.cc.lib}/lib64" \
|
||||
$out/$BASENAME.extracted/ninja
|
||||
fi''}
|
||||
''
|
||||
else ""}
|
||||
'') list}
|
||||
'';
|
||||
};
|
||||
|
||||
jvmci8-mxcache = [
|
||||
rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar"; }
|
||||
rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar"; }
|
||||
rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar"; }
|
||||
rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar"; }
|
||||
rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar"; }
|
||||
rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"; }
|
||||
rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar"; }
|
||||
rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar"; }
|
||||
rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar"; }
|
||||
rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar"; }
|
||||
rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar"; }
|
||||
rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar"; }
|
||||
rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar"; }
|
||||
rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar"; }
|
||||
rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar"; }
|
||||
rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar"; }
|
||||
rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar"; }
|
||||
rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar"; }
|
||||
rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar"; }
|
||||
rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar"; }
|
||||
rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar"; }
|
||||
rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12.jar"; }
|
||||
rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12-sources.jar"; }
|
||||
rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; }
|
||||
rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"; }
|
||||
rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
rec { sha1 = "67f6d23cbebd8998450a88b5bef362171f66f11a"; name = "hsdis_${sha1}/hsdis.dylib"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-darwin-${sha1}.dylib"; }
|
||||
];
|
||||
|
||||
graal-mxcache = jvmci8-mxcache ++ [
|
||||
# rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
|
||||
rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
|
||||
rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; }
|
||||
rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; }
|
||||
rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar"; }
|
||||
rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar"; }
|
||||
rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz"; url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; }
|
||||
rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar"; }
|
||||
rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar"; }
|
||||
rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = "mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar"; }
|
||||
rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = "mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar"; }
|
||||
rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = "mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar"; }
|
||||
rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = "mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar"; }
|
||||
rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar"; }
|
||||
rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz"; }
|
||||
rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar"; }
|
||||
rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar"; }
|
||||
rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz"; }
|
||||
rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = "mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar"; }
|
||||
rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = "mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar"; }
|
||||
# This duplication of asm with underscore and minus is totally weird
|
||||
rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar"; }
|
||||
rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar"; }
|
||||
rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar"; }
|
||||
rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar"; }
|
||||
rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar"; }
|
||||
rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar"; }
|
||||
rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar"; }
|
||||
rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar"; }
|
||||
# From here on the deps are new
|
||||
rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar"; }
|
||||
rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar"; }
|
||||
rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar"; }
|
||||
rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar"; }
|
||||
rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar"; }
|
||||
rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar"; }
|
||||
rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar"; }
|
||||
rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar"; }
|
||||
rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar"; }
|
||||
rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar"; }
|
||||
rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar"; }
|
||||
rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = "mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar"; }
|
||||
rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; }
|
||||
rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar"; }] ++
|
||||
lib.optionals stdenv.isLinux [
|
||||
rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
|
||||
rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar"; }
|
||||
rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz"; }
|
||||
rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip";
|
||||
isNinja = true; }] ++
|
||||
lib.optionals stdenv.isDarwin [
|
||||
rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz"; }
|
||||
rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar"; }
|
||||
rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz"; }
|
||||
rec { sha1 = "8142c497f7dfbdb052a1e31960fdfe2c6f9a5ca2"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip";
|
||||
isNinja = true; }];
|
||||
|
||||
graal-mxcachegit = [
|
||||
{ sha256 = "01w39ms39gl3cw7c2fgcacr2yjg94im9x2x7p5g94l6xlcgqvcnr"; name = "graaljs"; url = "https://github.com/graalvm/graaljs.git"; rev = "vm-${version}"; }
|
||||
{ sha256 = "1dps9n5b9c80pbg1fmlwpffy6ina0f0h27di24kafc8isxrdggia"; name = "truffleruby"; url = "https://github.com/oracle/truffleruby.git"; rev = "vm-${version}"; }
|
||||
{ sha256 = "0jdpdqm3ld1wsasmi8ka26qf19cibjac8lrqm040h5vh0iqzxizy"; name = "fastr"; url = "https://github.com/oracle/fastr.git"; rev = "vm-${version}"; }
|
||||
{ sha256 = "1gv8vafwrafjzvgv4gwk4kcsb3bnvsx07qa5inc0bdyxy5shl381"; name = "graalpython"; url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; }];
|
||||
|
||||
ninja-syntax = python27.pkgs.buildPythonPackage rec {
|
||||
version = "1.7.2";
|
||||
pname = "ninja_syntax";
|
||||
doCheck = false;
|
||||
src = python27.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "07zg30m0khx55fv2gxxn7pqd549z0vk3x592mrdlk9l8krxwjb9l";
|
||||
};
|
||||
};
|
||||
|
||||
findbugs = fetchzip {
|
||||
name = "findbugs-3.0.0";
|
||||
url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip";
|
||||
sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m";
|
||||
};
|
||||
|
||||
python27withPackages = python27.withPackages (ps: [ ninja-syntax ]);
|
||||
|
||||
in rec {
|
||||
|
||||
mx = stdenv.mkDerivation rec {
|
||||
version = "5.247.1";
|
||||
pname = "mx";
|
||||
src = fetchFromGitHub {
|
||||
owner = "graalvm";
|
||||
repo = "mx";
|
||||
rev = version;
|
||||
sha256 = "038qr49rqzkhj76nqd27h8fysssnlpdhmy23ks2y81xlxhlzkc59";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
prePatch = ''
|
||||
cp mx.py bak_mx.py
|
||||
'';
|
||||
patches = [ ./001_mx.py.patch ];
|
||||
postPatch = ''
|
||||
mv mx.py internal_mx.py
|
||||
mv bak_mx.py mx.py
|
||||
'';
|
||||
buildPhase = ''
|
||||
substituteInPlace mx --replace /bin/pwd pwd
|
||||
|
||||
# avoid crash with 'ValueError: ZIP does not support timestamps before 1980'
|
||||
substituteInPlace internal_mx.py --replace \
|
||||
'zipfile.ZipInfo(arcname, time.localtime(getmtime(join(root, f)))[:6])' \
|
||||
'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y" )[:6])'
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -dpR * $out/bin
|
||||
wrapProgram $out/bin/mx \
|
||||
--prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
|
||||
--set FINDBUGS_HOME ${findbugs}
|
||||
makeWrapper ${python27}/bin/python $out/bin/mx-internal \
|
||||
--add-flags "$out/bin/internal_mx.py" \
|
||||
--prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
|
||||
--set FINDBUGS_HOME ${findbugs}
|
||||
'';
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/graalvm/mx";
|
||||
description = "Command-line tool used for the development of Graal projects";
|
||||
license = licenses.gpl2;
|
||||
platforms = python27.meta.platforms;
|
||||
};
|
||||
};
|
||||
|
||||
jvmci8 = stdenv.mkDerivation rec {
|
||||
version = "19.3-b05";
|
||||
pname = "jvmci";
|
||||
src = fetchFromGitHub {
|
||||
owner = "graalvm";
|
||||
repo = "graal-jvmci-8";
|
||||
rev = "jvmci-${version}";
|
||||
sha256 = "0j7my76vldbrvki9x1gn9ics3x2z96j05jdy4nflbpik8i396114";
|
||||
};
|
||||
buildInputs = [ mx mercurial openjdk ] ++ lib.optionals stdenv.isDarwin [
|
||||
libobjc CoreFoundation Foundation JavaNativeFoundation JavaRuntimeSupport JavaVM xcodebuild Cocoa
|
||||
];
|
||||
postUnpack = ''
|
||||
# a fake mercurial dir to prevent mx crash and supply the version to mx
|
||||
( cd $sourceRoot
|
||||
hg init
|
||||
hg add
|
||||
hg commit -m 'dummy commit'
|
||||
hg tag ${lib.escapeShellArg src.rev}
|
||||
hg checkout ${lib.escapeShellArg src.rev}
|
||||
)
|
||||
'';
|
||||
patches = [ ./004_mx_jvmci.py.patch ] ++
|
||||
lib.optional stdenv.isDarwin [
|
||||
./008_remove_jfr.patch ];
|
||||
postPatch =''
|
||||
# The hotspot version name regex fix
|
||||
substituteInPlace mx.jvmci/mx_jvmci.py \
|
||||
--replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-b[g\\d][a\\d]"
|
||||
# darwin: https://github.com/oracle/graal/issues/1816
|
||||
substituteInPlace src/share/vm/code/compiledIC.cpp \
|
||||
--replace 'entry == false' '*entry == false'
|
||||
'';
|
||||
hardeningDisable = [ "fortify" ];
|
||||
NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.isDarwin [
|
||||
"-Wno-reserved-user-defined-literal"
|
||||
"-Wno-c++11-narrowing"
|
||||
] ++
|
||||
lib.optional stdenv.isLinux [
|
||||
"-Wno-error=format-overflow" # newly detected by gcc7
|
||||
"-Wno-error=nonnull"
|
||||
]);
|
||||
|
||||
buildPhase = ''
|
||||
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
|
||||
export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
|
||||
|
||||
mx-internal --primary-suite . --vm=server -v build -DFULL_DEBUG_SYMBOLS=0
|
||||
mx-internal --primary-suite . --vm=server -v vm -version
|
||||
mx-internal --primary-suite . --vm=server -v unittest
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
${if stdenv.isDarwin
|
||||
then "mv openjdk1.8.0_*/darwin-amd64/product/* $out"
|
||||
else "mv openjdk1.8.0_*/linux-amd64/product/* $out"}
|
||||
install -v -m0555 -D $MX_CACHE_DIR/hsdis*/hsdis.so $out/jre/lib/amd64/hsdis-amd64.so
|
||||
'';
|
||||
# copy-paste openjdk's preFixup
|
||||
preFixup = ''
|
||||
# Propagate the setJavaClassPath setup hook from the JRE so that
|
||||
# any package that depends on the JRE has $CLASSPATH set up
|
||||
# properly.
|
||||
mkdir -p $out/nix-support
|
||||
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
mkdir -p $out/nix-support
|
||||
cat <<EOF > $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
|
||||
EOF
|
||||
'';
|
||||
postFixup = openjdk.postFixup or null;
|
||||
dontStrip = true; # stripped javac crashes with "segmentaion fault"
|
||||
inherit (openjdk) meta;
|
||||
};
|
||||
|
||||
graalvm8 = stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
pname = "graal";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "graal";
|
||||
rev = "vm-${version}";
|
||||
sha256 = "0v8zkmzkyhmmmvra5pp876d4i4ijrrw15j98ipayc7is02kwiwmq";
|
||||
};
|
||||
|
||||
patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ] ++
|
||||
lib.optional stdenv.isDarwin [
|
||||
./009_remove_signedness_verifier.patch ./010_mx_substratevm.py
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
|
||||
buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang
|
||||
python27withPackages icu ruby bzip2 which
|
||||
readline bzip2 xz pcre curl ed
|
||||
] ++ lib.optional stdenv.isDarwin [
|
||||
CoreFoundation gcc.cc.lib libiconv perl openssl
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h \
|
||||
$sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include
|
||||
''}
|
||||
cp ${truffleMake} $TMPDIR/truffle.make
|
||||
rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch
|
||||
|
||||
# a fake mercurial dir to prevent mx crash and supply the version to mx
|
||||
( cd $sourceRoot
|
||||
hg init
|
||||
hg add
|
||||
hg commit -m 'dummy commit'
|
||||
hg tag ${lib.escapeShellArg src.rev}
|
||||
hg checkout ${lib.escapeShellArg src.rev}
|
||||
)
|
||||
|
||||
# make a copy of jvmci8
|
||||
mkdir $NIX_BUILD_TOP/jvmci8
|
||||
cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8
|
||||
chmod +w -R $NIX_BUILD_TOP/jvmci8
|
||||
export MX_CACHE_DIR=${makeMxCache graal-mxcache}
|
||||
export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache
|
||||
${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"}
|
||||
cd $TMPDIR
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \
|
||||
--replace '<zlib.h>' '<${zlib.dev}/include/zlib.h>'
|
||||
substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
|
||||
--replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
|
||||
|
||||
# For debugging native-image build, add this replace statement on CCompilerInvoker.java
|
||||
# --replace '(String line : lines) {' '(String line : lines) {System.out.println("DEBUG: " + line);'
|
||||
${if stdenv.isLinux then ''
|
||||
substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
|
||||
--replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
|
||||
'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");' ''
|
||||
else ''
|
||||
substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
|
||||
--replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
|
||||
'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${gcc.cc}/bin/gcc");
|
||||
command.add("-F"); command.add("${CoreFoundation}/Library/Frameworks");
|
||||
command.add("-framework"); command.add("CoreFoundation");'
|
||||
''}
|
||||
|
||||
# prevent cyclical imports caused by identical <include> names
|
||||
substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
|
||||
--replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
|
||||
# dragonegg can't seem to compile on nix, so let's not require it
|
||||
substituteInPlace sulong/mx.sulong/suite.py \
|
||||
--replace '"requireDragonegg" : True,' '"requireDragonegg" : False,'
|
||||
substituteInPlace truffle/mx.truffle/mx_truffle.py \
|
||||
--replace 'os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)' \
|
||||
'self.subject.delegate.dir'
|
||||
substituteInPlace sulong/projects/bootstrap-toolchain-launchers/Makefile \
|
||||
--replace /bin/bash ${bash}/bin/bash
|
||||
# Patch the native-image template, as it will be run during build
|
||||
chmod +x vm/mx.vm/launcher_template.sh && patchShebangs vm/mx.vm
|
||||
# Prevent random errors from too low maxRuntimecompilemethods
|
||||
substituteInPlace truffle/mx.truffle/macro-truffle.properties \
|
||||
--replace '-H:MaxRuntimeCompileMethods=1400' \
|
||||
'-H:MaxRuntimeCompileMethods=28000'
|
||||
${lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace truffle/src/com.oracle.truffle.nfi.test.native/src/object.cc \
|
||||
--replace '#include <stdlib.h>' ""
|
||||
''}
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \
|
||||
--replace '# include <cstdlib>' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"'
|
||||
''}
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
|
||||
export MX_GIT_CACHE='refcache'
|
||||
export JVMCI_VERSION_CHECK='ignore'
|
||||
export JAVA_HOME=$NIX_BUILD_TOP/jvmci8
|
||||
export FASTR_RELEASE=true
|
||||
export PKG_LDFLAGS_OVERRIDE="-L${pcre.out}/lib -L${zlib}/lib -L${gfortran.cc.lib}/lib64"
|
||||
${lib.optionalString stdenv.isDarwin ''
|
||||
export CC="gcc"
|
||||
export CPP="gcc -E"
|
||||
export NIX_CXXSTDLIB_LINK=""
|
||||
export NIX_CXXSTDLIB_LINK_FOR_TARGET=""
|
||||
export OPENSSL_PREFIX=$(realpath openssl)
|
||||
# this fixes error: impure path 'LibFFIHeaderDirectives' used in link
|
||||
export NIX_ENFORCE_PURITY=0
|
||||
''}
|
||||
( cd vm
|
||||
mx-internal -v --suite sdk --suite compiler --suite vm --suite tools --suite regex --suite truffle \
|
||||
--dynamicimports /substratevm,/sulong,graal-js,graalpython,fastr,truffleruby build
|
||||
)
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
(if stdenv.isDarwin then ''
|
||||
mkdir -p $out
|
||||
rm -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM_*STAGE1*
|
||||
cp -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM*/graalvm-unknown-${version}/* $out
|
||||
''
|
||||
else ''
|
||||
mkdir -p $out
|
||||
rm -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM_*STAGE1*
|
||||
cp -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM*/graalvm-unknown-${version}/* $out
|
||||
|
||||
# BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
|
||||
substituteInPlace $out/jre/lib/security/java.security \
|
||||
--replace file:/dev/random file:/dev/./urandom \
|
||||
--replace NativePRNGBlocking SHA1PRNG
|
||||
# copy static and dynamic libraries needed for static compilation
|
||||
cp -rf ${glibc}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/
|
||||
cp ${glibc.static}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/
|
||||
cp ${zlib.static}/lib/libz.a $out/jre/lib/svm/clibraries/linux-amd64/libz.a
|
||||
'');
|
||||
|
||||
inherit (jvmci8) preFixup;
|
||||
dontStrip = true; # stripped javac crashes with "segmentaion fault"
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
echo ${lib.escapeShellArg ''
|
||||
public class HelloWorld {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World");
|
||||
}
|
||||
}
|
||||
''} > HelloWorld.java
|
||||
$out/bin/javac HelloWorld.java
|
||||
|
||||
# run on JVM with Graal Compiler
|
||||
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld
|
||||
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
|
||||
|
||||
# Ahead-Of-Time compilation
|
||||
$out/bin/native-image --no-server HelloWorld
|
||||
./helloworld
|
||||
./helloworld | fgrep 'Hello World'
|
||||
|
||||
${lib.optionalString stdenv.isLinux
|
||||
''
|
||||
# Ahead-Of-Time compilation with --static (supported on linux only)
|
||||
$out/bin/native-image --no-server --static HelloWorld
|
||||
./helloworld
|
||||
./helloworld | fgrep 'Hello World'
|
||||
''}
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
passthru.home = graalvm8;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/oracle/graal";
|
||||
description = "High-Performance Polyglot VM";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ volth hlolli ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" /*"aarch64-linux"*/ ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# This Makefile is used by mx to bootstrap libffi build.
|
||||
|
||||
# `make MX_VERBOSE=y` will report all lines executed. The actual value doesn't
|
||||
# matter as long as it's not empty.
|
||||
|
||||
QUIETLY$(MX_VERBOSE) = @
|
||||
|
||||
.PHONY: default
|
||||
|
||||
default:
|
||||
sed -i "s|-print-multi-os-directory||g" ../$(SOURCES)/configure
|
||||
$(QUIETLY) echo CONFIGURE libffi
|
||||
$(QUIETLY) mkdir ../$(OUTPUT)
|
||||
$(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS)
|
||||
$(QUIETLY) echo MAKE libffi
|
||||
$(QUIETLY) $(MAKE) -C ../$(OUTPUT)
|
||||
|
|
@ -72,15 +72,17 @@ let
|
|||
nimHost = parsePlatform stdenv.hostPlatform;
|
||||
nimTarget = parsePlatform stdenv.targetPlatform;
|
||||
|
||||
bootstrapCompiler = stdenv.mkDerivation rec {
|
||||
bootstrapCompiler = let
|
||||
revision = "561b417c65791cd8356b5f73620914ceff845d10";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "nim-bootstrap";
|
||||
version = "0.20.0";
|
||||
version = "g${lib.substring 0 7 revision}";
|
||||
|
||||
src = fetchgit {
|
||||
# A Git checkout is much smaller than a GitHub tarball.
|
||||
url = "https://github.com/nim-lang/csources.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis";
|
||||
url = "https://github.com/nim-lang/csources_v1.git";
|
||||
rev = revision;
|
||||
sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.6.12";
|
||||
version = "0.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bbb6YbPMpzVy+Pa9OGe62TXihTbUeKTlPS29sa70aQ8=";
|
||||
sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-io";
|
||||
version = "0.10.9";
|
||||
version = "0.10.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-16MhOQlvFwbiSBNI1NWGjrLh0z/fCnAGmc8JguZQPZM=";
|
||||
sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adb-shell";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "JeffLIrion";
|
||||
repo = "adb_shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725";
|
||||
sha256 = "sha256-E7sX+N6d5Otwp1AbdPCnQJ2YT/k89+6kMJDLt8U2Dsg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,18 +3,19 @@
|
|||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
, slixmpp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioharmony";
|
||||
version = "0.2.7";
|
||||
disabled = !isPy3k;
|
||||
version = "0.2.8";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA=";
|
||||
sha256 = "0adf08955810a227db489556dc3ca808e4f825a00183f613797856114c2a2a47";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -26,7 +27,10 @@ buildPythonPackage rec {
|
|||
# aioharmony does not seem to include tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ];
|
||||
pythonImportsCheck = [
|
||||
"aioharmony.harmonyapi"
|
||||
"aioharmony.harmonyclient"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ehendrix23/aioharmony";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings";
|
||||
pname = "airthings-cloud";
|
||||
version = "0.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncstdlib";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
format = "flit";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "maxfischer2781";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D8XaBny/m6dXMz6k/FhVX/5t8guNdJsfiX4cVQV4VIY=";
|
||||
sha256 = "sha256-vjOhfEsAldTjROFUer1SgEX1KxnNM/WwtLsCB9ZV1WM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "broadlink";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bfd1ff007d0d1187c17ae52be938afc8137fbd1ed6a794426e975df10d167571";
|
||||
sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bytecode";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vstinner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CEfDoJ+JlnxLLVnSxv7bEN891tmwG9zAvtT8GNvp8JU=";
|
||||
sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsplaining";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "salesforce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0s446jji3c9x1gw0lsb03giir91cnv6dgh4nzxg9mc1rm9wy7gzw";
|
||||
sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
, fetchFromGitHub
|
||||
, sqlalchemy
|
||||
, aiocontextvars
|
||||
, isPy27
|
||||
, aiopg
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pymysql
|
||||
, asyncpg
|
||||
|
|
@ -13,42 +14,48 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databases";
|
||||
version = "0.5.2";
|
||||
disabled = isPy27;
|
||||
version = "0.5.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-OfBb78lKnAxPhyy2j4TzEZWBzbw64brTQcxuOPoW9pk=";
|
||||
sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiocontextvars
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiopg
|
||||
aiomysql
|
||||
aiosqlite
|
||||
asyncpg
|
||||
pymysql
|
||||
sqlalchemy
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
aiocontextvars
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# ModuleNotFoundError: No module named 'aiopg'
|
||||
"tests/test_connection_options.py"
|
||||
# circular dependency on starlette
|
||||
"tests/test_integration.py"
|
||||
# TEST_DATABASE_URLS is not set.
|
||||
"tests/test_databases.py"
|
||||
"tests/test_connection_options.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"databases"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Async database support for Python";
|
||||
homepage = "https://github.com/encode/databases";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, environs
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-mock
|
||||
|
|
@ -12,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ln9hlix6rbyajgvwd2lk0i7nshvrbkvj9xx1i0q1z1caly9yl0g";
|
||||
sha256 = "sha256-NwG/VbTHoQl3c//vrrhKQ//gyVIGLY2148mgDToiKks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,9 +30,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-vcr
|
||||
environs
|
||||
pytest-mock
|
||||
pytest-vcr
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -47,7 +49,7 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "deezer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A friendly Python wrapper around the Deezer API";
|
||||
description = "Python wrapper around the Deezer API";
|
||||
homepage = "https://github.com/browniebroke/deezer-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ synthetica ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-storages";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cb079981e2e4fe16d7f41000913225140dc334a84f5b7c5e4fcc6b7e6a028222";
|
||||
sha256 = "0013ebe4904521e2fa28f33591a03a7210304d73363e7eadd7cdcf81c12ba003";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
|
|
|||
49
pkgs/development/python-modules/environs/default.nix
Normal file
49
pkgs/development/python-modules/environs/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dj-database-url
|
||||
, dj-email-url
|
||||
, django-cache-url
|
||||
, fetchFromGitHub
|
||||
, marshmallow
|
||||
, pytestCheckHook
|
||||
, python-dotenv
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "environs";
|
||||
version = "9.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sloria";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0n0l9jici2d1pck5pf1c96jj3lhw91jki9nsgxzpikvpyvsw7wga";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
marshmallow
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dj-database-url
|
||||
dj-email-url
|
||||
django-cache-url
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"environs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python modle for environment variable parsing";
|
||||
homepage = "https://github.com/sloria/environs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fritzconnection";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "kbr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1HzeNtSqzqr9zyxF1PVWi6QfRupw8huMYmdFI6rzIdY=";
|
||||
sha256 = "sha256-yrkFtvGXkeHD5hp0Fzz3M1hsuSIt6bQriyUy4NagD0U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -9,14 +9,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.7.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "4.7.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = version;
|
||||
sha256 = "sha256-kZREcjLBSWXGULEKfWiherRCl5UXLOw4f3JFaqs8dXw=";
|
||||
sha256 = "sha256-v12CL2VR9QAoj44F8V1qw/qflzQ1WRi1cvWn/U/wW/E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymodbus";
|
||||
version = "2.5.3rc1";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riptideio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jynljjTipN/Yx97RSWikcotxCqosNWSDH7GdwcSIiRU=";
|
||||
sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4=";
|
||||
};
|
||||
|
||||
# Twisted asynchronous version is not supported due to a missing dependency
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytradfri";
|
||||
version = "7.0.7";
|
||||
version = "7.1.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-libs";
|
||||
repo = "pytradfri";
|
||||
rev = version;
|
||||
sha256 = "sha256-gUaDPm1hq4SZm9beSbfdX0qGEGWGiq13UjchdN1+Kfc=";
|
||||
sha256 = "sha256-r/qt06YPia8PYhwOeDXk0oK3YvEZ/1kN//+LXj34fmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0pb0kgddyzpipa0sqrkwyg1jgh95726irb306lr0pyyg0rsk54k7";
|
||||
sha256 = "1f6gbv6pczr5nhk8jmqpskvlffjd4ai4bkrmcj171mwq45vig6xr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytest, backoff, requests }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytestCheckHook, backoff, requests }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "versionfinder";
|
||||
|
|
@ -17,10 +17,15 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
requests
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# acceptance tests use the network
|
||||
"versionfinder/tests/test_acceptance.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "versionfinder" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yeelight";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stavros";
|
||||
repo = "python-yeelight";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-unxJf//VJc21uM0njirQIOjMrkFR6KXicNrOXKus3lw=";
|
||||
sha256 = "sha256-fKtG0D256bK1hIcQiLdzCM+IdD/mmcFpcoE3DEFt7r0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,33 +1,42 @@
|
|||
# This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
{ lib, buildGoPackage, fetchgit }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "pprof-unstable";
|
||||
version = "2018-08-15";
|
||||
rev = "781f11b1fcf71fae9d185e7189b5e686f575075a";
|
||||
buildGoModule rec {
|
||||
pname = "pprof";
|
||||
version = "unstable-2021-09-30";
|
||||
|
||||
goPackagePath = "github.com/google/pprof";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "git://github.com/google/pprof";
|
||||
sha256 = "1nvzwcj6h4q0lsjlri3bym4axgv848w3xz57iz5p0wz9lcd5jsmf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "pprof";
|
||||
rev = "7fe48b4c820be13151ae35ce5a5e3f54f1b53eef";
|
||||
sha256 = "05nr3igdigs1586qplwfm17hfw0v81jy745g6vayq7cbplljfjb1";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "0yl8y3m2ia3cwxhmg1km8358a0225khimv6hcvras8r2glm69h3f";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for visualization and analysis of profiling data";
|
||||
homepage = "https://github.com/google/pprof";
|
||||
license = licenses.asl20;
|
||||
longDescription = ''
|
||||
pprof reads a collection of profiling samples in profile.proto format and generates reports to visualize and help analyze the data. It can generate both text and graphical reports (through the use of the dot visualization package).
|
||||
pprof reads a collection of profiling samples in profile.proto format and
|
||||
generates reports to visualize and help analyze the data. It can generate
|
||||
both text and graphical reports (through the use of the dot visualization
|
||||
package).
|
||||
|
||||
profile.proto is a protocol buffer that describes a set of callstacks and symbolization information. A common usage is to represent a set of sampled callstacks from statistical profiling. The format is described on the proto/profile.proto file. For details on protocol buffers, see https://developers.google.com/protocol-buffers
|
||||
profile.proto is a protocol buffer that describes a set of callstacks and
|
||||
symbolization information. A common usage is to represent a set of sampled
|
||||
callstacks from statistical profiling. The format is described on the
|
||||
proto/profile.proto file. For details on protocol buffers, see
|
||||
https://developers.google.com/protocol-buffers
|
||||
|
||||
Profiles can be read from a local file, or over http. Multiple profiles of the same type can be aggregated or compared.
|
||||
Profiles can be read from a local file, or over http. Multiple profiles of
|
||||
the same type can be aggregated or compared.
|
||||
|
||||
If the profile samples contain machine addresses, pprof can symbolize them through the use of the native binutils tools (addr2line and nm).
|
||||
If the profile samples contain machine addresses, pprof can symbolize them
|
||||
through the use of the native binutils tools (addr2line and nm).
|
||||
|
||||
This is not an official Google product.
|
||||
'';
|
||||
|
|
|
|||
21
pkgs/development/tools/profiling/pprof/deps.nix
generated
21
pkgs/development/tools/profiling/pprof/deps.nix
generated
|
|
@ -1,21 +0,0 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/chzyer/readline";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/chzyer/readline";
|
||||
rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
|
||||
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ianlancetaylor/demangle";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ianlancetaylor/demangle";
|
||||
rev = "fcd258a6f0b45dc345a407ee5568cf9a4d24a0ae";
|
||||
sha256 = "10hdzq6n4mb13g8ddqvwjwx14djfyxhh0gjc888vdihzvhyqhvrp";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -140,6 +140,9 @@ let
|
|||
"INSTALL_MOD_PATH=\${out}"
|
||||
];
|
||||
|
||||
# Enabling BTF causes zfs to be build with debug symbols.
|
||||
# Since zfs compress kernel modules on installation, our strip hooks skip stripping them.
|
||||
# Hence we strip modules prior to compression.
|
||||
postBuild = optionalString buildKernel ''
|
||||
find . -name "*.ko" -print0 | xargs -0 -P$NIX_BUILD_CORES strip --strip-debug
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
"air_quality" = ps: with ps; [ ];
|
||||
"airly" = ps: with ps; [ airly ];
|
||||
"airnow" = ps: with ps; [ pyairnow ];
|
||||
"airthings" = ps: with ps; [ ]; # missing inputs: airthings_cloud
|
||||
"airthings" = ps: with ps; [ airthings-cloud ];
|
||||
"airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi
|
||||
"airvisual" = ps: with ps; [ pyairvisual ];
|
||||
"aladdin_connect" = ps: with ps; [ aladdin-connect ];
|
||||
|
|
|
|||
|
|
@ -214,6 +214,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"air_quality"
|
||||
"airly"
|
||||
"airnow"
|
||||
"airthings"
|
||||
"airvisual"
|
||||
"alarm_control_panel"
|
||||
"alarmdecoder"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
callPackage ./generic.nix args {
|
||||
src = fetchhg {
|
||||
url = "https://hg.nginx.org/nginx-quic";
|
||||
rev = "5b0c229ba5fe"; # branch=quic
|
||||
sha256 = "1bb6n6b4nkc1cfllj75lwr4gjijl8883bkcvq8ncg7r4s5xs7r90";
|
||||
rev = "404de224517e"; # branch=quic
|
||||
sha256 = "00x8djp3hqnq60jzpddfrj0v23j2fbl27jyw609ha3wqkkbxrip9";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,29 @@
|
|||
{ lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages
|
||||
, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, bash
|
||||
, btrfs-progs
|
||||
, openssh
|
||||
, perl
|
||||
, perlPackages
|
||||
, util-linux
|
||||
, asciidoc
|
||||
, asciidoctor
|
||||
, mbuffer
|
||||
, makeWrapper
|
||||
, genericUpdater
|
||||
, curl
|
||||
, writeShellScript
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrbk";
|
||||
version = "0.29.1";
|
||||
version = "0.31.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "153inyvvnl17hq1w3nsa783havznaykdam2yrj775bmi2wg6fvwn";
|
||||
sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ];
|
||||
|
|
@ -22,7 +38,9 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
|
||||
# Tainted Mode disables PERL5LIB
|
||||
substituteInPlace btrbk --replace "perl -T" "perl"
|
||||
substituteInPlace btrbk \
|
||||
--replace "perl -T" "perl" \
|
||||
--replace "\$0" "\$ENV{'program_name'}"
|
||||
|
||||
# Fix SSH filter script
|
||||
sed -i '/^export PATH/d' ssh_filter_btrbk.sh
|
||||
|
|
@ -30,17 +48,26 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/sbin/btrbk \
|
||||
wrapProgram $out/bin/btrbk \
|
||||
--set PERL5LIB $PERL5LIB \
|
||||
--run 'export program_name=$0' \
|
||||
--prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
|
||||
'';
|
||||
|
||||
passthru.tests.btrbk = nixosTests.btrbk;
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
inherit pname version;
|
||||
versionLister = writeShellScript "btrbk-versionLister" ''
|
||||
echo "# Versions for $1:" >> "$2"
|
||||
${curl}/bin/curl -s https://digint.ch/download/btrbk/releases/ | ${perl}/bin/perl -lne 'print $1 if /btrbk-([0-9.]*)\.tar/'
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A backup tool for btrfs subvolumes";
|
||||
homepage = "https://digint.ch/btrbk";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ asymmetric ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }:
|
||||
{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lesspipe";
|
||||
version = "1.85";
|
||||
|
||||
buildInputs = [ perl ];
|
||||
preConfigure = "patchShebangs .";
|
||||
nativeBuildInputs = [ perl ];
|
||||
buildInputs = [ perl bash ];
|
||||
strictDeps = true;
|
||||
preConfigure = ''
|
||||
patchShebangs --build configure
|
||||
'';
|
||||
configureFlags = [ "--shell=${bash}/bin/bash" "--yes" ];
|
||||
configurePlatforms = [];
|
||||
dontBuild = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wofr06";
|
||||
|
|
@ -20,6 +27,7 @@ stdenv.mkDerivation rec {
|
|||
file = "${file}/bin/file";
|
||||
tput = "${ncurses}/bin/tput";
|
||||
})
|
||||
./override-shell-detection.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
12
pkgs/tools/misc/lesspipe/override-shell-detection.patch
Normal file
12
pkgs/tools/misc/lesspipe/override-shell-detection.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -101,7 +101,8 @@
|
||||
open OUT, ">lesspipe.sh.tmp";
|
||||
my $in = 1;
|
||||
my $anyin;
|
||||
-my $shell = check_shell_vers();
|
||||
+my $shell = $opt_shell;
|
||||
+print OUT "#!$shell\n";
|
||||
# ask if syntax highlighting should be included
|
||||
$ifsyntax = '';
|
||||
if ($opt_yes) {
|
||||
24
pkgs/tools/networking/vopono/default.nix
Normal file
24
pkgs/tools/networking/vopono/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib
|
||||
, fetchCrate
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vopono";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0dsyav755mggnsybj7iwvdqbqzz0gfd3j9vh0hmg5b7pbffanzvy";
|
||||
};
|
||||
|
||||
cargoHash = "sha256:187mi36dgr2f1klqclci175zqgyrm0b6awrcnav63vira7hqz076";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run applications through VPN connections in network namespaces";
|
||||
homepage = "https://github.com/jamesmcm/vopono";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ytcc";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woefe";
|
||||
repo = "ytcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d5zlj5c9n8kq38sq2napc2pnqq866v8jpsyg07q5yjcjwlmihap";
|
||||
sha256 = "1w2frcy51kwsvd486awhpl5kkm11zj1nw3nnv9337316gfs213nw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "auto-cpufreq";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdnanHodzic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0b6j26glg1ffihdr2h7dlr1lrbhkclgp17dxmkjgg5gk4mhz799r";
|
||||
sha256 = "1r27ydv258c6pc82za0wq8q8fj0j3r50c8wxc6r7dwr6wx8q3asx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ click distro psutil ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btop";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Znap1MSWEdKtb9G7+DmfYAhq3q2NfGu1v2cjbYuvUmE=";
|
||||
sha256 = "sha256-navmEd77+LOvCpjPe6dReOYGO1wGRO3OGIv8mC05Kec=";
|
||||
};
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -333,6 +333,8 @@ mapAliases ({
|
|||
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
googleAuthenticator = google-authenticator; # added 2016-10-16
|
||||
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
|
||||
graalvm8 = graalvm8-ce;
|
||||
graalvm11 = graalvm11-ce;
|
||||
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
|
||||
gtk_doc = gtk-doc; # added 2018-02-25
|
||||
guileCairo = guile-cairo; # added 2017-09-24
|
||||
|
|
@ -374,6 +376,7 @@ mapAliases ({
|
|||
jbuilder = dune_1; # added 2018-09-09
|
||||
jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
|
||||
joseki = apache-jena-fuseki; # added 2016-02-28
|
||||
jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
|
||||
json_glib = json-glib; # added 2018-02-25
|
||||
kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
|
||||
k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
|
||||
|
|
@ -569,6 +572,7 @@ mapAliases ({
|
|||
mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
|
||||
multipath_tools = multipath-tools; # added 2016-01-21
|
||||
mupen64plus1_5 = mupen64plus; # added 2016-02-12
|
||||
mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
|
||||
mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
|
||||
mysqlWorkbench = mysql-workbench; # added 2017-01-19
|
||||
nagiosPluginsOfficial = monitoring-plugins;
|
||||
|
|
|
|||
|
|
@ -966,6 +966,8 @@ with pkgs;
|
|||
|
||||
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
|
||||
|
||||
vopono = callPackage ../tools/networking/vopono { };
|
||||
|
||||
xcd = callPackage ../tools/misc/xcd { };
|
||||
|
||||
xtrt = callPackage ../tools/archivers/xtrt { };
|
||||
|
|
@ -12094,14 +12096,6 @@ with pkgs;
|
|||
openjdk = openjdk16;
|
||||
openjdk_headless = openjdk16_headless;
|
||||
|
||||
inherit (callPackages ../development/compilers/graalvm {
|
||||
gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc;
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
CoreFoundation Foundation JavaNativeFoundation
|
||||
JavaVM JavaRuntimeSupport Cocoa;
|
||||
inherit (darwin) libiconv libobjc libresolv;
|
||||
}) mx jvmci8 graalvm8;
|
||||
|
||||
graalvmCEPackages =
|
||||
recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@ in {
|
|||
|
||||
airly = callPackage ../development/python-modules/airly { };
|
||||
|
||||
airthings = callPackage ../development/python-modules/airthings { };
|
||||
airthings-cloud = callPackage ../development/python-modules/airthings-cloud { };
|
||||
|
||||
ajpy = callPackage ../development/python-modules/ajpy { };
|
||||
|
||||
|
|
@ -2418,6 +2418,8 @@ in {
|
|||
|
||||
environmental-override = callPackage ../development/python-modules/environmental-override { };
|
||||
|
||||
environs = callPackage ../development/python-modules/environs { };
|
||||
|
||||
envisage = callPackage ../development/python-modules/envisage { };
|
||||
|
||||
envs = callPackage ../development/python-modules/envs { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue