diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-12-03 23:10:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-03 23:10:23 +0000 |
| commit | b4f4e06982cc6d87f88273edd1149d18cdf49926 (patch) | |
| tree | 382ea4027e75224ffb499c8bd06577c89f84c6f1 /pkgs/applications | |
| parent | aeb32cf187edd854cb5541f5f4fe40713c0e96b5 (diff) | |
| parent | 6809cb0b5f1a7d33e57aa6e0b2f37700b88faac6 (diff) | |
| download | nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.tar nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.tar.gz nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.tar.bz2 nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.tar.lz nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.tar.xz nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.tar.zst nixlib-b4f4e06982cc6d87f88273edd1149d18cdf49926.zip | |
Merge pull request #32287 from andir/polybar-3.1.0
polybar: 3.0.5 -> 3.1.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/polybar/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index e88a49740745..a3b87fd34f68 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.0.5"; + version = "3.1.0"; src = fetchgit { url = "https://github.com/jaagr/polybar"; - rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d"; - sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn"; + rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e"; + sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy"; }; meta = with stdenv.lib; { @@ -39,14 +39,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.afldcr ]; platforms = platforms.unix; }; - # This patch should be removed with next stable release. - patches = [ - (fetchpatch { - name = "polybar-remove-curlbuild.patch"; - url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch"; - sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy"; - }) - ]; buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil |