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: 35b289344b99
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 347e9b3d6577
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 1, 2020

  1. elementary-planner: 2.1.1 -> 2.2.14 

    (cherry picked from commit 35fcdb5)
    @worldofpeace
    worldofpeace committed Apr 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    347e9b3 View commit details
Showing with 8 additions and 16 deletions.
  1. +8 −16 pkgs/applications/office/elementary-planner/default.nix
24 changes: 8 additions & 16 deletions pkgs/applications/office/elementary-planner/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@

stdenv.mkDerivation rec {
pname = "elementary-planner";
version = "2.1.1";
version = "2.2.14";

src = fetchFromGitHub {
owner = "alainm23";
repo = "planner";
rev = version;
sha256 = "0swj94pqf00wwzsgjap8z19k33gg1wj2b78ba1aj9h791j8lmaim";
sha256 = "14k5kiknr0d3my17p4v20iiqzifpz3y80gdzj8vdxic8yk2yr1ap";
};

nativeBuildInputs = [
@@ -36,24 +36,16 @@ stdenv.mkDerivation rec {

buildInputs = [
evolution-data-server
libical
libgee
json-glib
glib
sqlite
libsoup
gtk3
json-glib
libgee
libical
libsoup
pantheon.elementary-icon-theme
pantheon.granite
sqlite
webkitgtk
pantheon.elementary-icon-theme
];

# Fix version string, remove in next update!
patches = [
(fetchpatch {
url = "https://github.com/alainm23/planner/pull/194/commits/3d0a2197087b13fe90fa6f85f817ba56798d632c.patch";
sha256 = "077q5jddi8jaw2ypc6szbd1c50i4x3b21jvmvi3w7g5zhjwpkmf5";
})
];

postPatch = ''