cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #289520 from vaci/vaci/aeron-143

Browse source 
aeron, aeron-cpp: 1.42.1 -> 1.43.0
This commit is contained in:
Peder Bergebakken Sundt 2024-04-17 22:24:05 +02:00 committed by GitHub
commit 0edd8f2a9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/by-name/ae/aeron-cpp/package.nix
View file

@ -1,5 +1,6 @@
{
autoPatchelfHook,
aeron,
cmake,
fetchFromGitHub,
fetchMavenArtifact,
@ -14,23 +15,16 @@
}:
let
version = "1.42.1";
version = aeron.version;
aeronAll = fetchMavenArtifact {
artifactId = "aeron-all";
groupId = "io.aeron";
inherit version;
hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA==";
};
sbeAll_1_29_0 = fetchMavenArtifact {
sbeAll_1_30_0 = fetchMavenArtifact {
groupId = "uk.co.real-logic";
version = "1.29.0";
version = "1.30.0";
artifactId = "sbe-all";
hash = "sha512-exklKS9MgOH369lyuv+5vAWRHt+Iwg/FmsWy8PsSMjenvjs8I2KA1VTa00pIXkw/YNqbUDBIWvS07b4mS8YdPQ==";
hash = "sha512-K/LMP6zNBHl2Wpvli/sH+ZsYwlTPJHHCKee7riOH6dR8nxTJgucnF7AsbVOpowR6xaV3wPjFh0iqWp/oerHKBg==";
};
sbeAll = sbeAll_1_29_0;
sbeAll = sbeAll_1_30_0;
in
@ -42,7 +36,7 @@ stdenv.mkDerivation {
owner = "real-logic";
repo = "aeron";
rev = version;
hash = "sha256-ODJeJ4XLazPeNLdzaoclPnE59NpxFUqZu3Aw3iTVQT8=";
hash = "sha256-MY7I8Cw1izVLW3/JWav9zPIBJTGInZHwAZT2e7tI9F0=";
};
patches = [
@ -54,7 +48,6 @@ stdenv.mkDerivation {
];
buildInputs = [
jdk11
libbsd
libuuid
zlib
@ -63,6 +56,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
cmake
jdk11
makeWrapper
patchelf
];
@ -89,7 +83,7 @@ stdenv.mkDerivation {
buildPhase = ''
runHook preBuild
ln --symbolic "${aeronAll.jar}" ./aeron-all.jar
ln --symbolic "${aeron.jar}" ./aeron-all.jar
ln --symbolic "${sbeAll.jar}" ./sbe.jar
mkdir --parents aeron-all/build/libs
(

103
pkgs/servers/aeron/default.nix
View file

@ -8,7 +8,7 @@
let
pname = "aeron";
version = "1.42.1";
version = "1.43.0";
groupId = "io.aeron";
aeronAll_1_40_0 = fetchMavenArtifact {
@ -18,41 +18,6 @@ let
hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA==";
};
aeronAgent_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-agent";
hash = "sha512-3XZ6XxPwlNchMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg==";
};
aeronArchive_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-archive";
hash = "sha512-tmH+/020d1iNkGb8nvenDG9YU+H4PLuO2hSm2dULUIjSXX5AHLDkkrQ3uVQADV9koRNMtC4UXloqtqncay18kQ==";
};
aeronClient_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-client";
hash = "sha512-y3/8Lu2EgMICRNPEWe0hrKpVhF35pDjCO6ip/Af9nPZ70ZRqGmlfEG7OzWVok11DuI8pYJ64jv6bEtUfSHTYXQ==";
};
aeronCluster_1_40_0 =fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-cluster";
hash = "sha512-28m14Etjse3MVKBLvaQONujMfvdRQZG0ArezzVcjPEqVqTGd33mrqjPngALV8CG2nJTtcrJmsieRGLEosaXqTw==";
};
aeronDriver_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-driver";
hash = "sha512-SRWHMHR6J1YEtCbSHqSLYm3vo8XgkVXGK3cFQbONT60TZvawP5UlZs7e3eFNpu3qQSA4prqEjjWO9Xc9M/sjKw==";
};
aeronSamples_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
@ -63,44 +28,10 @@ let
aeronAll_1_42_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
inherit version;
version = "1.42.1";
hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA==";
};
aeronAgent_1_42_1 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
artifactId = "aeron-agent";
hash = "sha512-3XZ6XvPwlNdiMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg==";
};
aeronArchive_1_42_1 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
artifactId = "aeron-archive";
hash = "sha512-1DmeI9flgfzanbP4jSNUSAQAv2SGBvnlb3G4LbO1m+BN/gPn/nahvVHzotvGJjJA5b65DE1Sc5tqPnItRTK0zQ==";
};
aeronClient_1_42_1 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
artifactId = "aeron-client";
hash = "sha512-td2k2WNpaD3+2PNvlCCJ8cZRr615sFjngiQDKzuY2e9/de1OUwvER3zzVAFOonEIV+s5EhwVeQvWq3Wj5Uhadg==";
};
aeronCluster_1_42_1 =fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
artifactId = "aeron-cluster";
hash = "sha512-RiqGeY3pRqN6wWpeJqbeB1SCxrZWnQghrJlCGhew2M/GZAaWHkhhJs5haJqRvR5oOAbaI4RfIWvi5U7TiUo88g==";
};
aeronDriver_1_42_1 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
artifactId = "aeron-driver";
hash = "sha512-fKEN5oQCxD1h3qPODKkqFwYbKW6L03RFHNylpsYaNlztNODlCJd0CS5dBR6K8rbOdb2dVIXK/dW/IPBvOi5q/g==";
};
aeronSamples_1_42_1 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
@ -108,12 +39,22 @@ let
hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg==";
};
aeronAll = aeronAll_1_42_1;
aeronArchive = aeronArchive_1_42_1;
aeronClient = aeronClient_1_42_1;
aeronCluster = aeronCluster_1_42_1;
aeronDriver= aeronDriver_1_42_1;
aeronSamples = aeronSamples_1_42_1;
aeronAll_1_43_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.43.0";
hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q==";
};
aeronSamples_1_43_0 = fetchMavenArtifact {
inherit groupId;
version = "1.43.0";
artifactId = "aeron-samples";
hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg==";
};
aeronAll = aeronAll_1_43_0;
aeronSamples = aeronSamples_1_43_0;
in stdenv.mkDerivation {
@ -121,10 +62,6 @@ in stdenv.mkDerivation {
buildInputs = [
aeronAll
aeronArchive
aeronClient
aeronCluster
aeronDriver
aeronSamples
];
@ -141,10 +78,6 @@ in stdenv.mkDerivation {
mkdir --parents "$out/share/java"
ln --symbolic "${aeronAll.jar}" "$out/share/java/${pname}-all.jar"
ln --symbolic "${aeronArchive.jar}" "$out/share/java/${pname}-archive.jar"
ln --symbolic "${aeronClient.jar}" "$out/share/java/${pname}-client.jar"
ln --symbolic "${aeronCluster.jar}" "$out/share/java/${pname}-cluster.jar"
ln --symbolic "${aeronDriver.jar}" "$out/share/java/${pname}-driver.jar"
ln --symbolic "${aeronSamples.jar}" "$out/share/java/${pname}-samples.jar"
runHook postInstall