Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8cc0692fc1d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 89e6170b755b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 29, 2019

  1. atlassian-crowd: 3.4.3 -> 3.4.4 

    (cherry picked from commit 301c7a1)
    @ciil @fpletz
    ciil authored and fpletz committed May 29, 2019
    Copy the full SHA
    7113368 View commit details

  2. grafana: 6.2.0 -> 6.2.1 

    (cherry picked from commit 129a77e)
    @WilliButz @fpletz
    WilliButz authored and fpletz committed May 29, 2019
    Copy the full SHA
    89e6170 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/servers/atlassian/crowd.nix
  2. +3 −3 pkgs/servers/monitoring/grafana/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/crowd.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "atlassian-crowd-${version}";
version = "3.4.3";
version = "3.4.4";

src = fetchurl {
url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
sha256 = "0swp41lr7n318jxl61w5c09485ygn261zc74p7xaisrwmh9ygyzs";
sha256 = "0bs3l2s5f8ymyvvxn6z3wwccbvac42giahmfqiam51m9zkfhf0rk";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

buildGoPackage rec {
version = "6.2.0";
version = "6.2.1";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";

@@ -11,12 +11,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "18zig7r3kq1a3src0yb8fbajnm2hqzpzpmpjarslnp4xv90xqi87";
sha256 = "04db47rv8mp7l167v7krmkmxl7v4b9cd9r9kx4gqavgp6mdhrln8";
};

srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1cy3d04jjr5h8pzfzqb710rlynh9n125imkisrg05dwz5gl99bd7";
sha256 = "1zmmn6j3n4ygc3jjy47xcq31d9ydfbw4q2j5327zrw1msy389xj1";
};

postPatch = ''