Merge pull request #251812 from LeSuisse/licenses-elv2
lib/licenses: add Elastic License 2.0, drop Elastic License
This commit is contained in:
commit
4984613adb
@ -413,9 +413,9 @@ in mkLicense lset) ({
|
||||
fullName = "Eiffel Forum License v2.0";
|
||||
};
|
||||
|
||||
elastic = {
|
||||
fullName = "ELASTIC LICENSE";
|
||||
url = "https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt";
|
||||
elastic20 = {
|
||||
fullName = "Elastic License 2.0";
|
||||
url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt";
|
||||
free = false;
|
||||
};
|
||||
|
||||
|
@ -39,7 +39,7 @@ buildGoModule rec {
|
||||
description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks";
|
||||
homepage = "https://github.com/bearer/bearer";
|
||||
changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}";
|
||||
license = with licenses; [ elastic ];
|
||||
license = with licenses; [ elastic20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Visualize logs and time-stamped data";
|
||||
homepage = "http://www.elasticsearch.org/overview/kibana";
|
||||
license = licenses.elastic;
|
||||
license = licenses.elastic20;
|
||||
maintainers = with maintainers; [ offline basvandijk ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A configurable, high-performance routing runtime for Apollo Federation";
|
||||
homepage = "https://www.apollographql.com/docs/router/";
|
||||
license = licenses.elastic;
|
||||
license = licenses.elastic20;
|
||||
maintainers = [ maintainers.bbigras ];
|
||||
};
|
||||
}
|
||||
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
license = licenses.elastic;
|
||||
license = licenses.elastic20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ apeschar basvandijk ];
|
||||
};
|
||||
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
description = "Infra manages access to infrastructure such as Kubernetes";
|
||||
homepage = "https://github.com/infrahq/infra";
|
||||
changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.elastic;
|
||||
license = licenses.elastic20;
|
||||
maintainers = with maintainers; [ peterromfeldhk ];
|
||||
};
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ let
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
binaryNativeCode # bundled jruby includes native code
|
||||
];
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
license = if enableUnfree then licenses.elastic20 else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wjlroe offline basvandijk ];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user