Merge pull request #122705 from rvl/fix-taffybar

This commit is contained in:
maralorn 2021-05-13 13:54:18 +02:00 committed by GitHub
commit 5687a345be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 9 deletions

View file

@ -1,7 +1,7 @@
{ 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 {
@ -15,5 +15,14 @@ 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;
}

View file

@ -1271,6 +1271,20 @@ self: super: {
# 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;

View file

@ -1699,7 +1699,6 @@ broken-packages:
- gtk2hs-rpn
- gtk3-mac-integration
- gtkglext
- gtk-sni-tray
- gtksourceview2
- gtksourceview3
- gtk-toy

View file

@ -233,6 +233,10 @@ package-maintainers:
- hinit
bdesham:
- pinboard-notes-backup
rvl:
- taffybar
- arbtt
- lentil
unsupported-platforms:
Allure: [ x86_64-darwin ]

View file

@ -2886,7 +2886,6 @@ dont-distribute-packages:
- systemstats
- t3-client
- ta
- taffybar
- tagged-list
- tagged-th
- tagsoup-navigate

View file

@ -32045,6 +32045,7 @@ self: {
];
description = "Automatic Rule-Based Time Tracker";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ rvl ];
}) {};
"arcgrid" = callPackage
@ -111794,8 +111795,6 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk3;};
"gtk-strut" = callPackage
@ -160373,6 +160372,7 @@ self: {
];
description = "frugal issue tracker";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ rvl ];
}) {};
"lenz" = callPackage
@ -252598,7 +252598,7 @@ self: {
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

View file

@ -26366,7 +26366,9 @@ in
# 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 {};