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: c2f9aef28697
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24967b2b0a03
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 17, 2018

  1. Verified

    This commit was signed with the committer’s verified signature.
    Ekleog Léo Gaspard
    Copy the full SHA
    f9b6e1d View commit details

Commits on Nov 19, 2018

  1. Merge pull request #50517 from c0bw3b/pkg/planner

    planner: 20170425 -> unstable-2018-03-25
    c0bw3b authored Nov 19, 2018
    Copy the full SHA
    24967b2 View commit details
Showing with 12 additions and 10 deletions.
  1. +12 −10 pkgs/applications/office/planner/default.nix
22 changes: 12 additions & 10 deletions pkgs/applications/office/planner/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv
, fetchgit
, fetchFromGitLab
, pkgconfig
, intltool
, automake111x
@@ -10,34 +10,36 @@
, python
}:

let version = "20170425";
let version = "unstable-2018-03-25";

in stdenv.mkDerivation {
name = "planner-${version}";

src = fetchgit {
url = https://gitlab.gnome.org/GNOME/planner.git;
rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6";
sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "planner";
rev = "2a2bf11d96a7f5d64f05c9053661baa848e47797";
sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g";
};

buildInputs = with gnome2; [
nativeBuildInputs = with gnome2; [
pkgconfig
intltool
automake111x
autoconf
libtool

gnome-common
gtk-doc
scrollkeeper
];

buildInputs = with gnome2; [
GConf
gtk
libgnomecanvas
libgnomeui
libglade
scrollkeeper

libxslt
python
];