Merge pull request #113578 from hercules-ci/cassandra

This commit is contained in:
Sandro 2021-02-18 22:32:25 +01:00 committed by GitHub
commit 661263d312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 5 deletions

View File

@ -4,4 +4,8 @@ callPackage ./generic.nix (args // {
version = "2.1.22"; version = "2.1.22";
sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3"; sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3";
generation = "2_1"; generation = "2_1";
extraMeta.knownVulnerabilities = [
# Fixed in 3.* but 2.* hasn't been released since
"CVE-2020-17516"
];
}) })

View File

@ -4,4 +4,8 @@ callPackage ./generic.nix (args // {
version = "2.2.14"; version = "2.2.14";
sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q";
generation = "2_2"; generation = "2_2";
extraMeta.knownVulnerabilities = [
# Fixed in 3.* but 2.* hasn't been released since
"CVE-2020-17516"
];
}) })

View File

@ -1,7 +1,7 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
version = "3.0.23"; version = "3.0.24";
sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz";
generation = "3_0"; generation = "3_0";
}) })

View File

@ -1,7 +1,7 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
version = "3.11.9"; version = "3.11.10";
sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c"; sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv";
generation = "3_11"; generation = "3_11";
}) })

View File

@ -3,6 +3,7 @@
# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11 # generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
, generation , generation
, version, sha256 , version, sha256
, extraMeta ? {}
, ... , ...
}: }:
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper coreutils ]; nativeBuildInputs = [ makeWrapper coreutils ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir $out mkdir $out
mv * $out mv * $out
@ -85,6 +88,8 @@ stdenv.mkDerivation rec {
done done
wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
runHook postInstall
''; '';
passthru = { passthru = {
@ -104,5 +109,5 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.roberth ]; maintainers = [ maintainers.roberth ];
}; } // extraMeta;
} }