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: b50443b5c4ac
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: 0c0de21b471a
Choose a head ref
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Apr 26, 2018

  1. Revert "release-combined: don't include tests.chromium" 

    This reverts commit f7c8e08.
We now get a build and maybe have a workaround (grandparent commit); /cc #39476.
    @vcunat
    vcunat committed Apr 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9bdca39 View commit details

  2. grafana: 5.0.4 -> 5.1.0 

    (cherry picked from commit f925480)
    @WilliButz @fpletz
    WilliButz authored and fpletz committed Apr 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3376287 View commit details

  3. nixos/caddy: fix ca api endpoint, now uses v2 

    (cherry picked from commit dc62e85)
    @fpletz
    fpletz committed Apr 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    87f64fb View commit details

  4. pssh: add explicit references to openssh and rsync 

    (cherry picked from commit 1ae220b)
    @fpletz
    fpletz committed Apr 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d12f6e4 View commit details

  5. smcroute: fix smcroutectl 

    (cherry picked from commit 70bcb50)
    @fpletz
    fpletz committed Apr 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c0de21 View commit details
4 changes: 2 additions & 2 deletions nixos/modules/services/web-servers/caddy.nix
View file
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ in {
};

ca = mkOption {
default = "https://acme-v01.api.letsencrypt.org/directory";
example = "https://acme-staging.api.letsencrypt.org/directory";
default = "https://acme-v02.api.letsencrypt.org/directory";
example = "https://acme-staging-v02.api.letsencrypt.org/directory";
type = types.string;
description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people.";
};
2 changes: 1 addition & 1 deletion nixos/release-combined.nix
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ in rec {
nixos.ova.x86_64-linux or []

#(all nixos.tests.containers)
#nixos.tests.chromium.x86_64-linux or []
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.gnome3)
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,20 +1,20 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

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

src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90";
sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f";
};

srcStatic = fetchurl {
url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc";
sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z";
};

preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
10 changes: 8 additions & 2 deletions pkgs/servers/smcroute/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }:

stdenv.mkDerivation rec {
name = "smcroute-${version}";
@@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r";
};

nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libcap ];

configureFlags = [
"--localstatedir=/var"
"--with-systemd=\$(out)/lib/systemd/system"
];

meta = with stdenv.lib; {
description = "Static multicast routing daemon";
11 changes: 10 additions & 1 deletion pkgs/tools/networking/pssh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }:

pythonPackages.buildPythonApplication rec {
name = "pssh-${version}";
@@ -11,6 +11,15 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";
};

postPatch = ''
for f in bin/*; do
substituteInPlace $f \
--replace "'ssh'" "'${openssh}/bin/ssh'" \
--replace "'scp'" "'${openssh}/bin/scp'" \
--replace "'rsync'" "'${rsync}/bin/rsync'"
done
'';

meta = with stdenv.lib; {
description = "Parallel SSH Tools";
longDescription = ''