Unverified Commit 4984613a authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #251812 from LeSuisse/licenses-elv2 

lib/licenses: add Elastic License 2.0, drop Elastic License
parents a08e6c27 e39d5799

lib/licenses.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

  };

pkgs/development/tools/bearer/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

  };

}

pkgs/development/tools/misc/kibana/7.x.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };

pkgs/servers/http/router/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

  };

}

pkgs/servers/search/elasticsearch/7.x.nix

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec { 
      binaryBytecode

      binaryNativeCode

    ];

    license = licenses.elastic;

    license = licenses.elastic20;

    platforms = platforms.unix;

    maintainers = with maintainers; [ apeschar basvandijk ];

  };