Merge pull request #5041 from vbgl/mono

Updates mono, fsharp and monodevelop

Closes #4782.

pkgs/applications/editors/monodevelop/builder.sh

@@ -1,28 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-export MONO_GAC_PREFIX=$monodoc:$gtksharp
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    moz=$(ls $mozilla/lib/*/libgtkembedmoz.so)
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$monodoc" \
-            --set MOZILLA_FIVE_HOME "$(dirname $moz)"
-    done
-}
-
-genericBuild
-

pkgs/applications/editors/monodevelop/default.nix

@@ -1,26 +1,47 @@
-{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
+{stdenv, fetchgit
-, gtkmozembedsharp, monodoc
+, autoconf, automake, pkgconfig, shared_mime_info, intltool
-, perl, perlXMLParser, pkgconfig
+, glib, mono, gtk-sharp, gnome-sharp
-, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
-, mozilla, makeWrapper
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "monodevelop-0.6-pre2315";
+  version = "5.1.4.0";
-  builder = ./builder.sh;
+  revision = "7d45bbe2ee22625f125d0c52548524f02d005cca";
-
+  name = "monodevelop-${version}";
-  src = fetchurl {
+  src = fetchgit {
-    url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2;
+    url = https://github.com/mono/monodevelop.git;
-    md5 = "8c33df5629b0676b7ab552854c1de6fd";
+    rev = revision;
+    sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b";
   };
 
-  patches = [./prefix.patch];
-  
   buildInputs = [
-    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
+    autoconf automake pkgconfig shared_mime_info intltool
-    glib gtk GConf gnome_vfs libbonobo libglade libgnome
+    mono gtk-sharp gnome-sharp
-    gtkmozembedsharp monodoc
   ];
-  
+
-  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
+  preConfigure = "patchShebangs ./configure";
+  preBuild = ''
+    cat > ./main/buildinfo <<EOF
+    Release ID: ${version}
+    Git revision: ${revision}
+    Build date: 1970-01-01 00:00:01
+    EOF
+  '';
+
+  postInstall = ''
+    for prog in monodevelop mdtool; do
+    patch -p 0 $out/bin/$prog <<EOF
+    2a3,5
+    > export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX
+    > export PATH=${mono}/bin:\$PATH
+    > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH
+    > 
+    EOF
+    done
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
 }

pkgs/applications/editors/monodevelop/prefix.patch

@@ -1,44 +0,0 @@
-diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
-*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
---- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
-***************
-*** 298,304 ****
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @gnome_prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
---- 298,304 ----
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
-***************
-*** 809,818 ****
-  all:
-  
-  install-data-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
---- 809,818 ----
-  all:
-  
-  install-data-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
-Only in MonoDevelop: Makefile.in~

pkgs/applications/editors/monodoc/builder.sh

@@ -1,20 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$out"
-    done
-}
-
-genericBuild
-
-

pkgs/applications/editors/monodoc/default.nix

@@ -1,15 +0,0 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "monodoc-1.0.6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz;
-    md5 = "f2fc27e8e4717d90dc7efa2450625693";
-  };
-
-  buildInputs = [mono gtksharp pkgconfig];
-
-  inherit gtksharp makeWrapper;
-}

pkgs/applications/graphics/f-spot/builder.sh

@@ -1,27 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --prefix PATH ':' "$(dirname $(type -p mono))" \
-            --prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
-            --prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
-            --prefix MONO_GAC_PREFIX ':' "$gtksharp"
-    done
-    
-    # !!! hack
-    export ALL_INPUTS="$out $pkgs"
-
-    find $out -name "*.dll.config" -o -name "*.exe.config" | while read configFile; do
-        echo "modifying config file $configFile"
-        $monoDLLFixer "$configFile"
-    done
-}
-
-genericBuild

pkgs/applications/graphics/f-spot/default.nix

@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
-, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
-, monoDLLFixer
-, makeWrapper
-}:
-
-stdenv.mkDerivation {
-  name = "f-spot-0.0.10";
-
-  builder = ./builder.sh;
-  
-  inherit makeWrapper;
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2;
-    sha256 = "1hgls6hzvxsnk09j9y6hq10qxsc92i864mdg3gk2cimbkbr0mh8b";
-  };
-
-  patches = [./dllmap.patch];
-
-  buildInputs = [
-    perl perlXMLParser pkgconfig mono libexif
-    libgnome libgnomeui gtksharp libjpeg sqlite
-    lcms libgphoto2
-  ];
-
-  inherit monoDLLFixer gtksharp sqlite libgnomeui;
-
-  meta = {
-    homepage = http://f-spot.org;
-  };
-}

pkgs/applications/graphics/f-spot/dllmap.patch

@@ -1,28 +0,0 @@
-diff -rc f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config
-*** f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-02-27 19:25:09.000000000 +0100
---- f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-03-11 12:13:12.000000000 +0100
-***************
-*** 1,3 ****
-  <configuration>
-!   <dllmap dll="libgphoto2.so" target="/usr/lib/libgphoto2.so.2"/>
-  </configuration>
---- 1,3 ----
-  <configuration>
-!   <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
-  </configuration>
-diff -rc f-spot-0.0.10-orig/src/f-spot.exe.config.in f-spot-0.0.10/src/f-spot.exe.config.in
-*** f-spot-0.0.10-orig/src/f-spot.exe.config.in	2005-02-27 18:03:02.000000000 +0100
---- f-spot-0.0.10/src/f-spot.exe.config.in	2005-03-11 12:48:03.000000000 +0100
-***************
-*** 9,13 ****
-    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
-    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
-    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-!   <dllmap dll="libexif.dll" target="libexif.so.@EXIF_SOVERSION@"/>
-  </configuration>
---- 9,13 ----
-    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
-    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
-    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-!   <dllmap dll="libexif.dll" target="libexif.so"/>
-  </configuration>

pkgs/development/compilers/fsharp/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "3.1.1.26";
+  version = "3.1.1.31";
 
   src = fetchurl {
     url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
-    sha256 = "1yz3cq8ys6ryc6x3a0qyc100swrg2q3az8x8in1lp7c2c0l02zb2";
+    sha256 = "1c38jpisnh8slqaaw1bsccxgllpc6yivrpb86raw4xalcbsc6fcv";
   };
 
   buildInputs = [ mono pkgconfig autoconf automake which ];

pkgs/development/compilers/mono/default.nix

@@ -6,10 +6,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-  version = "3.2.8";
+  version = "3.8.0";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "0h0s42pmgrhwqaym0b1401h70dcpr179ngcsp7f8i4hl4snqrd7x";
+    sha256 = "0jraxsjn7ra6z02n4wjpbj21mxm2w50iqviqvfl0ajikbxahvf3i";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
   #http://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | while read i; do
-        sed -i "s@libMonoPosixHelper.so@$out/lib/libMonoPosixHelper.so@g" $i
         sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i
         sed -i "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" $i
     done

pkgs/development/libraries/gnome-sharp/Makefile.in.patch

@@ -0,0 +1,11 @@
+--- a/sample/gnomevfs/Makefile.in	2009-03-03 16:09:52.000000000 +0000
++++ b/sample/gnomevfs/Makefile.in	2014-10-14 13:35:51.020427244 +0100
+@@ -218,7 +218,7 @@
+ 
+ @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = 
+ @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = 
+-@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
++@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
+ assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
+ references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
+ noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)

pkgs/development/libraries/gnome-sharp/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, gtk, mono, gtk-sharp, gnome}:
+
+stdenv.mkDerivation {
+  name = "gnome-sharp-2.24.1";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
+    sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p";
+  };
+
+  buildInputs = [ pkgconfig gtk mono gtk-sharp ]
+  ++ (with gnome; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]);
+
+  patches = [ ./Makefile.in.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.mono-project.com/docs/gui/gtksharp/;
+    description = "A .NET language binding for assorted GNOME libraries";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ vbgl ];
+  };
+}

pkgs/development/libraries/gtk-sharp-1/builder.sh

@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-genericBuild
-
-# !!! hack
-export ALL_INPUTS="$out $pkgs"
-
-find $out -name "*.dll.config" | while read configFile; do
-    echo "modifying config file $configFile"
-    $monoDLLFixer "$configFile"
-done

pkgs/development/libraries/gtk-sharp-1/default.nix

@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, mono
-, glib
-, pango
-, gtk
-, GConf ? null
-, libglade ? null
-, libgtkhtml ? null
-, gtkhtml ? null
-, libgnomecanvas ? null
-, libgnomeui ? null
-, libgnomeprint ? null
-, libgnomeprintui ? null
-, libxml2
-, monoDLLFixer
-}:
-
-stdenv.mkDerivation {
-  name = "gtk-sharp-1.0.6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/gtk-sharp-1.0.6.tar.gz;
-    md5 = "2651d14fe77174ab20b8af53d150ee11";
-  };
-
-  patches = [
-    ./dllmap-glue.patch
-    ./glib-include.patch
-  ];
-
-  buildInputs = [
-    pkgconfig mono glib pango gtk GConf libglade libgnomecanvas
-    libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
-  ];
-
-  inherit monoDLLFixer;
-}

pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch

@@ -1,65 +0,0 @@
-diff -rc gtk-sharp-1.0.6-orig/gdk/gdk-sharp.dll.config.in gtk-sharp-1.0.6/gdk/gdk-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/gdk/gdk-sharp.dll.config.in	2004-12-16 18:15:44.000000000 +0100
---- gtk-sharp-1.0.6/gdk/gdk-sharp.dll.config.in	2005-03-08 12:40:58.000000000 +0100
-***************
-*** 3,6 ****
---- 3,7 ----
-    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gdksharpglue" target="libgdksharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/glade/glade-sharp.dll.config.in gtk-sharp-1.0.6/glade/glade-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/glade/glade-sharp.dll.config.in	2004-12-16 18:15:46.000000000 +0100
---- gtk-sharp-1.0.6/glade/glade-sharp.dll.config.in	2005-03-08 12:41:19.000000000 +0100
-***************
-*** 1,3 ****
---- 1,4 ----
-  <configuration>
-    <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gladesharpglue" target="libgladesharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/glib/glib-sharp.dll.config.in gtk-sharp-1.0.6/glib/glib-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/glib/glib-sharp.dll.config.in	2004-12-16 18:15:38.000000000 +0100
---- gtk-sharp-1.0.6/glib/glib-sharp.dll.config.in	2005-03-08 12:37:57.000000000 +0100
-***************
-*** 2,5 ****
---- 2,6 ----
-    <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="glibsharpglue" target="libglibsharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/gnome/gnome-sharp.dll.config.in gtk-sharp-1.0.6/gnome/gnome-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/gnome/gnome-sharp.dll.config.in	2004-12-16 18:15:43.000000000 +0100
---- gtk-sharp-1.0.6/gnome/gnome-sharp.dll.config.in	2005-03-08 12:41:50.000000000 +0100
-***************
-*** 8,11 ****
---- 8,12 ----
-    <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gnomesharpglue" target="libgnomesharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/gtk/gtk-sharp.dll.config.in gtk-sharp-1.0.6/gtk/gtk-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/gtk/gtk-sharp.dll.config.in	2004-12-16 18:14:51.000000000 +0100
---- gtk-sharp-1.0.6/gtk/gtk-sharp.dll.config.in	2005-03-08 12:38:19.000000000 +0100
-***************
-*** 3,6 ****
---- 3,7 ----
-    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gtksharpglue" target="libgtksharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/pango/pango-sharp.dll.config.in gtk-sharp-1.0.6/pango/pango-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/pango/pango-sharp.dll.config.in	2004-12-16 18:14:55.000000000 +0100
---- gtk-sharp-1.0.6/pango/pango-sharp.dll.config.in	2005-03-08 12:42:11.000000000 +0100
-***************
-*** 1,4 ****
---- 1,5 ----
-  <configuration>
-    <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="pangosharpglue" target="libpangosharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>

pkgs/development/libraries/gtk-sharp-1/glib-include.patch

@@ -1,24 +0,0 @@
-diff -ru gtk-sharp-1.0.6.orig/glib/glue/list.c gtk-sharp-1.0.6/glib/glue/list.c
---- gtk-sharp-1.0.6.orig/glib/glue/list.c	2014-01-09 10:58:06.727352451 +0000
-+++ gtk-sharp-1.0.6/glib/glue/list.c	2014-01-09 11:00:34.256583614 +0000
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_list_get_data (GList *l);
-diff -ru gtk-sharp-1.0.6.orig/glib/glue/slist.c gtk-sharp-1.0.6/glib/glue/slist.c
---- gtk-sharp-1.0.6.orig/glib/glue/slist.c	2014-01-09 10:58:06.727352451 +0000
-+++ gtk-sharp-1.0.6/glib/glue/slist.c	2014-01-09 11:00:47.572695223 +0000
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_slist_get_data (GSList *l);

pkgs/development/libraries/gtksourceview-sharp/builder.sh

@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-genericBuild
-
-# !!! hack
-export ALL_INPUTS="$out $pkgs"
-
-find $out -name "*.dll.config" | while read configFile; do
-    echo "modifying config file $configFile"
-    $monoDLLFixer "$configFile"
-done

pkgs/development/libraries/gtksourceview-sharp/default.nix

@@ -1,19 +0,0 @@
-{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtksourceview, monoDLLFixer}:
-
-stdenv.mkDerivation {
-  name = "gtksourceview-sharp-0.6-pre40261";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/gtksourceview-sharp-0.6-pre40261.tar.bz2;
-    md5 = "8bc26c182bd897f50988e110a9a11f34";
-  };
-
-  patches = [ ./prefix.patch ];
-
-  buildInputs = [
-    pkgconfig mono gtksharp gtksourceview
-  ];
-
-  inherit monoDLLFixer;
-}

pkgs/development/libraries/gtksourceview-sharp/prefix.patch

@@ -1,46 +0,0 @@
-diff -rc gtksourceview-sharp/gtksourceview/Makefile.in gtksourceview-sharp-new/gtksourceview/Makefile.in
-*** gtksourceview-sharp/gtksourceview/Makefile.in	2005-03-08 18:55:15.000000000 +0100
---- gtksourceview-sharp-new/gtksourceview/Makefile.in	2005-03-08 18:59:10.000000000 +0100
-***************
-*** 192,198 ****
-  EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview-api.raw AssemblyInfo.cs.in
-  DISTCLEANFILES = AssemblyInfo.cs
-  noinst_DATA = gtksourceview-sharp.dll
-! apidir = $(gtksharp_prefix)/share/gapi-2.0
-  api_DATA = gtksourceview-api.xml
-  sources = \
-  GtkSourceView.cs
---- 192,198 ----
-  EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview-api.raw AssemblyInfo.cs.in
-  DISTCLEANFILES = AssemblyInfo.cs
-  noinst_DATA = gtksourceview-sharp.dll
-! apidir = $(prefix)/share/gapi-2.0
-  api_DATA = gtksourceview-api.xml
-  sources = \
-  GtkSourceView.cs
-Only in gtksourceview-sharp-new/gtksourceview: Makefile.in~
-Only in gtksourceview-sharp-new/gtksourceview: Makefile.in.orig
-Only in gtksourceview-sharp-new/gtksourceview: Makefile.in.rej
-diff -rc gtksourceview-sharp/Makefile.in gtksourceview-sharp-new/Makefile.in
-*** gtksourceview-sharp/Makefile.in	2005-03-08 18:55:16.000000000 +0100
---- gtksourceview-sharp-new/Makefile.in	2005-03-08 18:59:33.000000000 +0100
-***************
-*** 211,217 ****
-  target_vendor = @target_vendor@
-  SUBDIRS = gtksourceview sample doc 
-  EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp.pc.in gtk-sharp.snk
-! extra_langdir = $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
-  extra_lang_DATA = nemerle.lang vbnet.lang
-  pkgconfigdir = $(libdir)/pkgconfig
-  pkgconfig_DATA = gtksourceview-sharp.pc
---- 211,217 ----
-  target_vendor = @target_vendor@
-  SUBDIRS = gtksourceview sample doc 
-  EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp.pc.in gtk-sharp.snk
-! extra_langdir = $(prefix)/share/gtksourceview-1.0/language-specs
-  extra_lang_DATA = nemerle.lang vbnet.lang
-  pkgconfigdir = $(libdir)/pkgconfig
-  pkgconfig_DATA = gtksourceview-sharp.pc
-Only in gtksourceview-sharp-new/: Makefile.in~
-Only in gtksourceview-sharp-new/: Makefile.in.orig
-Only in gtksourceview-sharp-new/: Makefile.in.rej

pkgs/top-level/all-packages.nix

@@ -5593,6 +5593,8 @@ let
       else stdenv;
   };
 
+  gnome-sharp = callPackage ../development/libraries/gnome-sharp {};
+
   granite = callPackage ../development/libraries/granite { };
 
   gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
@@ -5607,26 +5609,15 @@ let
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
-    gtksharp = gtksharp2;
+    gtksharp = gtk-sharp;
   };
 
-  gtksharp1 = callPackage ../development/libraries/gtk-sharp-1 {
+  gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 {
-    inherit (gnome) libglade libgtkhtml gtkhtml
-              libgnomecanvas libgnomeui libgnomeprint
-              libgnomeprintui GConf;
-  };
-
-  gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 {
     inherit (gnome) libglade libgtkhtml gtkhtml
               libgnomecanvas libgnomeui libgnomeprint
               libgnomeprintui GConf gnomepanel;
   };
 
-  gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp {
-    inherit (gnome) gtksourceview;
-    gtksharp = gtksharp2;
-  };
-
   gtkspell = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@@ -9997,11 +9988,6 @@ let
 
   freicoin = callPackage ../applications/misc/freicoin { };
 
-  fspot = callPackage ../applications/graphics/f-spot {
-    inherit (gnome) libgnome libgnomeui;
-    gtksharp = gtksharp1;
-  };
-
   fuze = callPackage ../applications/networking/instant-messengers/fuze {};
 
   game-music-emu = callPackage ../applications/audio/game-music-emu { };
@@ -10511,15 +10497,7 @@ let
 
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
-  monodevelop = callPackage ../applications/editors/monodevelop {
+  monodevelop = callPackage ../applications/editors/monodevelop {};
-    inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf;
-    mozilla = firefox;
-    gtksharp = gtksharp2;
-  };
-
-  monodoc = callPackage ../applications/editors/monodoc {
-    gtksharp = gtksharp1;
-  };
 
   monotone = callPackage ../applications/version-management/monotone {
     lua = lua5;
@@ -10836,7 +10814,7 @@ let
   pinpoint = callPackage ../applications/office/pinpoint {};
 
   pinta = callPackage ../applications/graphics/pinta {
-    gtksharp = gtksharp2;
+    gtksharp = gtk-sharp;
   };
 
   pommed = callPackage ../os-specific/linux/pommed {