Merge pull request #122705 from rvl/fix-taffybar

pkgs/applications/window-managers/taffybar/default.nix

···
-{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
+{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }:
 
 let
-  taffybarEnv = haskellPackages.ghc.withPackages (self: [
+  taffybarEnv = ghcWithPackages (self: [
     self.taffybar
   ] ++ packages self);
 in stdenv.mkDerivation {
···
       --set NIX_GHC "${taffybarEnv}/bin/ghc"
   '';
 
-  inherit (haskellPackages.taffybar) meta;
+  # Trivial derivation
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+
+  # For hacking purposes
+  passthru.env = taffybarEnv;
+  buildInputs = [ taffybarEnv ];
+  shellHook = "eval $(egrep ^export ${taffybarEnv}/bin/ghc)";
+
+  inherit (taffybar) meta;
 }

pkgs/development/haskell-modules/configuration-common.nix

···
   # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
   jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
 
+  # 2021-05-12: gi-gdkpixbuf_2_0_26 fix
+  # https://github.com/taffybar/gtk-sni-tray/pull/25
+  gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch {
+    url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch";
+    sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn";
+  });
+
+  # 2021-05-12: gi-gdkpixbuf_2_0_26 fix
+  # https://github.com/taffybar/taffybar/pull/507
+  taffybar = appendPatch super.taffybar (pkgs.fetchpatch {
+    url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch";
+    sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0";
+  });
+
   # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
   # https://github.com/lehins/massiv/pull/104
   massiv = dontCheck super.massiv;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

···
   - gtk2hs-rpn
   - gtk3-mac-integration
   - gtkglext
-  - gtk-sni-tray
   - gtksourceview2
   - gtksourceview3
   - gtk-toy

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

···
     - hinit
   bdesham:
     - pinboard-notes-backup
+  rvl:
+    - taffybar
+    - arbtt
+    - lentil
 
 unsupported-platforms:
   Allure:                                       [ x86_64-darwin ]

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

···
  - systemstats
  - t3-client
  - ta
- - taffybar
  - tagged-list
  - tagged-th
  - tagsoup-navigate

pkgs/development/haskell-modules/hackage-packages.nix

···
        ];
        description = "Automatic Rule-Based Time Tracker";
        license = lib.licenses.gpl2Only;
+       maintainers = with lib.maintainers; [ rvl ];
      }) {};
 
   "arcgrid" = callPackage
···
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
···
        ];
        description = "frugal issue tracker";
        license = lib.licenses.gpl3Only;
+       maintainers = with lib.maintainers; [ rvl ];
      }) {};
 
   "lenz" = callPackage
···
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ rvl ];
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage

pkgs/top-level/all-packages.nix

···
     # customConfig = builtins.readFile ./tabbed.config.h;
   };
 
-  taffybar = callPackage ../applications/window-managers/taffybar {};
+  taffybar = callPackage ../applications/window-managers/taffybar {
+    inherit (haskellPackages) ghcWithPackages taffybar;
+  };
 
   tagainijisho = callPackage ../applications/office/tagainijisho {};