From 1556527ddcc74e76e22a1c2c9cedf9d1494ab30e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Nov 2014 19:35:00 +0000 Subject: [PATCH 1/9] Removes monodevelop (obsolete and broken) --- .../editors/monodevelop/builder.sh | 28 ------------ .../editors/monodevelop/default.nix | 26 ----------- .../editors/monodevelop/prefix.patch | 44 ------------------- pkgs/top-level/all-packages.nix | 6 --- 4 files changed, 104 deletions(-) delete mode 100644 pkgs/applications/editors/monodevelop/builder.sh delete mode 100644 pkgs/applications/editors/monodevelop/default.nix delete mode 100644 pkgs/applications/editors/monodevelop/prefix.patch diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh deleted file mode 100644 index c069edb3a6d4..000000000000 --- a/pkgs/applications/editors/monodevelop/builder.sh +++ /dev/null @@ -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 - diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix deleted file mode 100644 index aad6325fa44d..000000000000 --- a/pkgs/applications/editors/monodevelop/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp -, gtkmozembedsharp, monodoc -, perl, perlXMLParser, pkgconfig -, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome -, mozilla, makeWrapper -}: - -stdenv.mkDerivation { - name = "monodevelop-0.6-pre2315"; - builder = ./builder.sh; - - src = fetchurl { - url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2; - md5 = "8c33df5629b0676b7ab552854c1de6fd"; - }; - - patches = [./prefix.patch]; - - buildInputs = [ - file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig - glib gtk GConf gnome_vfs libbonobo libglade libgnome - gtkmozembedsharp monodoc - ]; - - inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper; -} diff --git a/pkgs/applications/editors/monodevelop/prefix.patch b/pkgs/applications/editors/monodevelop/prefix.patch deleted file mode 100644 index 5ab0b4042dd4..000000000000 --- a/pkgs/applications/editors/monodevelop/prefix.patch +++ /dev/null @@ -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~ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb0a4596bc5..ec54abb39dec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10494,12 +10494,6 @@ let monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; - monodevelop = callPackage ../applications/editors/monodevelop { - inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf; - mozilla = firefox; - gtksharp = gtksharp2; - }; - monodoc = callPackage ../applications/editors/monodoc { gtksharp = gtksharp1; }; From dea34aeb4b72db6b635dd5a5b6403aa668f4efda Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Nov 2014 19:35:49 +0000 Subject: [PATCH 2/9] Removes monodoc (obsolete and broken) --- pkgs/applications/editors/monodoc/builder.sh | 20 ------------------- pkgs/applications/editors/monodoc/default.nix | 15 -------------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 39 deletions(-) delete mode 100644 pkgs/applications/editors/monodoc/builder.sh delete mode 100644 pkgs/applications/editors/monodoc/default.nix diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh deleted file mode 100644 index bcea7a7a89af..000000000000 --- a/pkgs/applications/editors/monodoc/builder.sh +++ /dev/null @@ -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 - - diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix deleted file mode 100644 index 0e8421646a86..000000000000 --- a/pkgs/applications/editors/monodoc/default.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec54abb39dec..eda7ba070767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10494,10 +10494,6 @@ let monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; - monodoc = callPackage ../applications/editors/monodoc { - gtksharp = gtksharp1; - }; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; }; From 480148f2ce6fe6031cb4decfc5732c72ebccd7f3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Nov 2014 20:15:06 +0000 Subject: [PATCH 3/9] Removes f-spot (broken) --- pkgs/applications/graphics/f-spot/builder.sh | 27 ---------------- pkgs/applications/graphics/f-spot/default.nix | 32 ------------------- .../applications/graphics/f-spot/dllmap.patch | 28 ---------------- pkgs/top-level/all-packages.nix | 5 --- 4 files changed, 92 deletions(-) delete mode 100644 pkgs/applications/graphics/f-spot/builder.sh delete mode 100644 pkgs/applications/graphics/f-spot/default.nix delete mode 100644 pkgs/applications/graphics/f-spot/dllmap.patch diff --git a/pkgs/applications/graphics/f-spot/builder.sh b/pkgs/applications/graphics/f-spot/builder.sh deleted file mode 100644 index 252c4f91e0c6..000000000000 --- a/pkgs/applications/graphics/f-spot/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix deleted file mode 100644 index 291f0adce582..000000000000 --- a/pkgs/applications/graphics/f-spot/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/graphics/f-spot/dllmap.patch b/pkgs/applications/graphics/f-spot/dllmap.patch deleted file mode 100644 index 956c75c0d23f..000000000000 --- a/pkgs/applications/graphics/f-spot/dllmap.patch +++ /dev/null @@ -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 **** - -! - ---- 1,3 ---- - -! - -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 **** - - - -! - ---- 9,13 ---- - - - -! - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eda7ba070767..00382abbac02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9984,11 +9984,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 {}; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; From 9ca516b081562f11dcca1115a5d3bd2565f4413e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Nov 2014 21:40:28 +0000 Subject: [PATCH 4/9] Removes legacy gtk-sharp-1 --- .../libraries/gtk-sharp-1/builder.sh | 11 ---- .../libraries/gtk-sharp-1/default.nix | 37 ----------- .../libraries/gtk-sharp-1/dllmap-glue.patch | 65 ------------------- .../libraries/gtk-sharp-1/glib-include.patch | 24 ------- pkgs/top-level/all-packages.nix | 14 ++-- 5 files changed, 4 insertions(+), 147 deletions(-) delete mode 100644 pkgs/development/libraries/gtk-sharp-1/builder.sh delete mode 100644 pkgs/development/libraries/gtk-sharp-1/default.nix delete mode 100644 pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch delete mode 100644 pkgs/development/libraries/gtk-sharp-1/glib-include.patch diff --git a/pkgs/development/libraries/gtk-sharp-1/builder.sh b/pkgs/development/libraries/gtk-sharp-1/builder.sh deleted file mode 100644 index 4b8f757540b5..000000000000 --- a/pkgs/development/libraries/gtk-sharp-1/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix deleted file mode 100644 index 863ee6c038d6..000000000000 --- a/pkgs/development/libraries/gtk-sharp-1/default.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch b/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch deleted file mode 100644 index 51f4524811dd..000000000000 --- a/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch +++ /dev/null @@ -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 ---- - - - -+ - -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 ---- - - -+ - -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 ---- - - - -+ - -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 ---- - - - -+ - -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 ---- - - - -+ - -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 ---- - - - -+ - diff --git a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch b/pkgs/development/libraries/gtk-sharp-1/glib-include.patch deleted file mode 100644 index e8f4b0ef5af3..000000000000 --- a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch +++ /dev/null @@ -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 -+#include - - /* 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 -+#include - - /* Forward declarations */ - gpointer gtksharp_slist_get_data (GSList *l); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00382abbac02..adbea769ba5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5596,16 +5596,10 @@ 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 { - inherit (gnome) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; - - gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 { + gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf gnomepanel; @@ -5613,7 +5607,7 @@ let gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp { inherit (gnome) gtksourceview; - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; gtkspell = callPackage ../development/libraries/gtkspell { }; @@ -10804,7 +10798,7 @@ let pinpoint = callPackage ../applications/office/pinpoint {}; pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; pommed = callPackage ../os-specific/linux/pommed { From 6d15aef1e3653913e78fb98edadcd831f11e337b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Nov 2014 23:02:36 +0000 Subject: [PATCH 5/9] Removes gtksourceview-sharp (broken) --- .../libraries/gtksourceview-sharp/builder.sh | 11 ----- .../libraries/gtksourceview-sharp/default.nix | 19 -------- .../gtksourceview-sharp/prefix.patch | 46 ------------------- pkgs/top-level/all-packages.nix | 5 -- 4 files changed, 81 deletions(-) delete mode 100644 pkgs/development/libraries/gtksourceview-sharp/builder.sh delete mode 100644 pkgs/development/libraries/gtksourceview-sharp/default.nix delete mode 100644 pkgs/development/libraries/gtksourceview-sharp/prefix.patch diff --git a/pkgs/development/libraries/gtksourceview-sharp/builder.sh b/pkgs/development/libraries/gtksourceview-sharp/builder.sh deleted file mode 100644 index 4b8f757540b5..000000000000 --- a/pkgs/development/libraries/gtksourceview-sharp/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix deleted file mode 100644 index 56c6e1b1ee5b..000000000000 --- a/pkgs/development/libraries/gtksourceview-sharp/default.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/development/libraries/gtksourceview-sharp/prefix.patch b/pkgs/development/libraries/gtksourceview-sharp/prefix.patch deleted file mode 100644 index b1b692063445..000000000000 --- a/pkgs/development/libraries/gtksourceview-sharp/prefix.patch +++ /dev/null @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adbea769ba5d..5bf40ee8fccd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5605,11 +5605,6 @@ let libgnomeprintui GConf gnomepanel; }; - gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp { - inherit (gnome) gtksourceview; - gtksharp = gtk-sharp; - }; - gtkspell = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; From 46e3a701a53b74d5289a758d87196990bf4a46e0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Oct 2014 00:09:10 +0100 Subject: [PATCH 6/9] mono: update from 3.2.8 to 3.8.0 --- pkgs/development/compilers/mono/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index e098f48a24ce..8137b2a3ab32 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/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 From 038c7b3fbb6410510d4ed1b3211f631383e551fb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 2 Nov 2014 12:04:53 +0000 Subject: [PATCH 7/9] fsharp: update from 3.1.1.26 to 3.1.1.31 --- pkgs/development/compilers/fsharp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 179c70a5f47d..f1161dd4dd16 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/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 ]; From 1da730d9109384dddb32f7ab9dfd8a6a5f26ca6d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Nov 2014 00:24:59 +0000 Subject: [PATCH 8/9] Adds gnome-sharp A .Net language binding for assorted GNOME libraries --- .../libraries/gnome-sharp/Makefile.in.patch | 11 ++++++++++ .../libraries/gnome-sharp/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/gnome-sharp/Makefile.in.patch create mode 100644 pkgs/development/libraries/gnome-sharp/default.nix diff --git a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch new file mode 100644 index 000000000000..46b644f2471a --- /dev/null +++ b/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) diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix new file mode 100644 index 000000000000..5818726e345e --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bf40ee8fccd..7b87003869f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5582,6 +5582,8 @@ let else stdenv; }; + gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; + granite = callPackage ../development/libraries/granite { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { From ba0e5d7be182f1ba32004d4de373daa7f40f1628 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Nov 2014 00:32:05 +0000 Subject: [PATCH 9/9] Adds monodevelop 5.1 --- .../editors/monodevelop/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/editors/monodevelop/default.nix diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix new file mode 100644 index 000000000000..737576a1da0d --- /dev/null +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchgit +, autoconf, automake, pkgconfig, shared_mime_info, intltool +, glib, mono, gtk-sharp, gnome-sharp +}: + +stdenv.mkDerivation rec { + version = "5.1.4.0"; + revision = "7d45bbe2ee22625f125d0c52548524f02d005cca"; + name = "monodevelop-${version}"; + src = fetchgit { + url = https://github.com/mono/monodevelop.git; + rev = revision; + sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b"; + }; + + buildInputs = [ + autoconf automake pkgconfig shared_mime_info intltool + mono gtk-sharp gnome-sharp + ]; + + preConfigure = "patchShebangs ./configure"; + preBuild = '' + cat > ./main/buildinfo < 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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b87003869f3..6d0c452803d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10480,6 +10480,8 @@ let monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; + monodevelop = callPackage ../applications/editors/monodevelop {}; + monotone = callPackage ../applications/version-management/monotone { lua = lua5; };