From 8f87a61de202067f618f028b82256055c46337bc Mon Sep 17 00:00:00 2001 From: Freezeboy Date: Sun, 17 Feb 2019 14:00:33 +0100 Subject: Replace platforms.linux with platforms.darwin for expressions that compile on darwin too (too restrictive platforms) --- pkgs/applications/office/qnotero/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index ad571cd8b186..b317838f6722 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { description = "Quick access to Zotero references"; homepage = http://www.cogsci.nl/software/qnotero; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; }; } -- cgit 1.4.1 From ba42e056dc721fdb2f7d7b0f4edfd4eb6b705d37 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 Feb 2019 19:19:59 +0100 Subject: zim: 0.69 -> 0.69.1 --- pkgs/applications/office/zim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index a3e2bdd4d1e0..48027c194da6 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.69"; + version = "0.69.1"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1"; + sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; -- cgit 1.4.1 From 276077a42f9686945585dba351ad1f54fd8bc003 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 5 Feb 2019 15:34:54 -0500 Subject: notes-up: init at 1.6.3 --- pkgs/applications/office/notes-up/default.nix | 41 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/office/notes-up/default.nix (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix new file mode 100644 index 000000000000..79a0c0207029 --- /dev/null +++ b/pkgs/applications/office/notes-up/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "notes-up"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "Philip-Scott"; + repo = "Notes-up"; + rev = version; + sha256 = "06fzdb823kkami0jch9ccblsvw3x7zd1d4xz8fv3giscl3f36x4q"; + }; + + nativeBuildInputs = [ + cmake + ninja + pantheon.vala + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + discount + glib + gtk3 + gtksourceview3 + gtkspell3 + libgee + pantheon.granite + sqlite + webkitgtk + ]; + + meta = with stdenv.lib; { + description = "Markdown notes editor and manager designed for elementary OS"; + homepage = https://github.com/Philip-Scott/Notes-up; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72e3f1135fe2..56c5d5523448 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4497,6 +4497,8 @@ in notify-osd = callPackage ../applications/misc/notify-osd { }; + notes-up = callPackage ../applications/office/notes-up { }; + notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; nox = callPackage ../tools/package-management/nox { }; -- cgit 1.4.1 From ac2546bffe6c980642c9f6a71df06efa226b8816 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 22 Feb 2019 13:45:57 -0500 Subject: notes-up: default without pantheon support This adds pantheon.notes-up which will only work in pantheon. --- pkgs/applications/office/notes-up/default.nix | 9 +++++++-- pkgs/desktops/pantheon/default.nix | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 79a0c0207029..2dee39a0ad3b 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook +, withPantheon ? false }: stdenv.mkDerivation rec { pname = "notes-up"; @@ -31,8 +32,12 @@ stdenv.mkDerivation rec { webkitgtk ]; + # Whether to build with contractor support (Pantheon specific) + cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ]; + meta = with stdenv.lib; { - description = "Markdown notes editor and manager designed for elementary OS"; + description = "Markdown notes editor and manager designed for elementary OS" + + stdenv.lib.optionalString withPantheon " - built with Contractor support"; homepage = https://github.com/Philip-Scott/Notes-up; license = licenses.gpl2; maintainers = with maintainers; [ davidak worldofpeace ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index a7b8a01eeb0b..27e6e02a4a37 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -62,6 +62,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; + notes-up = pkgs.notes-up.override { withPantheon = true; }; + #### APPS elementary-calculator = callPackage ./apps/elementary-calculator { }; -- cgit 1.4.1