From 453b11ce4f1d107d3f7b3a75f4746395c659d42b Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 01:53:39 +0000 Subject: [PATCH 01/12] coldsnap: correct license metadata https://github.com/awslabs/coldsnap/blob/v0.5.1/LICENSE --- pkgs/tools/admin/coldsnap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index b9762f0b4b5e..93f9baa3de85 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -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; }; } From 3ceb1a06493487280ca5a2d3fea2942591446e22 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:14:53 +0000 Subject: [PATCH 02/12] ArchiSteamFarm.ui: correct license metadata https://github.com/JustArchiNET/ASF-ui/blob/0dc9b31a571fe840ac1661b9e9777f253304529d/LICENSE --- pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 7d04f3bb9ef7..c04eb6811d0d 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -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; }; From 4a48cc63b827abbabfca169e6a8fe95629a9b24c Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:15:58 +0000 Subject: [PATCH 03/12] nimPackages.tkrzw: correct license metadata https://git.sr.ht/~ehmry/nim-tkrzw/tree/20220922/item/src/tkrzw.nim#L1 --- pkgs/development/nim-packages/tkrzw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/nim-packages/tkrzw/default.nix b/pkgs/development/nim-packages/tkrzw/default.nix index 15a76ae812a0..9f88067f988a 100644 --- a/pkgs/development/nim-packages/tkrzw/default.nix +++ b/pkgs/development/nim-packages/tkrzw/default.nix @@ -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 ]; }; } From c711b865c9042d1426fb4767f47a448aaaa6ebe7 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:18:04 +0000 Subject: [PATCH 04/12] php.extensions.datadog_trace: correct license metadata https://github.com/DataDog/dd-trace-php/blob/0.82.0/LICENSE --- pkgs/development/php-packages/datadog_trace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 8a9447525bba..5e00327af631 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -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; }; } From b52ad16283c16413bed5c82daca0d3bc37b89cef Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:19:12 +0000 Subject: [PATCH 05/12] python3Packages.readability-lxml: correct license metadata https://github.com/buriy/python-readability/blob/v0.8.1/LICENSE --- pkgs/development/python-modules/readability-lxml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index 8f0006a3c0ce..cca38cd71ae5 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -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 ]; }; } From 4e53e0c4a63b8c466e374f42a7b7c907813de3bd Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:20:40 +0000 Subject: [PATCH 06/12] python3Packages.yacs: correct license metadata https://github.com/rbgirshick/yacs/blob/v0.1.8/LICENSE --- pkgs/development/python-modules/yacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix index a105a18b2f65..e5712b240f8c 100644 --- a/pkgs/development/python-modules/yacs/default.nix +++ b/pkgs/development/python-modules/yacs/default.nix @@ -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 ]; }; } From 2632659691b00e66d383ed502a29f269d15db4b5 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:22:50 +0000 Subject: [PATCH 07/12] check-jsonschema: correct license metadata https://github.com/python-jsonschema/check-jsonschema/blob/0.21.0/LICENSE --- pkgs/development/tools/check-jsonschema/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 7c55194bc857..868889648486 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -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 ]; }; } From 9fe79a86b45f305bf705847a3860e83e46913c49 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:26:38 +0000 Subject: [PATCH 08/12] libtapi: correct license metadata https://github.com/tpoechtrager/apple-libtapi/blob/664b8414f89612f2dfd35a9b679c345aa5389026/LICENSE.APPLE-LIBTAPI.txt https://github.com/apple-oss-distributions/tapi/blob/main/LICENSE.TXT --- pkgs/os-specific/darwin/libtapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index d109e0edcbd8..79c159e0635c 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -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 ]; }; } From 8e669c6d1a87ef606d207425be2b4052bcde0095 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:30:32 +0000 Subject: [PATCH 09/12] utm: correct license metadata https://github.com/utmapp/UTM/blob/v4.2.5/LICENSE --- pkgs/os-specific/darwin/utm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index d763414f97c0..2a9879085b0c 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -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 ]; From 6e70ee63ea7a200f6915c1018a56465fc5f51541 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:32:09 +0000 Subject: [PATCH 10/12] keycloak.plugins.keycloak-discord: correct license metadata https://github.com/wadahiro/keycloak-discord/blob/v0.3.1/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java --- pkgs/servers/keycloak/keycloak-discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix index 047bc67fbc56..0605145ff96f 100644 --- a/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -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 ]; }; } From 2b989aea94e251c7d825822f83c460fb5051cd60 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:33:22 +0000 Subject: [PATCH 11/12] keycloak-metrics-spi: correct license metadata https://github.com/aerogear/keycloak-metrics-spi/blob/3.0.0/LICENSE --- pkgs/servers/keycloak/keycloak-metrics-spi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index e8d917fea3bd..28eaec2d5f65 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -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 ]; }; } From a0d6f51e9861059c67f48fbaffc5044c81824da7 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:36:26 +0000 Subject: [PATCH 12/12] zrok: correct license metadata https://github.com/openziti/zrok/blob/v0.3.6/LICENSE --- pkgs/tools/networking/zrok/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 96c4bd89f96d..e76d05c1af13 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -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; }; }