From 7f57ebd2c4d9e39eadc4d908ff53976cce49e22e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 4 Aug 2018 17:37:34 -0400 Subject: [PATCH 1/5] libunity: init at 7.1.4 --- .../libraries/libunity/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/libunity/default.nix diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix new file mode 100644 index 00000000000..3d3764e9258 --- /dev/null +++ b/pkgs/development/libraries/libunity/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool +, glib, vala, dee, gobjectIntrospection, libdbusmenu-glib +, gtk3, intltool, gnome-common, python3, icu }: + +stdenv.mkDerivation rec { + pname = "libunity"; + version = "7.1.4"; + + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz"; + sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij"; + }; + + nativeBuildInputs = [ + autoconf + automake + gnome-common + gobjectIntrospection + intltool + libtool + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + gtk3 + ]; + + propagatedBuildInputs = [ dee libdbusmenu-glib ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--disable-static" + "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides" + ]; + + NIX_LDFLAGS = "-L${icu}/lib"; + + meta = with stdenv.lib; { + description = "A library for instrumenting and integrating with all aspects of the Unity shell"; + homepage = https://launchpad.net/libunity; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ worldofpeace ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d151eadf4e..45acf3cf2d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10097,6 +10097,10 @@ with pkgs; libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; + libunity = callPackage ../development/libraries/libunity { + inherit (gnome3) gnome-common; + }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; From 1e1c7c88a5699e3b2c061f63e5c358cac6a461c7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 13 Jul 2018 15:52:49 -0400 Subject: [PATCH 2/5] appstream: gir is default true --- pkgs/development/libraries/appstream/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 61ee182ce62..8623fbde898 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" - "-Dgir=false" ]; meta = with stdenv.lib; { From d279992fc605d5f4aa63a6ca5d543524f757270c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Jul 2018 19:33:23 -0400 Subject: [PATCH 3/5] appstream: add vala --- pkgs/development/libraries/appstream/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 8623fbde898..264bc0e7345 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection -, pcre, itstool +, pcre, itstool, vala }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection itstool + gobjectIntrospection itstool vala ]; buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" + "-Dvapi=true" ]; meta = with stdenv.lib; { From 1ef8646a7322380e02194a7dd26869185c348eda Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 4 Aug 2018 16:16:15 -0400 Subject: [PATCH 4/5] appstream: 0.11.8 -> 0.12.2 --- .../development/libraries/appstream/default.nix | 17 ++++------------- pkgs/development/libraries/appstream/qt.nix | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 264bc0e7345..5e4218852e5 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,36 +1,27 @@ { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection -, pcre, itstool, vala +, pcre, itstool, gperf, vala }: stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.11.8"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; + sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; }; - patches = [ - # drop this in version 0.11.9 and above - (fetchpatch { - name = "define-location-and-soname.patch"; - url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; - sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobjectIntrospection itstool vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ]; prePatch = '' substituteInPlace meson.build \ diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index beff83f2365..c5a251cd5f9 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "appstream-qt-${version}"; - inherit (appstream) version src patches prePatch; + inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; From 5d95f474d8856d40ba19ef30b3db4c2f9c0da949 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 4 Aug 2018 17:25:42 -0400 Subject: [PATCH 5/5] scour: init at 0.37 --- pkgs/tools/graphics/scour/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/graphics/scour/default.nix diff --git a/pkgs/tools/graphics/scour/default.nix b/pkgs/tools/graphics/scour/default.nix new file mode 100644 index 00000000000..11932aabe0b --- /dev/null +++ b/pkgs/tools/graphics/scour/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "scour"; + version = "0.37"; + + src = fetchPypi { + inherit pname version; + sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "An SVG Optimizer / Cleaner "; + homepage = https://github.com/scour-project/scour; + license = licenses.asl20; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45acf3cf2d3..56a82812e0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1456,6 +1456,8 @@ with pkgs; parallel-rust = callPackage ../tools/misc/parallel-rust { }; + scour = callPackage ../tools/graphics/scour { }; + s2png = callPackage ../tools/graphics/s2png { }; simg2img = callPackage ../tools/filesystems/simg2img { };