polybar: 3.4.0 -> 3.4.1

[Br1ght0ne]

Motivation for this change

Things done

• Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
• Built on platform(s)
  • NixOS
  • macOS
  • other Linux distributions
• Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
• Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
• Tested execution of all binary files (usually in ./result/bin/)
• Determined the impact on package closure size (by running nix path-info -S before and after)
• Ensured that relevant documentation is up to date
• Fits CONTRIBUTING.md.

Notify maintainers

cc @afldcr

---

This change is 

[samdoshi]

Hi I tried to build this with nix-review pr 73218 but I ran into a few errors:

1. Your src sha256 hash is wrong, it doesn't take account of fetchSubmodules, see the difference between:
   nix-prefetch-git --rev 3.4.1 https://github.com/polybar/polybar and
   nix-prefetch-git --fetch-submodules --rev 3.4.1 https://github.com/polybar/polybar

2. xcbproto doesn't contain Python 3 libraries, fixing that is potentially a bit more complex, but one way out is to override it in this derivation.

3. Less importantly, the upstream URL has changed to https://github.com/polybar/polybar

Anyway I made these changes against master and got a working derivation, hopefully that's useful to you.

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 9ca8c696184..5ca2ffc4430 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,5 +1,5 @@
 { cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
-, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
+, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
 , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
 
 # optional packages-- override the variables ending in 'Support' to enable or
@@ -24,15 +24,19 @@ assert nlSupport     -> ! iwSupport && libnl         != null;
 assert i3Support     -> ! i3GapsSupport && jsoncpp != null && i3      != null;
 assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
 
+let
+  xcbproto-py3 = xcbproto.override { python = python3; };
+in
+
 stdenv.mkDerivation rec {
     pname = "polybar";
-    version = "3.4.0";
+    version = "3.4.1";
 
     src = fetchFromGitHub {
-      owner = "jaagr";
+      owner = pname;
       repo = pname;
       rev = version;
-      sha256 = "1g3zj0788cdlm8inpl19279bw8zjcy7dzj7q4f1l2d8c8g1jhv0m";
+      sha256 = "1z1m6dxh2i5vsnkzaccb9j02ab05wgmcgig5d0l9w856g5jp3zmy";
       fetchSubmodules = true;
     };
 
@@ -50,7 +54,7 @@ stdenv.mkDerivation rec {
     };
 
     buildInputs = [
-      cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
+      cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto-py3 xcbutil
       xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
 
       (if alsaSupport   then alsaLib       else null)

[Br1ght0ne]

@samdoshi Thanks a lot for your help!

[jonringer]

do you mind squashing this down to 2 commits?

git rebase -i HEAD~3
# move bottom line up one
# instead of pick on fix build commit, choose squash
# save
# then push

should be the bump, and add as maintainer.
Fixing the build should be included in the bump

[Br1ght0ne]

r? @jonringer

[jonringer]

nix-review passes on NixOS
diff LGTM
commits LGTM
executables show usage

[5 built, 89 copied (91.7 MiB), 15.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/73218
2 package were built:
polybar polybarFull

[jonringer]

@GrahamcOfBorg build polybar polybarFull

[Br1ght0ne]

@GrahamcOfBorg build polybar polybarFull

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/73

[Br1ght0ne]

Thanks everyone! 🎉