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: cdf5eca5b505
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: b0c285807d6a
Choose a head ref
  • 5 commits
  • 4 files changed
  • 5 contributors

Commits on Mar 28, 2020

  1. nixos/alertmanager: start after the network-online target 

    If the host network stack is slow to start, the alertmanager fails to
start with this error message:

    caller=main.go:256 msg="unable to initialize gossip mesh" err="create memberlist: Failed to get final advertise address: No private IP address found, and explicit IP not provided"

This bug can be reproduced by shutting down the network stack and
restarting the alertmanager.

Note I don't know why I didn't hit this issue with previous
alertmanager releases.

(cherry picked from commit 39621bb)
    @nlewo
    nlewo committed Mar 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d87fea7 View commit details

  2. atlassian-jira: 8.7.0 -> 8.7.1 

    (cherry picked from commit 26a31f8)
    @r-ryantm @globin
    r-ryantm authored and globin committed Mar 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d7d7a34 View commit details

  3. atlassian-jira: 8.7.1 -> 8.8.0 (#83218) 

    fix not starting service when jdk is jdk11

(cherry picked from commit 758f81d)
    @basilgood @globin
    basilgood authored and globin committed Mar 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f1c1247 View commit details

  4. atlassian-confluence: 7.2.1 -> 7.3.4 

    (cherry picked from commit 5dbeb69)
    @ajs124 @globin
    ajs124 authored and globin committed Mar 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24b17c2 View commit details

  5. antimony: 2019-10-30 -> 2020-03-28 

    (cherry picked from commit 9c7c0e1)

ZHF: #80379
Fix build.
    @rnhmjoj
    rnhmjoj committed Mar 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b0c2858 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/monitoring/prometheus/alertmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ in {

systemd.services.alertmanager = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
after = [ "network-online.target" ];
preStart = ''
${lib.getBin pkgs.envsubst}/bin/envsubst -o "/tmp/alert-manager-substituted.yaml" \
-i "${alertmanagerYml}"
11 changes: 5 additions & 6 deletions pkgs/applications/graphics/antimony/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@
}:

let
gitRev = "6dfe6822e0279a4cc2f1c60e85b42212627285fe";
gitRev = "8fb4b0929ce84cf375bfb83a9d522ccd80681eaf";
gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation {
pname = "antimony";
version = "2019-10-30";
version = "2020-03-28";

src = fetchFromGitHub {
owner = "mkeeter";
repo = "antimony";
rev = gitRev;
sha256 = "07zlkwlk79czq8dy85b6n3ds3g36l8qy4ix849ady6ia3gm8981j";
sha256 = "1s0zmq5jmhmb1wcsyaxfmii448g6x8b41mzvb1awlljj85qj0k2s";
};

patches = [ ./paths-fix.patch ];
@@ -29,11 +29,10 @@ in

buildInputs = [
libpng python3 python3.pkgs.boost
libGLU libGL qtbase wrapQtAppsHook
ncurses
libGLU libGL qtbase ncurses
];

nativeBuildInputs = [ cmake flex lemon ];
nativeBuildInputs = [ cmake flex lemon wrapQtAppsHook ];

cmakeFlags= [
"-DGITREV=${gitRev}"
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);

stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
version = "7.2.1";
version = "7.3.4";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "1d37hiabph56frsp8jrn80fmglgw6k1dlc4x8p7m82fb3vild049";
sha256 = "13d0vnsvyl8cjdxnp2w284814bnqgbksl8mq7lkjms1x083mhnzi";
};

buildPhase = ''
11 changes: 8 additions & 3 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{ stdenv, lib, fetchurl
{ stdenv
, lib
, fetchurl
, gawk
, enableSSO ? false
, crowdProperties ? null
}:

stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.7.0";
version = "8.8.0";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0k3z4j5pp0xx8qq5clr3069449w5k43gzag60jv3dzq35586yvdi";
sha256 = "1gn0iknli8pi3c3kxb8hdn19wzn2fx0193ppf0niw3cqf1h2c5cz";
};

buildPhase = ''
@@ -18,6 +21,8 @@ stdenv.mkDerivation rec {
rm -r logs; ln -sf /run/atlassian-jira/logs/ .
rm -r work; ln -sf /run/atlassian-jira/work/ .
rm -r temp; ln -sf /run/atlassian-jira/temp/ .
substituteInPlace bin/check-java.sh \
--replace "awk" "${gawk}/bin/gawk"
'' + lib.optionalString enableSSO ''
substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
--replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \