movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib/licenses: add Elastic License 2.0, drop Elastic License

Browse source 
This license was introduced in the Elastic search repository by this
commit: a92a647b9f

It appears that all the the packages in nixpkgs using the Elastic License are using the v2.0.
This commit is contained in:
Thomas Gerbet 2023-08-27 18:29:26 +02:00
parent 1915b69aca
commit e39d579918
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/licenses.nix
View file

@ -413,9 +413,9 @@ in mkLicense lset) ({
fullName = "Eiffel Forum License v2.0"; fullName = "Eiffel Forum License v2.0";
}; };
elastic = { elastic20 = {
fullName = "ELASTIC LICENSE"; fullName = "Elastic License 2.0";
url = "https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt"; url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt";
free = false; free = false;
}; };

2
pkgs/development/tools/bearer/default.nix
View file

@ -39,7 +39,7 @@ buildGoModule rec {
description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks"; description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks";
homepage = "https://github.com/bearer/bearer"; homepage = "https://github.com/bearer/bearer";
changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}"; changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}";
license = with licenses; [ elastic ]; license = with licenses; [ elastic20 ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };
} }

2
pkgs/development/tools/misc/kibana/7.x.nix
View file

@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Visualize logs and time-stamped data"; description = "Visualize logs and time-stamped data";
homepage = "http://www.elasticsearch.org/overview/kibana"; homepage = "http://www.elasticsearch.org/overview/kibana";
license = licenses.elastic; license = licenses.elastic20;
maintainers = with maintainers; [ offline basvandijk ]; maintainers = with maintainers; [ offline basvandijk ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };

2
pkgs/servers/http/router/default.nix
View file

@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A configurable, high-performance routing runtime for Apollo Federation"; description = "A configurable, high-performance routing runtime for Apollo Federation";
homepage = "https://www.apollographql.com/docs/router/"; homepage = "https://www.apollographql.com/docs/router/";
license = licenses.elastic; license = licenses.elastic20;
maintainers = [ maintainers.bbigras ]; maintainers = [ maintainers.bbigras ];
}; };
} }

2
pkgs/servers/search/elasticsearch/7.x.nix
View file

@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
binaryBytecode binaryBytecode
binaryNativeCode binaryNativeCode
]; ];
license = licenses.elastic; license = licenses.elastic20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ apeschar basvandijk ]; maintainers = with maintainers; [ apeschar basvandijk ];
}; };

2
pkgs/tools/admin/infra/default.nix
View file

@ -21,7 +21,7 @@ buildGoModule rec {
description = "Infra manages access to infrastructure such as Kubernetes"; description = "Infra manages access to infrastructure such as Kubernetes";
homepage = "https://github.com/infrahq/infra"; homepage = "https://github.com/infrahq/infra";
changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md"; changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md";
license = licenses.elastic; license = licenses.elastic20;
maintainers = with maintainers; [ peterromfeldhk ]; maintainers = with maintainers; [ peterromfeldhk ];
}; };
} }

2
pkgs/tools/misc/logstash/7.x.nix
View file

@ -72,7 +72,7 @@ let
binaryBytecode # source bundles dependencies as jars binaryBytecode # source bundles dependencies as jars
binaryNativeCode # bundled jruby includes native code 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; platforms = platforms.unix;
maintainers = with maintainers; [ wjlroe offline basvandijk ]; maintainers = with maintainers; [ wjlroe offline basvandijk ];
}; };