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

Merge pull request #240257 from iliana/asl20-not-apsl20

Browse Source 
treewide: fix incorrect lib.licenses.apsl20 uses
This commit is contained in:
Elis Hirwing 2023-06-28 07:15:38 +02:00 committed by GitHub
commit a0db25cdbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
View File

@ -26,7 +26,7 @@ buildNpmPackage {
meta = with lib; {
description = "The official web interface for ASF";
license = licenses.apsl20;
license = licenses.asl20;
homepage = "https://github.com/JustArchiNET/ASF-ui";
inherit (ArchiSteamFarm.meta) maintainers platforms;
};

2
pkgs/development/nim-packages/tkrzw/default.nix
View File

@ -14,7 +14,7 @@ buildNimPackage rec {
meta = with lib;
src.meta // {
description = "Nim wrappers over some of the Tkrzw C++ library";
license = lib.licenses.apsl20;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ehmry ];
};
}

2
pkgs/development/php-packages/datadog_trace/default.nix
View File

@ -16,7 +16,7 @@ buildPecl rec {
meta = with lib; {
description = "Datadog Tracing PHP Client";
homepage = "https://github.com/DataDog/dd-trace-php";
license = licenses.apsl20;
license = with licenses; [ asl20 /* or */ bsd3 ];
maintainers = teams.php.members;
};
}

2
pkgs/development/python-modules/readability-lxml/default.nix
View File

@ -35,7 +35,7 @@ buildPythonPackage rec {
broken = stdenv.isDarwin;
description = "Fast python port of arc90's readability tool";
homepage = "https://github.com/buriy/python-readability";
license = licenses.apsl20;
license = licenses.asl20;
maintainers = with maintainers; [ siraben ];
};
}

2
pkgs/development/python-modules/yacs/default.nix
View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Yet Another Configuration System";
homepage = "https://github.com/rbgirshick/yacs";
license = licenses.apsl20;
license = licenses.asl20;
maintainers = with maintainers; [ lucasew ];
};
}

2
pkgs/development/tools/check-jsonschema/default.nix
View File

@ -48,7 +48,7 @@ buildPythonApplication rec {
description = "A jsonschema CLI and pre-commit hook";
homepage = "https://github.com/python-jsonschema/check-jsonschema";
changelog = "https://github.com/python-jsonschema/check-jsonschema/blob/${version}/CHANGELOG.rst";
license = licenses.apsl20;
license = licenses.asl20;
maintainers = with maintainers; [ sudosubin ];
};
}

2
pkgs/os-specific/darwin/libtapi/default.nix
View File

@ -71,7 +71,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size";
homepage = "https://github.com/tpoechtrager/apple-libtapi";
license = licenses.apsl20;
license = licenses.ncsa;
maintainers = with maintainers; [ matthewbauer ];
};
}

2
pkgs/os-specific/darwin/utm/default.nix
View File

@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://mac.getutm.app/";
changelog = "https://github.com/utmapp/${pname}/releases/tag/v${version}";
mainProgram = "UTM";
license = licenses.apsl20;
license = licenses.asl20;
platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ rrbutani ];

2
pkgs/servers/keycloak/keycloak-discord/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/wadahiro/keycloak-discord";
description = "Keycloak Social Login extension for Discord";
license = licenses.apsl20;
license = licenses.asl20;
maintainers = with maintainers; [ mkg20001 ];
};
}

2
pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/aerogear/keycloak-metrics-spi";
description = "Keycloak Service Provider that adds a metrics endpoint";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.apsl20;
license = licenses.asl20;
maintainers = with maintainers; [ benley ];
};
}

2
pkgs/tools/admin/coldsnap/default.nix
View File

@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/awslabs/coldsnap";
description = "A command line interface for Amazon EBS snapshots";
changelog = "https://github.com/awslabs/coldsnap/blob/${src.rev}/CHANGELOG.md";
license = licenses.apsl20;
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

2
pkgs/tools/networking/zrok/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.bandresen ];
platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.apsl20;
license = lib.licenses.asl20;
};
}