From 8cb2782859ee4dcafbf0f7403c9e41fe7958b91b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 12 Jun 2021 11:01:53 +0000 Subject: [PATCH 1/6] grafanaPlugins.grafana-clock-panel: fix meta.license --- .../monitoring/grafana/plugins/grafana-clock-panel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }; From f605757f38b386a24867c7bcb03d795956d21aa4 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 12 Jun 2021 11:02:01 +0000 Subject: [PATCH 2/6] grafanaPlugins.grafana-piechart-panel: fix meta.license --- .../grafana/plugins/grafana-piechart-panel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..7b8c210909b3 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix @@ -6,7 +6,7 @@ grafanaPlugin rec { zipHash = "sha256-64K/efoBKuBFp8Jw79hTdMyTurTZsL0qfgPDcUWz2jg="; meta = with lib; { description = "Pie chart panel for Grafana"; - license = licenses.asl20; + license = licenses.mit; maintainers = with maintainers; [ lukegb ]; platforms = platforms.unix; }; From c444468ff69cb8f0dcc3c1b909643fdb6219334f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 12 Jun 2021 11:02:09 +0000 Subject: [PATCH 3/6] grafanaPlugins.grafana-worldmap-panel: fix meta.license --- .../grafana/plugins/grafana-worldmap-panel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..8fdee1226fba 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -6,7 +6,7 @@ grafanaPlugin rec { zipHash = "sha256-MGAJzS9X91x6wt305jH1chLoW3zd7pIYDwRnPg9qrgE="; meta = with lib; { description = "World Map panel for Grafana"; - license = licenses.asl20; + license = licenses.mit; maintainers = with maintainers; [ lukegb ]; platforms = platforms.unix; }; From cd48bd0f9abc4486655965ffeb293b82eb55f8f0 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 9 Jun 2021 10:18:04 +0000 Subject: [PATCH 4/6] =?UTF-8?q?grafanaPlugins.grafana-piechart-panel:=201.?= =?UTF-8?q?6.1=20=E2=86=92=201.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grafana/plugins/grafana-piechart-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7b8c210909b3..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,8 +2,8 @@ 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.mit; From e32dc55ffa89cc3ec9c4fc3026166991cd8958b7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 9 Jun 2021 10:18:06 +0000 Subject: [PATCH 5/6] =?UTF-8?q?grafanaPlugins.grafana-worldmap-panel:=200.?= =?UTF-8?q?3.2=20=E2=86=92=200.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grafana/plugins/grafana-worldmap-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8fdee1226fba..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,8 +2,8 @@ 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.mit; From f69ee1e3feef02bbe0a797bbede55435083a096b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 12 Jun 2021 11:07:11 +0000 Subject: [PATCH 6/6] grafanaPlugins: use callPackages This drops dontRecurseIntoAttrs at the same time. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { };