From 0f15b33912bacf60889fa2213ccc5a304993dd89 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Sat, 3 Feb 2018 13:01:54 +1100 Subject: [PATCH 1/3] granite: 0.4.1 -> 0.5 Upstream has moved to GitHub, as the elementary.io page [1] now links to the GitHub repository. The only current dependant derivation is Pantheon Terminal (pantheon.pantheon-terminal), which continues to work. [1]: https://elementary.io/open-source --- .../development/libraries/granite/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 4e41545687a..e542718502e 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.4"; - minorVersion = "1"; - name = "granite-${majorVersion}.${minorVersion}"; - src = fetchurl { - url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; - sha256 = "177h5h1q4qd7g99mzbczvz78j8c9jf4f1gwdj9f6imbc7r913d4b"; + name = "granite-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "granite"; + rev = version; + sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; }; + cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; - homepage = https://launchpad.net/granite; + homepage = https://github.com/elementary/granite; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vozz ]; From 197d9a8d901ee51e64f8f5947a7be9f2f4c30789 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Fri, 9 Feb 2018 22:23:37 +1100 Subject: [PATCH 2/3] granite: refactor package * move build time dependencies into nativeBuildInputs * convert cmakeFlags to an array * use `with` in the meta section * add `ninja` --- .../development/libraries/granite/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index e542718502e..8243775c6bc 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { name = "granite-${version}"; @@ -11,16 +11,32 @@ stdenv.mkDerivation rec { sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; }; - cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + cmakeFlags = [ + "-DINTROSPECTION_GIRDIR=share/gir-1.0/" + "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + ]; - meta = { + nativeBuildInputs = [ + vala + pkgconfig + cmake + ninja + perl + gettext + gobjectIntrospection + ]; + buildInputs = [ + glib + gtk3 + gnome3.libgee + ]; + + meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; homepage = https://github.com/elementary/granite; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vozz ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.vozz ]; }; } From 8a7fd9d41f06606ae83d7ef0c8af46ff7aafed7d Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Fri, 9 Feb 2018 22:30:09 +1100 Subject: [PATCH 3/3] spice-up: init at 1.2.1 --- pkgs/applications/office/spice-up/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/office/spice-up/default.nix diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix new file mode 100644 index 00000000000..88b65be0765 --- /dev/null +++ b/pkgs/applications/office/spice-up/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, fetchFromGitHub +, gettext +, libxml2 +, pkgconfig +, gtk3 +, granite +, gnome3 +, json_glib +, cmake +, ninja +, libgudev +, libevdev +, vala +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "spice-up-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Philip-Scott"; + repo = "Spice-up"; + rev = version; + sha256 = "0cbyhi6d99blv33183j6nakzcqxz5hqy9ijykiasbmdycfd5q0fh"; + }; + USER = "nix-build-user"; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + ninja + gettext + libxml2 + ]; + buildInputs = [ + gtk3 + granite + gnome3.libgee + json_glib + libgudev + libevdev + gnome3.gnome_themes_standard + ]; + + meta = with stdenv.lib; { + description = "Create simple and beautiful presentations on the Linux desktop"; + homepage = https://github.com/Philip-Scott/Spice-up; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84b01ae9422..65b6ad13cd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11090,6 +11090,8 @@ with pkgs; spice_protocol = callPackage ../development/libraries/spice-protocol { }; + spice-up = callPackage ../applications/office/spice-up { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { };