Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0781c31545e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fc1638c3ba06
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 6, 2021

  1. taffybar: inherit meta set from haskellPackages

    @sternenseemann
    sternenseemann committed May 6, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fc1638c View commit details
Showing with 6 additions and 9 deletions.
  1. +5 −6 pkgs/applications/window-managers/taffybar/default.nix
  2. +1 −3 pkgs/top-level/all-packages.nix
11 changes: 5 additions & 6 deletions pkgs/applications/window-managers/taffybar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:

let
taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
taffybarEnv = haskellPackages.ghc.withPackages (self: [
self.taffybar
] ++ packages self);
in stdenv.mkDerivation {
name = "taffybar-with-packages-${taffybarEnv.version}";

@@ -13,8 +15,5 @@ in stdenv.mkDerivation {
--set NIX_GHC "${taffybarEnv}/bin/ghc"
'';

meta = {
platforms = lib.platforms.unix;
license = lib.licenses.bsd3;
};
inherit (haskellPackages.taffybar) meta;
}
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -26248,9 +26248,7 @@ in
# customConfig = builtins.readFile ./tabbed.config.h;
};

taffybar = callPackage ../applications/window-managers/taffybar {
inherit (haskellPackages) ghcWithPackages;
};
taffybar = callPackage ../applications/window-managers/taffybar {};

tagainijisho = callPackage ../applications/office/tagainijisho {};