JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #251812 from LeSuisse/licenses-elv2

Browse Source 
lib/licenses: add Elastic License 2.0, drop Elastic License
This commit is contained in:
Fabian Affolter 2023-10-02 22:11:16 +02:00 committed by GitHub
commit 4984613adb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats 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";
};
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;
};

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";
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 ];
};
}

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

@ -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;
};

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

@ -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 ];
};
}

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

@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
binaryBytecode
binaryNativeCode
];
license = licenses.elastic;
license = licenses.elastic20;
platforms = platforms.unix;
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";
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 ];
};
}

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

@ -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 ];
};