Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fa6c93abe5c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfc2ea774e8a
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 25, 2019

  1. spdlog: 1.2.1 -> 1.3.1

    @minijackson
    minijackson committed May 25, 2019
    Copy the full SHA
    a528351 View commit details

  2. waybar: 0.6.5 -> 0.6.6

    @minijackson
    minijackson committed May 25, 2019
    Copy the full SHA
    370a81d View commit details

Commits on May 26, 2019

  1. Merge pull request #62057 from minijackson/waybar-0.6.6 

    spdlog: 1.2.1 -> 1.3.1 ; waybar: 0.6.5 -> 0.6.6
    @aanderse
    aanderse authored May 26, 2019
    Copy the full SHA
    bfc2ea7 View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/applications/misc/waybar/default.nix
  2. +3 −3 pkgs/development/libraries/spdlog/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/misc/waybar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja
, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt
, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? false, libpulseaudio
, nlSupport ? true, libnl
@@ -9,21 +9,21 @@
}:
stdenv.mkDerivation rec {
name = "waybar-${version}";
version = "0.6.5";
version = "0.6.6";

src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z";
sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1";
};

nativeBuildInputs = [
meson ninja pkgconfig
];

buildInputs = with stdenv.lib;
[ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ]
[ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ]
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional nlSupport libnl
6 changes: 3 additions & 3 deletions pkgs/development/libraries/spdlog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ let

nativeBuildInputs = [ cmake ];

cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ];
cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ];

outputs = [ "out" "doc" ];

@@ -35,8 +35,8 @@ let
in
{
spdlog_1 = generic {
version = "1.2.1";
sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n";
version = "1.3.1";
sha256 = "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd";
};

spdlog_0 = generic {