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: 5d69135c8813
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ee460a3db1e
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 22, 2020

  1. pantheon.wingpanel-indicator-datetime: patch in a lot of fixes 

    These were rejected upstream, sadly elementary/wingpanel-indicator-datetime#207.

(cherry picked from commit 7a164bf)
    @worldofpeace
    worldofpeace committed Apr 22, 2020
    Copy the full SHA
    8ee460a View commit details
Showing with 4,736 additions and 1 deletion.
  1. +4,726 −0 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch
  2. +10 −1 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
4,726 changes: 4,726 additions & 0 deletions pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch
View file

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchFromGitHub
, pantheon
, pkgconfig
, meson
@@ -28,6 +28,15 @@ stdenv.mkDerivation rec {
sha256 = "0a0pqrpmrdd5pch30lizr9righlc7165z7krmnaxrzd0fvfkbr2h";
};

patches = [
# https://github.com/elementary/wingpanel-indicator-datetime/pull/207
# Fixes lots of issues despite being rejected upstream
# https://github.com/elementary/wingpanel-indicator-datetime/issues/206
# https://github.com/elementary/wingpanel-indicator-datetime/issues/55
# https://github.com/elementary/wingpanel-indicator-datetime/issues/127
./207.patch
];

passthru = {
updateScript = pantheon.updateScript {
attrPath = "pantheon.${pname}";