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

Commits on Apr 23, 2020

  1. elementary-planner: 2.3.2 -> 2.3.3

    @worldofpeace
    worldofpeace committed Apr 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    ondrejmirtes Ondřej Mirtes
    GPG key ID: CF1A108D0E7AE720
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    17db6b8 View commit details
Showing with 2 additions and 96 deletions.
  1. +0 −84 pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch
  2. +2 −12 pkgs/applications/office/elementary-planner/default.nix
84 changes: 0 additions & 84 deletions pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch
View file

This file was deleted.

14 changes: 2 additions & 12 deletions pkgs/applications/office/elementary-planner/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,25 +21,15 @@

stdenv.mkDerivation rec {
pname = "elementary-planner";
version = "2.3.2";
version = "2.3.3";

src = fetchFromGitHub {
owner = "alainm23";
repo = "planner";
rev = version;
sha256 = "1kjk1zafx71zmax3whzpx6mzl037wlxri30bl2k9y9rg3fd09arr";
sha256 = "1jc668hg26vb1q50abm6k566v9qimgs9skkwmlgi5h37vxm3ai1x";
};

patches = [
# Revert a patch the works around some stylesheet issues:
# https://github.com/alainm23/planner/issues/268
# https://github.com/alainm23/planner/issues/303
# The don't seem to be a problem with Pantheon on NixOS
# and for some reason produce the opposite effect with
# pantheon's stylesheet.
./0001-Revert-Add-patch.patch
];

nativeBuildInputs = [
desktop-file-utils
meson