[taffybar] Bump to version 3.3.0

This commit is contained in:
2021-07-23 23:44:42 -06:00
parent d811cb9b64
commit b7342c6a15
10 changed files with 396 additions and 79 deletions

View File

@@ -1,7 +0,0 @@
pkgs: pkgs {
overlays = [
(import ./taffybar/overlay.nix)
(import ../xmonad/overlay.nix)
(import ./overlay.nix)
];
}

View File

@@ -1,3 +0,0 @@
let pkgs = ((import ./base.nix) (import <nixpkgs>)) ;
in
pkgs.haskellPackages.imalison-taffybar

View File

@@ -0,0 +1,35 @@
{
inputs = {
taffybar.url = path:./taffybar;
flake-utils.url = github:numtide/flake-utils;
git-ignore-nix.url = github:IvanMalison/gitignore.nix/master;
};
outputs = { self, flake-utils, taffybar, git-ignore-nix, nixpkgs }:
let
overlay = final: prev: {
haskellPackages = prev.haskellPackages.override (old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
(hself: hsuper: {
imalison-taffybar = hself.callCabal2nix "imalison-taffybar"
(git-ignore-nix.gitIgnoreSource ./.)
{ };
coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub {
owner = "IvanMalison";
repo = "coinbase-pro";
rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
}) { };
});
});
};
overlays = taffybar.overlays ++ [ overlay ];
in flake-utils.lib.eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; };
in
rec {
devShell = pkgs.haskellPackages.shellFor {
packages = p: [ p.imalison-taffybar ];
};
defaultPackage = pkgs.haskellPackages.imalison-taffybar;
}) // { inherit overlay overlays; } ;
}

View File

@@ -1,19 +0,0 @@
_: super: {
haskellPackages = super.haskellPackages.override (old: {
overrides = super.lib.composeExtensions (old.overrides or (_: _: {})) (self: _: {
coinbase-pro = self.callCabal2nix "coinbase-pro" (super.fetchFromGitHub {
owner = "IvanMalison";
repo = "coinbase-pro";
rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
}) { };
imalison-taffybar =
self.callCabal2nix "imalison-taffybar"
(
super.lib.sourceByRegex ./.
["taffybar.hs" "imalison-taffybar.cabal"]
)
{ };
});
});
}

View File

@@ -1,5 +0,0 @@
let
pkgs = import ./base.nix (import <nixpkgs>);
in pkgs.haskellPackages.shellFor {
packages = p: [ p.imalison-taffybar p.taffybar ];
}

View File

@@ -167,7 +167,9 @@ main = do
fullEndWidgets =
map (>>= buildContentsBox)
[ myClock
, sniTrayNew
, sniTrayNewFromParams defaultTrayParams { trayLeftClickAction = PopupMenu
, trayRightClickAction = Activate
}
, coinbaseProductLabel "ICP-USD"
, coinbaseProductLabel "ICP-BTC"
, coinbaseProductLabel "BTC-USD"