diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 024825c9abe0..365c188541b4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -6,7 +6,7 @@ grafanaPlugin rec { zipHash = "sha256-80JaMhY/EduSWvFrScfua99DGhT/FJUqY/kl0CafKCs="; meta = with lib; { description = "Clock panel for Grafana"; - license = licenses.asl20; + license = licenses.mit; maintainers = with maintainers; [ lukegb ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix index 2c44d3a4a062..3787c6cc5e1d 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix @@ -2,11 +2,11 @@ grafanaPlugin rec { pname = "grafana-piechart-panel"; - version = "1.6.1"; - zipHash = "sha256-64K/efoBKuBFp8Jw79hTdMyTurTZsL0qfgPDcUWz2jg="; + version = "1.6.2"; + zipHash = "sha256-xKyVT092Ffgzl0BewQw5iZ14I/q6CviUR5t9BVM0bf0="; meta = with lib; { description = "Pie chart panel for Grafana"; - license = licenses.asl20; + license = licenses.mit; maintainers = with maintainers; [ lukegb ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix index 2f1671750fa5..4060a1c8dd88 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -2,11 +2,11 @@ grafanaPlugin rec { pname = "grafana-worldmap-panel"; - version = "0.3.2"; - zipHash = "sha256-MGAJzS9X91x6wt305jH1chLoW3zd7pIYDwRnPg9qrgE="; + version = "0.3.3"; + zipHash = "sha256-3n1p3SvcBQMmnbnHimLBP7hauVV1IS3SMwttUWTNvb8="; meta = with lib; { description = "World Map panel for Grafana"; - license = licenses.asl20; + license = licenses.mit; maintainers = with maintainers; [ lukegb ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd885a03b8e7..c5fd86d0ebf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19247,7 +19247,7 @@ in gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { }; - grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { }); + grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; grafana-agent = callPackage ../servers/monitoring/grafana-agent { };