diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 212013fb655d7..69d6ff8426823 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +, howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,21 +10,21 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c"; + sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s"; }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook + meson ninja pkgconfig scdoc wrapGAppsHook cmake ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -50,5 +51,6 @@ license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; platforms = platforms.unix; + homepage = "https://github.com/alexays/waybar"; }; } diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix new file mode 100644 index 0000000000000..30e5c92b8f09f --- /dev/null +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "howard-hinnant-date-unstable"; + version = "2020-01-24"; + + src = fetchFromGitHub { + owner = "HowardHinnant"; + repo = "date"; + rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"; + sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch"; + sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; + + cmakeFlags = [ + "-DBUILD_TZ_LIB=true" + "-DBUILD_SHARED_LIBS=true" + ]; + + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + license = licenses.mit; + description = "A date and time library based on the C++11/14/17 header"; + homepage = "https://github.com/HowardHinnant/date"; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844036d83e5f5..b70c6856301ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1562,6 +1562,8 @@ in datasette = with python3Packages; toPythonApplication datasette; + howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { }; + datefudge = callPackage ../tools/system/datefudge { }; dateutils = callPackage ../tools/misc/dateutils { };