From 658d3e9af8de1b25b172e531fbb24fe749ce344c Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 2 Jan 2022 15:23:43 +0100 Subject: [PATCH] Treewide: fix wrong declaration of Apache License 2.0 These packages were announced as published under Apple Public Source License 2.0 ('apsl20' short handle) but they are actually published under the Apache License 2.0 ('asl20' short handle) --- pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix | 2 +- pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix | 2 +- .../networking/cluster/helm/plugins/helm-secrets.nix | 2 +- pkgs/applications/networking/cluster/kbst/default.nix | 2 +- pkgs/development/libraries/xed/default.nix | 2 +- pkgs/development/tools/go-containerregistry/default.nix | 2 +- pkgs/tools/admin/synapse-admin/default.nix | 2 +- pkgs/tools/security/snow/default.nix | 2 +- pkgs/tools/system/bpytop/default.nix | 2 +- pkgs/tools/virtualization/ec2instanceconnectcli/default.nix | 2 +- pkgs/tools/virtualization/lxd-image-server/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 3f340b0e522..09de0219c7e 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -28,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; inherit (src.meta) homepage; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 81e0d07d0bb..b6a47ec9dd5 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; inherit (src.meta) homepage; - license = licenses.apsl20; + license = licenses.mit; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index cd1e6ece437..a16472413f3 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Helm plugin that helps manage secrets"; inherit (src.meta) homepage; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/cluster/kbst/default.nix b/pkgs/applications/networking/cluster/kbst/default.nix index 3787c346267..9a949bc8c80 100644 --- a/pkgs/applications/networking/cluster/kbst/default.nix +++ b/pkgs/applications/networking/cluster/kbst/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { meta = with lib; { description = "Kubestack framework CLI"; homepage = "https://www.kubestack.com/"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ mtrsk ]; }; } diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix index 395b399d8fe..d8994581913 100644 --- a/pkgs/development/libraries/xed/default.nix +++ b/pkgs/development/libraries/xed/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; }; diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index 086cd5d05a5..4aefc02e152 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { meta = with lib; { description = "Tools for interacting with remote images and registries including crane and gcrane"; homepage = "https://github.com/google/go-containerregistry"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/tools/admin/synapse-admin/default.nix index 8ca0816f9e4..4248e62adeb 100644 --- a/pkgs/tools/admin/synapse-admin/default.nix +++ b/pkgs/tools/admin/synapse-admin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Admin UI for Synapse Homeservers"; homepage = "https://github.com/Awesome-Technologies/synapse-admin"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mkg20001 ]; }; diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/tools/security/snow/default.nix index 6d264c09ade..6dce95f8cf0 100644 --- a/pkgs/tools/security/snow/default.nix +++ b/pkgs/tools/security/snow/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Conceal messages in ASCII text by appending whitespace to the end of lines"; homepage = "http://www.darkside.com.au/snow/"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ siraben ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index eb0630d33ee..f0df9fa2e31 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A resource monitor; python port of bashtop"; homepage = src.meta.homepage; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ aw ]; platforms = with platforms; linux ++ freebsd ++ darwin; diff --git a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix index 16c10b5ae7f..1ce3c5d2f1b 100644 --- a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix +++ b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command Line Interface for AWS EC2 Instance Connect"; homepage = "https://github.com/aws/aws-ec2-instance-connect-cli"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/pkgs/tools/virtualization/lxd-image-server/default.nix b/pkgs/tools/virtualization/lxd-image-server/default.nix index 3992f425a3c..3a1d32247a4 100644 --- a/pkgs/tools/virtualization/lxd-image-server/default.nix +++ b/pkgs/tools/virtualization/lxd-image-server/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Creates and manages a simplestreams lxd image server on top of nginx"; homepage = "https://github.com/Avature/lxd-image-server"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; };