git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #113578 from hercules-ci/cassandra
commit661263d3125568ffeccffeb7ebae0270030560a7 authorSandro <sandro.jaeckel@gmail.com> dateThu 18 Feb 2021, 22:32 (6 years ago) parent268e43ad18e47b
5 files changed+18−5
pkgs/servers/nosql/cassandra/2.1.nix+4 pkgs/servers/nosql/cassandra/2.2.nix+4 pkgs/servers/nosql/cassandra/3.0.nix+2−2 pkgs/servers/nosql/cassandra/3.11.nix+2−2 pkgs/servers/nosql/cassandra/generic.nix+6−1
pkgs/servers/nosql/cassandra/2.1.nix+4
@@ -4,4 +4,8 @@ callPackage ./generic.nix (args // {
44 version = "2.1.22";
55 sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3";
66 generation = "2_1";
7+ extraMeta.knownVulnerabilities = [
8+ # Fixed in 3.* but 2.* hasn't been released since
9+ "CVE-2020-17516"
10+ ];
711})
pkgs/servers/nosql/cassandra/2.2.nix+4
@@ -4,4 +4,8 @@ callPackage ./generic.nix (args // {
44 version = "2.2.14";
55 sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q";
66 generation = "2_2";
7+ extraMeta.knownVulnerabilities = [
8+ # Fixed in 3.* but 2.* hasn't been released since
9+ "CVE-2020-17516"
10+ ];
711})
pkgs/servers/nosql/cassandra/3.0.nix+2−2
@@ -1,7 +1,7 @@
11{ callPackage, ... } @ args:
22
33callPackage ./generic.nix (args // {
4− version = "3.0.23";
5− sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz";
4+ version = "3.0.24";
5+ sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz";
66 generation = "3_0";
77})
pkgs/servers/nosql/cassandra/3.11.nix+2−2
@@ -1,7 +1,7 @@
11{ callPackage, ... } @ args:
22
33callPackage ./generic.nix (args // {
4− version = "3.11.9";
5− sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c";
4+ version = "3.11.10";
5+ sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv";
66 generation = "3_11";
77})
pkgs/servers/nosql/cassandra/generic.nix+6−1
@@ -3,6 +3,7 @@
33# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
44, generation
55, version, sha256
6+, extraMeta ? {}
67, ...
78}:
89
@@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
3031 nativeBuildInputs = [ makeWrapper coreutils ];
3132
3233 installPhase = ''
34+ runHook preInstall
35+
3336 mkdir $out
3437 mv * $out
3538
@@ -85,6 +88,8 @@ stdenv.mkDerivation rec {
8588 done
8689
8790 wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
91+
92+ runHook postInstall
8893 '';
8994
9095 passthru = {
@@ -104,5 +109,5 @@ stdenv.mkDerivation rec {
104109 platforms = platforms.unix;
105110 license = licenses.asl20;
106111 maintainers = [ maintainers.roberth ];
107− };
112+ } // extraMeta;
108113}