Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d0025b4596c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a5249ecfe78
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 4, 2021

  1. grafana: 7.3.7 -> 7.4.0 

    https://github.com/grafana/grafana/releases/tag/v7.4.0
https://github.com/grafana/grafana/releases/tag/v7.4.0-beta1
(cherry picked from commit c22ad9c)
    @WilliButz @Ma27
    WilliButz authored and Ma27 committed Feb 4, 2021
    Copy the full SHA
    1a5249e View commit details
Showing with 11 additions and 5 deletions.
  1. +10 −4 pkgs/servers/monitoring/grafana/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
14 changes: 10 additions & 4 deletions pkgs/servers/monitoring/grafana/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,29 +2,35 @@

buildGoModule rec {
pname = "grafana";
version = "7.3.7";
version = "7.4.0";

excludedPackages = [ "release_publisher" ];

src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "134x2jqrczp5qfa2rmqc7jikv3w258kks532jp1qi65qk7w7jhb9";
sha256 = "0mdk3f237gvyjw8fxppfwzs8smhrnrj5aqc2wsykclrl52h5mv2z";
};

srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "052r9gajggd9jlwnl82hq0jflhlz7cbdflkjapq4nx3rpnfscqgp";
sha256 = "1dc03d5hg7f2s9lrqycxm08ry8plkx8lkrfm4q3gjk1cvf5zjwzd";
};

vendorSha256 = "0474d5y40q7i7k1gm1k7ac1dqhizvqql8w9nn44qxb7g2w2bfqiv";
vendorSha256 = "0m39dw4raqzm7zxcbncdxf7br5j173czl62xsp94q4g2h719mc9a";

postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \
--replace 'var version = "5.0.0"' 'var version = "${version}"'
'';

# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas
preBuild = ''
rm -r dashboard-schemas scripts/go
'';

postInstall = ''
tar -xvf $srcStatic
mkdir -p $out/share/grafana
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16417,7 +16417,7 @@ in
gofish = callPackage ../servers/gopher/gofish { };

grafana = callPackage ../servers/monitoring/grafana {
buildGoModule = buildGo114Module;
buildGoModule = buildGo115Module;
};

grafana-agent = callPackage ../servers/monitoring/grafana-agent { };