commit 5ea2c874645bea73427dca9a80384bcf5579f62b · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/monitoring/grafana.nix

···

       249
       249
        
             };

     

       250
       250
        
             preStart = ''

     

       251
       251
        
               ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir}

     

       252
       252
       -
               ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir}

     

       252
       252
       +
               ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir}

     

       253
       253
        
             '';

     

       254
       254
        
           };

     

       255
       255

+5 -5

pkgs/servers/monitoring/grafana/default.nix

···

       1
       1
        
       { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
       -
         version = "4.6.3";

     

       4
       4
       +
         version = "5.0.0";

     

       5
       5
        
         name = "grafana-${version}";

     

       6
       6
        
         goPackagePath = "github.com/grafana/grafana";

     

       7
       7
        
       

     
···

       9
       9
        
           rev = "v${version}";

     

       10
       10
        
           owner = "grafana";

     

       11
       11
        
           repo = "grafana";

     

       12
       12
       -
           sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j";

     

       12
       12
       +
           sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         srcStatic = fetchurl {

     

       16
       16
        
           url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";

     

       17
       17
       -
           sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03";

     

       17
       17
       +
           sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

     

       21
       21
        
         postInstall = ''

     

       22
       22
        
           tar -xvf $srcStatic

     

       23
       23
        
           mkdir -p $bin/share/grafana

     

       24
       24
       -
           mv grafana-*/{public,conf,vendor} $bin/share/grafana/

     

       25
       25
       -
           ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs

     

       24
       24
       +
           mv grafana-*/{public,conf,tools} $bin/share/grafana/

     

       25
       25
       +
           ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         meta = with lib; {