alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Drop obsolete versions of Haskell cairo, glib, gtk, pango, threadscope, and some other patches.

Browse source
This commit is contained in:
Peter Simons 2014-11-13 14:56:49 +01:00
parent 095516a30b
commit 76ed569875
13 changed files with 4 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/development/libraries/haskell/cairo/0.12.5.3.nix
View file

@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String
, zlib
}:
cabal.mkDerivation (self: {
pname = "cairo";
version = "0.12.5.3";
sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
buildDepends = [ mtl utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Cairo library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

0
pkgs/development/libraries/haskell/cairo/0.13.0.4.nix → pkgs/development/libraries/haskell/cairo/default.nix
View file

21
pkgs/development/libraries/haskell/glib/0.12.5.4.nix
View file

@ -1,21 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String
}:
cabal.mkDerivation (self: {
pname = "glib";
version = "0.12.5.4";
sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
buildDepends = [ utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];
patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk2hs.patch ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GLIB library for Gtk2Hs";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/glib/0.13.0.5.nix → pkgs/development/libraries/haskell/glib/default.nix
View file

15
pkgs/development/libraries/haskell/glib/gtk2hs.patch
View file

@ -1,15 +0,0 @@
Author: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon Jul 7 21:28:50 2014 +1200
Fixes #1
--- a/glib.cabal.orig 2014-11-03 14:52:40.000000000 -0600
+++ b/glib.cabal 2014-11-03 14:52:51.000000000 -0600
@@ -36,6 +36,7 @@
utf8-string >= 0.2 && < 0.4,
containers
build-tools: gtk2hsC2hs >= 0.13.8
+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
if flag(closure_signals)
cpp-options: -DUSE_GCLOSURE_SIGNALS_IMPL
c-sources: System/Glib/hsgclosure.ccommit aa22754e04616c354557fc350f96a8f7f331e984

22
pkgs/development/libraries/haskell/gtk/0.12.5.7.nix
View file

@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
, pkgconfig, text
}:
cabal.mkDerivation (self: {
pname = "gtk";
version = "0.12.5.7";
sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
buildDepends = [ cairo gio glib mtl pango text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk.patch ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Gtk+ graphical user interface library";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/gtk/0.13.0.3.nix → pkgs/development/libraries/haskell/gtk/default.nix
View file

10
pkgs/development/libraries/haskell/gtk/gtk.patch
View file

@ -1,10 +0,0 @@
--- a/gtk.cabal.orig 2014-11-03 15:13:42.000000000 -0600
+++ b/gtk.cabal 2014-11-03 15:14:05.000000000 -0600
@@ -148,6 +148,7 @@
build-tools: gtk2hsC2hs >= 0.13.8,
gtk2hsHookGenerator, gtk2hsTypeGen
+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
exposed-modules:
Graphics.UI.Gtk

22
pkgs/development/libraries/haskell/pango/0.12.5.3.nix
View file

@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
, text
}:
cabal.mkDerivation (self: {
pname = "pango";
version = "0.12.5.3";
sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
buildDepends = [ cairo glib mtl text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ cairo pango ];
patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./pango.patch ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Pango text rendering engine";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/pango/0.13.0.3.nix → pkgs/development/libraries/haskell/pango/default.nix
View file

10
pkgs/development/libraries/haskell/pango/pango.patch
View file

@ -1,10 +0,0 @@
--- a/pango.cabal.orig 2014-11-03 15:11:35.000000000 -0600
+++ b/pango.cabal 2014-11-03 15:11:57.000000000 -0600
@@ -52,6 +52,7 @@
build-depends: base < 4
build-tools: gtk2hsC2hs >= 0.13.8, gtk2hsTypeGen
+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
exposed-modules: Graphics.Rendering.Pango
Graphics.Rendering.Pango.Font

14
pkgs/development/tools/haskell/threadscope/threadscope.patch
View file

@ -1,14 +0,0 @@
--- a/threadscope.cabal.orig 2014-11-03 15:23:29.000000000 -0600
+++ b/threadscope.cabal 2014-11-03 15:24:01.000000000 -0600
@@ -41,7 +41,10 @@
Executable threadscope
Main-is: Main.hs
Build-Depends: base >= 4.0 && < 5,
- gtk >= 0.12, cairo, glib, pango,
+ gtk >= 0.12 && < 0.13,
+ cairo < 0.13,
+ glib < 0.13,
+ pango < 0.13,
binary, array, mtl, filepath,
ghc-events >= 0.4.2,
containers >= 0.2 && < 0.6,

33
pkgs/top-level/haskell-packages.nix
View file

@ -356,15 +356,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabalMacosx = callPackage ../development/libraries/haskell/cabal-macosx {};
cairo_0_12_5_3 = callPackage ../development/libraries/haskell/cairo/0.12.5.3.nix {
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
libc = pkgs.stdenv.gcc.libc;
};
cairo_0_13_0_4 = callPackage ../development/libraries/haskell/cairo/0.13.0.4.nix {
inherit (pkgs) cairo zlib;
libc = pkgs.stdenv.gcc.libc;
};
cairo = self.cairo_0_13_0_4;
carray = callPackage ../development/libraries/haskell/carray {};
@ -956,15 +951,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
GLFWB = callPackage ../development/libraries/haskell/GLFW-b {};
glib_0_12_5_4 = callPackage ../development/libraries/haskell/glib/0.12.5.4.nix {
glib = callPackage ../development/libraries/haskell/glib {
glib = pkgs.glib;
libc = pkgs.stdenv.gcc.libc;
};
glib_0_13_0_5 = callPackage ../development/libraries/haskell/glib/0.13.0.5.nix {
glib = pkgs.glib;
libc = pkgs.stdenv.gcc.libc;
};
glib = self.glib_0_13_0_5;
Glob = callPackage ../development/libraries/haskell/Glob {};
@ -996,18 +986,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; };
gtk_0_12_5_7 = callPackage ../development/libraries/haskell/gtk/0.12.5.7.nix {
inherit (pkgs) gtk;
libc = pkgs.stdenv.gcc.libc;
glib = self.glib_0_12_5_4;
cairo = self.cairo_0_12_5_3;
pango = self.pango_0_12_5_3;
};
gtk_0_13_0_3 = callPackage ../development/libraries/haskell/gtk/0.13.0.3.nix {
gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs) gtk;
libc = pkgs.stdenv.gcc.libc;
};
gtk = self.gtk_0_13_0_3;
gtk3 = callPackage ../development/libraries/haskell/gtk3 {
inherit (pkgs) gtk3;
@ -1833,17 +1815,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
pango_0_12_5_3 = callPackage ../development/libraries/haskell/pango/0.12.5.3.nix {
inherit (pkgs) pango;
libc = pkgs.stdenv.gcc.libc;
glib = self.glib_0_12_5_4;
cairo = self.cairo_0_12_5_3;
};
pango_0_13_0_3 = callPackage ../development/libraries/haskell/pango/0.13.0.3.nix {
pango = callPackage ../development/libraries/haskell/pango {
inherit (pkgs) pango;
libc = pkgs.stdenv.gcc.libc;
};
pango = self.pango_0_13_0_3;
parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {};
parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {};