erlang: 27.3.4.12 -> 27.3.4.13, 28.5.0.1 -> 28.5.0.2, 29.0.1 -> 29.0.2 (#530371)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
genericBuilder:
|
||||
|
||||
genericBuilder {
|
||||
version = "27.3.4.12";
|
||||
hash = "sha256-RnCBGuqEEJ+3kkbiVNLSb8sAh2i9SNyH9ixkqtAbjsk=";
|
||||
version = "27.3.4.13";
|
||||
hash = "sha256-2WF+EWq1S9IaDuUuG8IR09LjYvEq81E88oq6yFazkkM=";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
genericBuilder:
|
||||
|
||||
genericBuilder {
|
||||
version = "28.5.0.1";
|
||||
hash = "sha256-tZQQCBDpDcrN9QX8Qwz6HqNVATck1+emGVOviEhqsLc=";
|
||||
version = "28.5.0.2";
|
||||
hash = "sha256-H25iMB+CvAd8yXv8jydBOCYfMm0LEwN1otRearNthYI=";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
genericBuilder:
|
||||
|
||||
genericBuilder {
|
||||
version = "29.0.1";
|
||||
hash = "sha256-0I82VBCgA8KfdNYkNWyqcH+f0Kc6al11BAErtxfVDZo=";
|
||||
version = "29.0.2";
|
||||
hash = "sha256-6tpe+jCOC1V2SOPMH1J8DHVXQqR4pqEjIiAcSitn8Hc=";
|
||||
}
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
parallelBuild ? true,
|
||||
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
gawk,
|
||||
gnum4,
|
||||
gnused,
|
||||
@@ -112,15 +111,6 @@ stdenv.mkDerivation {
|
||||
++ optionals javacSupport [ openjdk11 ]
|
||||
++ optionals enableSystemd [ systemd ];
|
||||
|
||||
patches = lib.optionals (!wxSupport && major == "27") [
|
||||
# https://github.com/erlang/otp/pull/11162
|
||||
(fetchpatch2 {
|
||||
name = "otp-27-doc-target-fix.patch";
|
||||
url = "https://github.com/erlang/otp/commit/7ce587b61a2557fca79f1c130794abf834f37ee1.patch?full_index=1";
|
||||
hash = "sha256-Ce6tWUzeF6TQMxus7ultxG2piFllw/xa5IPLCxSd024=";
|
||||
})
|
||||
];
|
||||
|
||||
# disksup requires a shell
|
||||
postPatch = ''
|
||||
substituteInPlace lib/os_mon/src/disksup.erl --replace-fail '"sh ' '"${runtimeShell} '
|
||||
|
||||
Reference in New Issue
Block a user