From d9a7918055ddfc11164af72f41d1807f162816f7 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sun, 24 Jan 2016 13:40:32 +0300 Subject: [PATCH 01/15] dbus-sharp-2_0: init at 0.8.1 --- .../libraries/dbus-sharp/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/dbus-sharp/default.nix diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix new file mode 100644 index 00000000000..ea7d920dc82 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp"; + + rev = "v${version}"; + sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6c83a3cbbf..e809d7cb4c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6594,6 +6594,8 @@ let dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus_python = pythonPackages.dbus; + dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; + # Should we deprecate these? Currently there are many references. dbus_tools = pkgs.dbus.tools; dbus_libs = pkgs.dbus.libs; From 826c716ea30744d15c905b428c641ae0901e318a Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sun, 24 Jan 2016 13:42:07 +0300 Subject: [PATCH 02/15] dbus-sharp-1_0: init at 0.7 --- .../libraries/dbus-sharp/dbus-sharp-1.0.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix new file mode 100644 index 00000000000..c17a140b9c5 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp"; + + rev = "v${version}"; + sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e809d7cb4c5..b8099e7e6ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6594,6 +6594,7 @@ let dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus_python = pythonPackages.dbus; + dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; # Should we deprecate these? Currently there are many references. From 7254219b3817284fcbb7911ab9377e7c3380a845 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sun, 24 Jan 2016 13:43:36 +0300 Subject: [PATCH 03/15] dbus-sharp-glib-2_0: init at 0.6 --- .../libraries/dbus-sharp-glib/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/dbus-sharp-glib/default.nix diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix new file mode 100644 index 00000000000..ef1ddd9bfff --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-glib-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp-glib"; + + rev = "v${version}"; + sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono dbus-sharp-2_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET: GLib integration module"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8099e7e6ad..409a74545b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6597,6 +6597,8 @@ let dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; + dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; + # Should we deprecate these? Currently there are many references. dbus_tools = pkgs.dbus.tools; dbus_libs = pkgs.dbus.libs; From 1018e0497adae2f18bbbb77a5c28d2a7201a52a1 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sun, 24 Jan 2016 13:45:09 +0300 Subject: [PATCH 04/15] dbus-sharp-glib-1_0: init at 0.5 --- .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix new file mode 100644 index 00000000000..208288bfca1 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-glib-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp-glib"; + + rev = "v${version}"; + sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono dbus-sharp-1_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET: GLib integration module"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 409a74545b7..6b9dda67ffe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6597,6 +6597,7 @@ let dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; + dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; # Should we deprecate these? Currently there are many references. From ec0ffd9078525dfd7a01463ddcbc56d218d1b697 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sun, 24 Jan 2016 15:16:21 +0300 Subject: [PATCH 05/15] notify-sharp: init at 3.0.3 --- .../libraries/notify-sharp/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/notify-sharp/default.nix diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix new file mode 100644 index 00000000000..c7e133d94b2 --- /dev/null +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: + +stdenv.mkDerivation rec { + name = "notify-sharp-${version}"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "notify-sharp"; + + rev = "${version}"; + sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m"; + }; + + nativeBuildInputs = [ + pkgconfig autoreconfHook + ]; + + buildInputs = [ + mono gtk-sharp-3_0 + dbus-sharp-1_0 dbus-sharp-glib-1_0 + ]; + + dontStrip = true; + + postPatch = '' + sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac + ''; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b9dda67ffe..2510cf5acdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8205,6 +8205,8 @@ let nanomsg = callPackage ../development/libraries/nanomsg { }; + notify-sharp = callPackage ../development/libraries/notify-sharp { }; + ncurses = callPackage ../development/libraries/ncurses { }; neardal = callPackage ../development/libraries/neardal { }; From d778ab0cb01bf836f6926fa31dcdbda07cce3abf Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sun, 24 Jan 2016 15:43:13 +0300 Subject: [PATCH 06/15] gtk-sharp-3_0: init at 2.99.3 --- .../default.nix => gtk-sharp/2.0.nix} | 0 pkgs/development/libraries/gtk-sharp/3.0.nix | 48 +++++++++++++++++++ .../{gtk-sharp-2 => gtk-sharp}/builder.sh | 0 pkgs/top-level/all-packages.nix | 10 +++- 4 files changed, 57 insertions(+), 1 deletion(-) rename pkgs/development/libraries/{gtk-sharp-2/default.nix => gtk-sharp/2.0.nix} (100%) create mode 100644 pkgs/development/libraries/gtk-sharp/3.0.nix rename pkgs/development/libraries/{gtk-sharp-2 => gtk-sharp}/builder.sh (100%) diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp-2/default.nix rename to pkgs/development/libraries/gtk-sharp/2.0.nix diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix new file mode 100644 index 00000000000..380c43108de --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, mono +, glib +, pango +, gtk3 +, GConf ? null +, libglade ? null +, libgtkhtml ? null +, gtkhtml ? null +, libgnomecanvas ? null +, libgnomeui ? null +, libgnomeprint ? null +, libgnomeprintui ? null +, gnomepanel ? null +, libxml2 +, monoDLLFixer +}: + +stdenv.mkDerivation { + name = "gtk-sharp-2.99.3"; + + builder = ./builder.sh; + src = fetchurl { + #"mirror://gnome/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; + }; + + # patch bad usage of glib, which wasn't tolerated anymore + # prePatch = '' + # for f in glib/glue/{thread,list,slist}.c; do + # sed -i 's,#include ,#include ,g' "$f" + # done + # ''; + + buildInputs = [ + pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas + libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + gnomepanel + ]; + + dontStrip = true; + + inherit monoDLLFixer; + + passthru = { + inherit gtk3; + }; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh similarity index 100% rename from pkgs/development/libraries/gtk-sharp-2/builder.sh rename to pkgs/development/libraries/gtk-sharp/builder.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2510cf5acdf..09f97b49d9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7044,12 +7044,20 @@ let gtksharp = gtk-sharp; }; - gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 { + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf gnomepanel; }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { + inherit (gnome) libglade libgtkhtml gtkhtml + libgnomecanvas libgnomeui libgnomeprint + libgnomeprintui GConf gnomepanel; + }; + + gtk-sharp = gtk-sharp-2_0; + gtkspell = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; From 3576a2d5499701a264a10c0e9c8b5bdf02cdc0a0 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 2 Feb 2016 15:38:28 +0300 Subject: [PATCH 07/15] mono-addins: init at 1.2 --- .../libraries/mono-addins/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/mono-addins/default.nix diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix new file mode 100644 index 00000000000..e68661b44ec --- /dev/null +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }: + +stdenv.mkDerivation rec { + name = "mono-addins-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "mono-addins"; + + rev = "mono-addins-${version}"; + sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono gtk-sharp-2_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + homepage = http://www.mono-project.com/archived/monoaddins/; + description = "A generic framework for creating extensible applications"; + longDescription = '' + Mono.Addins is a generic framework for creating extensible applications, + and for creating libraries which extend those applications. + ''; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09f97b49d9e..0d3d7818df3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8171,6 +8171,8 @@ let qt = qt4; }; + mono-addins = callPackage ../development/libraries/mono-addins { }; + movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; From a4a19c57ad85361bf4d7d89a6440ad54cfd68590 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Mon, 8 Feb 2016 17:04:11 +0300 Subject: [PATCH 08/15] taglib-sharp: init at 2.1.0.0 --- .../libraries/taglib-sharp/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/taglib-sharp/default.nix diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix new file mode 100644 index 00000000000..6da524c2339 --- /dev/null +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: + +stdenv.mkDerivation rec { + name = "taglib-sharp-${version}"; + version = "2.1.0.0"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "taglib-sharp"; + + rev = "taglib-sharp-${version}"; + sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + buildInputs = [ mono ]; + + dontStrip = true; + + configureFlags = [ "--disable-docs" ]; + + meta = with stdenv.lib; { + description = "Library for reading and writing metadata in media files"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d3d7818df3..1dbd0dfee7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8824,6 +8824,8 @@ let taglib_extras = callPackage ../development/libraries/taglib-extras { }; + taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; + talloc = callPackage ../development/libraries/talloc { python = python2; }; From 50bd9b01931ca7cc5651a2ee60bbeb0635cbeb94 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 9 Feb 2016 13:20:55 +0300 Subject: [PATCH 09/15] gio-sharp:init at 0.3 --- .../libraries/gio-sharp/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/gio-sharp/default.nix diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix new file mode 100644 index 00000000000..ad5220cac4e --- /dev/null +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp }: + +stdenv.mkDerivation rec { + name = "gio-sharp-${version}"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gio-sharp"; + + rev = "${version}"; + sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake which ]; + buildInputs = [ mono gtk-sharp ]; + + dontStrip = true; + + prePatch = '' + ./autogen-2.22.sh + ''; + + meta = with stdenv.lib; { + description = "GIO API bindings"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dbd0dfee7d..e48ed29b504 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6813,6 +6813,8 @@ let giblib = callPackage ../development/libraries/giblib { }; + gio-sharp = callPackage ../development/libraries/gio-sharp { }; + libgit2 = callPackage ../development/libraries/git2 { }; libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; From a347e45c545fc3f7b84cd37169385805050e6cbc Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 9 Feb 2016 13:25:24 +0300 Subject: [PATCH 10/15] gtk-sharp-beans: init at 2.14.0 --- .../libraries/gtk-sharp-beans/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/gtk-sharp-beans/default.nix diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix new file mode 100644 index 00000000000..92578f42e34 --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp, gio-sharp }: + +stdenv.mkDerivation rec { + name = "gtk-sharp-beans-${version}"; + version = "2.14.0"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gtk-sharp-beans"; + + rev = "${version}"; + sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + buildInputs = [ mono gtk-sharp gio-sharp ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e48ed29b504..45eba8c72d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7060,6 +7060,8 @@ let gtk-sharp = gtk-sharp-2_0; + gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; + gtkspell = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; From 6c9269670e32e0a0d95547aa21187c6c5917e876 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 9 Feb 2016 13:46:39 +0300 Subject: [PATCH 11/15] mono-zeroconf: init at 0.9.0 --- .../libraries/mono-zeroconf/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/mono-zeroconf/default.nix diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix new file mode 100644 index 00000000000..12b15c4937d --- /dev/null +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }: + +stdenv.mkDerivation rec { + name = "mono-zeroconf-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2"; + sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; + }; + + buildInputs = [ pkgconfig which mono ]; + + dontStrip = true; + + configureFlags = [ "--disable-docs" ]; + + meta = with stdenv.lib; { + description = "A cross platform Zero Configuration Networking library for Mono and .NET"; + homepage = http://www.mono-project.com/archived/monozeroconf/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45eba8c72d6..2e511dc3ad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8177,6 +8177,8 @@ let mono-addins = callPackage ../development/libraries/mono-addins { }; + mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { }; + movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; From 2edba485311c810e6f83de82406b0c9128a4c896 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Fri, 29 Jan 2016 23:32:48 +0300 Subject: [PATCH 12/15] boo: init at 20131021 --- pkgs/development/compilers/boo/config.patch | 45 +++++++++++++++++++++ pkgs/development/compilers/boo/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 94 insertions(+) create mode 100644 pkgs/development/compilers/boo/config.patch create mode 100644 pkgs/development/compilers/boo/default.nix diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch new file mode 100644 index 00000000000..f6e0eee29b1 --- /dev/null +++ b/pkgs/development/compilers/boo/config.patch @@ -0,0 +1,45 @@ +diff --git a/default.build b/default.build +index e48fd9e..b0dee4f 100644 +--- a/default.build ++++ b/default.build +@@ -23,14 +23,14 @@ + + + +- ++ + + + + + + +- ++ + + + +@@ -575,9 +575,9 @@ + key files for mime detection, etc + --> + +- ++ + +- ++ + + + +@@ -707,9 +707,9 @@ + key files for mime detection, etc + --> + +- ++ + +- ++ + + + diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix new file mode 100644 index 00000000000..c57d4de8767 --- /dev/null +++ b/pkgs/development/compilers/boo/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant +, shared_mime_info, gtksourceview, gtk +, targetVersion ? "4.5" }: + +let + release = "alpha"; +in stdenv.mkDerivation rec { + name = "boo-${version}"; + version = "2013-10-21"; + + src = fetchFromGitHub { + owner = "boo-lang"; + repo = "boo"; + + rev = "${release}"; + sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; + }; + + buildInputs = [ + pkgconfig mono makeWrapper nant shared_mime_info gtksourceview + gtk + ]; + + patches = [ ./config.patch ]; + + postPatch = '' + sed -e 's|\$out|'$out'|' -i default.build + ''; + + buildPhase = '' + nant -t:mono-4.5 + ''; + + installPhase = '' + nant install + cp $out/lib/mono/boo/*.dll $out/lib/boo/ + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "The Boo Programming Language"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e511dc3ad4..f7dd3d59410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4009,6 +4009,10 @@ let bigloo = callPackage ../development/compilers/bigloo { }; + boo = callPackage ../development/compilers/boo { + inherit (gnome) gtksourceview; + }; + colm = callPackage ../development/compilers/colm { }; fetchegg = callPackage ../build-support/fetchegg { }; From 04d2c5f1189b8a9ae8421e3b74ef9587ea8b3a07 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 2 Feb 2016 18:08:51 +0300 Subject: [PATCH 13/15] gdata-sharp: init at 2.2.0.0 --- .../libraries/gdata-sharp/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/gdata-sharp/default.nix diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix new file mode 100644 index 00000000000..e9f5898e2ea --- /dev/null +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }: + +let + newtonsoft-json = dotnetPackages.NewtonsoftJson; +in stdenv.mkDerivation rec { + name = "gdata-sharp-${version}"; + version = "2.2.0.0"; + + src = fetchsvn { + url = "http://google-gdata.googlecode.com/svn/trunk/"; + rev = "1217"; + sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; + }; + + buildInputs = [ pkgconfig mono newtonsoft-json ]; + + sourceRoot = "svn-r1217/clients/cs"; + + dontStrip = true; + + postPatch = '' + sed -i -e 's#^\(DEFINES=.*\)\(.\)#\1 /r:third_party/Newtonsoft.Json.dll\2#' Makefile + # carriage return ^ + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/archive/p/google-gdata/; + + description = "The Google Data APIs"; + longDescription = '' + The Google Data APIs provide a simple protocol for reading and writing + data on the web. + ''; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7dd3d59410..e5c53795e7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7029,6 +7029,8 @@ let pangox_compat = callPackage ../development/libraries/pangox-compat { }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; From 84cfc1bc729910e06f0511967916b59383666dbf Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Tue, 9 Feb 2016 17:40:24 +0300 Subject: [PATCH 14/15] libgpod: mono support --- pkgs/development/libraries/libgpod/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 6a1f28c96ff..b4b951325a4 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, +{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, - libimobiledevice, python, pygobject, mutagen }: + libimobiledevice, python, pygobject, mutagen, + monoSupport ? true, mono, gtk-sharp +}: stdenv.mkDerivation rec { name = "libgpod-0.8.3"; @@ -10,13 +12,19 @@ stdenv.mkDerivation rec { }; preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )"; - configureFlags = "--without-hal --enable-udev"; + + configureFlags = [ + "--without-hal" + "--enable-udev" + ] ++ lib.optionals monoSupport [ "--with-mono" ]; + + dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ]; + libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5c53795e7e..e8e397c2375 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7562,6 +7562,7 @@ let libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; + monoSupport = false; }; libgsystem = callPackage ../development/libraries/libgsystem { }; From 4a92dbcd4c5a83025277d8efc709241aacf853a3 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Fri, 22 Jan 2016 17:34:51 +0300 Subject: [PATCH 15/15] banshee: init at 2.6.2 Co-Authored-By: Nikolay Amiantov --- pkgs/applications/audio/banshee/default.nix | 55 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/audio/banshee/default.nix diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix new file mode 100644 index 00000000000..4e5086bdb26 --- /dev/null +++ b/pkgs/applications/audio/banshee/default.nix @@ -0,0 +1,55 @@ +{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base +, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg, glib +, mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 +, boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp +, libmtp, libgpod, mono-zeroconf }: + +stdenv.mkDerivation rec { + name = "banshee-${version}"; + version = "2.6.2"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; + sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; + }; + + dontStrip = true; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ + gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst_plugins_good + gst_plugins_bad gst_plugins_ugly gst_ffmpeg + mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp + gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans + gio-sharp libmtp libgpod mono-zeroconf + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + patchShebangs data/desktop-files/update-desktop-file.sh + patchShebangs build/private-icon-theme-installer + sed -i "s,DOCDIR=.*,DOCDIR=$out/lib/monodoc," configure + ''; + + postInstall = let + ldLibraryPath = lib.makeLibraryPath [ gtk-sharp-2_0.gtk gtk-sharp-2_0 sqlite gconf glib gstreamer ]; + + monoGACPrefix = lib.concatStringsSep ":" [ + mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0 + boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans + gio-sharp libmtp libgpod mono-zeroconf + ]; + in '' + sed -e '2a export MONO_GAC_PREFIX=${monoGACPrefix}' \ + -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${ldLibraryPath}:|' \ + -e "s|GST_PLUGIN_PATH=|GST_PLUGIN_PATH=$GST_PLUGIN_SYSTEM_PATH:|" \ + -e 's| mono | ${mono}/bin/mono |' \ + -i $out/bin/banshee + ''; + meta = with lib; { + description = "A music player written in C# using GNOME technologies"; + platforms = platforms.linux; + maintainers = [ maintainers.zohl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e397c2375..bc1b6255873 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11545,6 +11545,11 @@ let ffmpeg = ffmpeg_1; }; + banshee = callPackage ../applications/audio/banshee { + gconf = pkgs.gnome.GConf; + libgpod = pkgs.libgpod.override { monoSupport = true; }; + }; + batik = callPackage ../applications/graphics/batik { }; batti = callPackage ../applications/misc/batti { };