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: e9ba8d936e9c
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: ec1ee660c995
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 16, 2018

  1. dunst: add wrapper to find librsvg (#40050) 

    (cherry picked from commit e3b3eac and
resolved merge conflict)
    @rycee @xeji
    rycee authored and xeji committed May 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee951c3 View commit details

  2. nixos/tests/mesos: wait for all services and ports 

    to be available before sending requests.
Avoids non-deterministic test failure.

(cherry picked from commit 0d2a4ed)
    @xeji
    xeji committed May 16, 2018
    Copy the full SHA
    345f14e View commit details

  3. nixos/mesos-slave: start after docker 

    If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"

(cherry picked from commit ec00b6f)
    @xeji
    xeji committed May 16, 2018
    Copy the full SHA
    ec1ee66 View commit details
Showing with 11 additions and 4 deletions.
  1. +1 −1 nixos/modules/services/misc/mesos-slave.nix
  2. +3 −1 nixos/tests/mesos.nix
  3. +7 −2 pkgs/applications/misc/dunst/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/mesos-slave.nix
View file
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ in {
systemd.services.mesos-slave = {
description = "Mesos Slave";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
path = [ pkgs.stdenv.shellPackage ];
serviceConfig = {
ExecStart = ''
4 changes: 3 additions & 1 deletion nixos/tests/mesos.nix
View file
Original file line number Diff line number Diff line change
@@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
testScript =
''
startAll;
$master->waitForUnit("zookeeper.service");
$master->waitForUnit("mesos-master.service");
$slave->waitForUnit("docker.service");
$slave->waitForUnit("mesos-slave.service");
$master->waitForOpenPort(2181);
$master->waitForOpenPort(5050);
$slave->waitForOpenPort(5051);
9 changes: 7 additions & 2 deletions pkgs/applications/misc/dunst/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, pkgconfig, which, perl, libXrandr
, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz";
};

nativeBuildInputs = [ perl pkgconfig which systemd ];
nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];

buildInputs = [
cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
];

postInstall = ''
wrapProgram $out/bin/dunst \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';

meta = with stdenv.lib; {
description = "Lightweight and customizable notification daemon";
homepage = https://dunst-project.org/;