From 25db5f1a9d49666486b49014d1eb7d9325172545 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 4 Jan 2012 13:55:54 +0000 Subject: Adding libgdiplus for mono, and making mono reference it. svn path=/nixpkgs/trunk/; revision=31276 --- pkgs/development/libraries/libgdiplus/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/libgdiplus/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix new file mode 100644 index 000000000000..27745cc209ad --- /dev/null +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig +, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer, +libXrender, libexif }: + +stdenv.mkDerivation { + name = "libgdiplus-2.10"; + + src = fetchurl { + url = http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.tar.bz2; + sha256 = "190j6yvfbpg6bda4n7pdcf2dbqdvrb4dmz5abs2yv0smxybh77id"; + }; + + buildInputs = [ pkgconfig glib cairo fontconfig libtiff giflib libungif + libjpeg libpng libXrender libexif ]; +} -- cgit 1.4.1 From aac6654ed531a9ed977cff5950f592c40edb0207 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:32 +0000 Subject: haskell-vector: updated to version 0.9.1 svn path=/nixpkgs/trunk/; revision=31283 --- pkgs/development/libraries/haskell/vector/0.9.1.nix | 18 ++++++++++++++++++ pkgs/development/libraries/haskell/vector/0.9.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/libraries/haskell/vector/0.9.1.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.9.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix new file mode 100644 index 000000000000..c5c06fe93e5c --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.9.1.nix @@ -0,0 +1,18 @@ +{ cabal, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.9.1"; + sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; + buildDepends = [ primitive ]; + meta = { + homepage = "http://code.haskell.org/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/0.9.nix b/pkgs/development/libraries/haskell/vector/0.9.nix deleted file mode 100644 index 549eaa4ae60f..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.9"; - sha256 = "0m8sfp924sw5dwr9a63jgsbj98qm9nyy903842x6ii4ljb1cpynz"; - buildDepends = [ primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dc5e772df0f0..2c182e461f4a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1344,10 +1344,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix { primitive = self.primitive_0_3_1; }; - vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix { + vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix { primitive = self.primitive_0_4_0_1; }; - vector = self.vector_0_9; + vector = self.vector_0_9_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; -- cgit 1.4.1 From 2f3cb61b985471987a88f63be64a34caa7705f75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:36 +0000 Subject: haskell-sendfile: updated to version 0.7.4 svn path=/nixpkgs/trunk/; revision=31284 --- pkgs/development/libraries/haskell/sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index 94244755b731..b2c24da5b1b4 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "sendfile"; - version = "0.7.3"; - sha256 = "0xa5ryyznw7cizdqjnisvyhirdljw5z7aydwv5m9lv9hkx3bs6l0"; + version = "0.7.4"; + sha256 = "1h02fjdivsb3divdn3wg2skmw3jcd0n4axhlpgmrrbf92c3m35rq"; buildDepends = [ network ]; meta = { homepage = "http://patch-tag.com/r/mae/sendfile"; -- cgit 1.4.1 From 660701471cf67a6866f75d8a5c4d6c6053e2c0bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:40 +0000 Subject: Dropped obsolete versions of haskell-primitive and haskell-vector. svn path=/nixpkgs/trunk/; revision=31285 --- pkgs/development/libraries/haskell/primitive/0.3.1.nix | 17 ----------------- .../libraries/haskell/primitive/0.4.0.1.nix | 17 ----------------- .../libraries/haskell/primitive/default.nix | 17 +++++++++++++++++ pkgs/development/libraries/haskell/vector/0.7.1.nix | 18 ------------------ pkgs/development/libraries/haskell/vector/0.9.1.nix | 18 ------------------ pkgs/development/libraries/haskell/vector/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 12 ++---------- 7 files changed, 37 insertions(+), 80 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/primitive/0.3.1.nix delete mode 100644 pkgs/development/libraries/haskell/primitive/0.4.0.1.nix create mode 100644 pkgs/development/libraries/haskell/primitive/default.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.7.1.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.9.1.nix create mode 100644 pkgs/development/libraries/haskell/vector/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/primitive/0.3.1.nix b/pkgs/development/libraries/haskell/primitive/0.3.1.nix deleted file mode 100644 index 6e7b485eece0..000000000000 --- a/pkgs/development/libraries/haskell/primitive/0.3.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.3.1"; - sha256 = "1903hx88ax4dgyyx00a0k86jy4mkqrprpn7arfy19dqqyfpb2ikj"; - meta = { - homepage = "http://code.haskell.org/primitive"; - description = "Wrappers for primitive operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix deleted file mode 100644 index 62693a6d0965..000000000000 --- a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.4.0.1"; - sha256 = "08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz"; - meta = { - homepage = "http://code.haskell.org/primitive"; - description = "Wrappers for primitive operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix new file mode 100644 index 000000000000..62693a6d0965 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.4.0.1"; + sha256 = "08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz"; + meta = { + homepage = "http://code.haskell.org/primitive"; + description = "Wrappers for primitive operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/0.7.1.nix b/pkgs/development/libraries/haskell/vector/0.7.1.nix deleted file mode 100644 index 8762d148e281..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.7.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.7.1"; - sha256 = "1cdbkabw49pgc1j5h96inpmhn8ly230885d22smmynrq369pmg07"; - buildDepends = [ primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix deleted file mode 100644 index c5c06fe93e5c..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.9.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.9.1"; - sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; - buildDepends = [ primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix new file mode 100644 index 000000000000..c5c06fe93e5c --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/default.nix @@ -0,0 +1,18 @@ +{ cabal, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.9.1"; + sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; + buildDepends = [ primitive ]; + meta = { + homepage = "http://code.haskell.org/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2c182e461f4a..b4fdbe463297 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1055,9 +1055,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; - primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {}; - primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {}; - primitive = self.primitive_0_4_0_1; + primitive = callPackage ../development/libraries/haskell/primitive {}; processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; @@ -1341,13 +1339,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; - vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix { - primitive = self.primitive_0_3_1; - }; - vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix { - primitive = self.primitive_0_4_0_1; - }; - vector = self.vector_0_9_1; + vector = callPackage ../development/libraries/haskell/vector {}; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; -- cgit 1.4.1 From 883ae24a70732c5811631d76f4328b43294ba29c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:44 +0000 Subject: haskell-conduit: updated to version 0.0.0.2 svn path=/nixpkgs/trunk/; revision=31286 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 76a7130ecb17..752894593854 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.0.0.1"; - sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv"; + version = "0.0.0.2"; + sha256 = "1fngrlly5q2l0j3fil4cx3zj2h4sxnh20i0r84l4qhl8s0x5ba5z"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; -- cgit 1.4.1 From 9bd85d5cf23a7cc04c74b396745f6c6541ca0234 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:47 +0000 Subject: haskell-continued-fractions: updated to version 0.9.1.1 svn path=/nixpkgs/trunk/; revision=31287 --- pkgs/development/libraries/haskell/continued-fractions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 71801a324c36..26b683c19696 100755 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "continued-fractions"; - version = "0.9.1.0"; - sha256 = "07g6ms68xfzd25zr2k2fpg4f4pynmq4mn7djkzrg3gbfh9gfq37q"; + version = "0.9.1.1"; + sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; meta = { homepage = "/dev/null"; description = "Continued fractions"; -- cgit 1.4.1 From cde76888f96015775d4eccccb3dfe82b509fbcbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:50 +0000 Subject: haskell-gamma: updated to version 0.9.0.2 svn path=/nixpkgs/trunk/; revision=31288 --- pkgs/development/libraries/haskell/gamma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 7a068a25eeed..2853fbca7685 100755 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gamma"; - version = "0.9.0.1"; - sha256 = "02s9m2vlrnfg26c7921x60xxmawzzk27y3czcnvs8hlk01mb1xv7"; + version = "0.9.0.2"; + sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; buildDepends = [ continuedFractions converge vector ]; meta = { homepage = "https://github.com/mokus0/gamma"; -- cgit 1.4.1 From 18bf57c213bae39cefd1236fd594d9b3e593509e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:53 +0000 Subject: haskell-haskeline: updated to version 0.6.4.6 svn path=/nixpkgs/trunk/; revision=31289 --- pkgs/development/libraries/haskell/haskeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 2b15fa562bfc..f3cd0fd4aedf 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.6.4.5"; - sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b"; + version = "0.6.4.6"; + sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj"; buildDepends = [ extensibleExceptions mtl terminfo utf8String ]; meta = { homepage = "http://trac.haskell.org/haskeline"; -- cgit 1.4.1 From b515072dbe7ec774216a2456abd9ca1bef8cce7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:55 +0000 Subject: haskell-http-conduit: updated to version 1.0.0.1 svn path=/nixpkgs/trunk/; revision=31290 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ab011d5c87b4..9a2ac22721c7 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.0.0"; - sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk"; + version = "1.0.0.1"; + sha256 = "0yag65ariakvbvsrr3kd16bags4caw8n3qlcwpzrblprgjrv06vm"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 35807a138dcd10a929100099fe49041a9fc1d86b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:48:58 +0000 Subject: haskell-http-enumerator: updated to version 0.7.2.2 svn path=/nixpkgs/trunk/; revision=31291 --- pkgs/development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 2a285965f9cb..c29489e1d9fe 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2.1"; - sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i"; + version = "0.7.2.2"; + sha256 = "0s0mjws2sgpbydx4cv9waz71lpylgbbyk0wmvypyjvfhxd9d01hf"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From e822279529b4e4fc8b267b41c48fb055409fe522 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:49:01 +0000 Subject: haskell-xml-enumerator: updated to version 0.4.4.1 svn path=/nixpkgs/trunk/; revision=31292 --- pkgs/development/libraries/haskell/xml-enumerator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index 698279be5c63..c891096c2057 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,15 +5,15 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.4"; - sha256 = "1xz37gzk3kk9sqkcbyspcdyz7rk3afkv33g7q45ih5fbd7zkd5gm"; + version = "0.4.4.1"; + sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the enumerator package"; + description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ -- cgit 1.4.1 From a227e558ee870f6b3c7052b7b0c02cb6c1de88e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:49:04 +0000 Subject: haskell-numeric-prelude: updated to version 0.3 svn path=/nixpkgs/trunk/; revision=31293 --- .../development/libraries/haskell/numeric-prelude/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index cef5347e758f..ef3ffbddf1a9 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -1,15 +1,16 @@ -{ cabal, nonNegative, parsec, QuickCheck, random, storableRecord -, utilityHt +{ cabal, deepseq, nonNegative, parsec, QuickCheck, random +, storableRecord, utilityHt }: cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.2.2.1"; - sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da"; + version = "0.3"; + sha256 = "0zxqfsgyg7gf051qjzv57bb1cvrbzlvvyyl2d3gmikyy6h3pis1f"; isLibrary = true; isExecutable = true; buildDepends = [ - nonNegative parsec QuickCheck random storableRecord utilityHt + deepseq nonNegative parsec QuickCheck random storableRecord + utilityHt ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; -- cgit 1.4.1 From 8869873f106c4ce947cefa99a909f0b4e1b37555 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jan 2012 17:49:07 +0000 Subject: haskell-random-fu: updated to version 0.2.1.1 svn path=/nixpkgs/trunk/; revision=31294 --- pkgs/development/libraries/haskell/random-fu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index a094ee687e6a..653a4c8534d0 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "random-fu"; - version = "0.2.1.0"; - sha256 = "0jm91xjrlzj25f3giiv2ka5r8bn1ircj56d5lpqixi7c7r9dc804"; + version = "0.2.1.1"; + sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7"; buildDepends = [ erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector -- cgit 1.4.1 From ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Jan 2012 19:48:08 +0000 Subject: * Resolve a collision between OpenSSL and man-pages (in ‘share/man/man3/err.3’). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=31296 --- pkgs/development/libraries/openssl/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 01f9eca15bb9..dd5e03c33f92 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; + priority = 10; # resolves collision with ‘man-pages’ }; } -- cgit 1.4.1 From 2c9461ebddfb19633c1266aed9e2cb6cb47e239e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 4 Jan 2012 23:05:41 +0000 Subject: freeglut-2.8.0 svn path=/nixpkgs/trunk/; revision=31304 --- .../0001-remove-typedefs-now-living-in-mesa.patch | 43 ++++++++++++++++++++++ pkgs/development/libraries/freeglut/default.nix | 12 +++--- 2 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch new file mode 100644 index 000000000000..b11a50a9de10 --- /dev/null +++ b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch @@ -0,0 +1,43 @@ +From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001 +From: Florian Friesdorf +Date: Wed, 4 Jan 2012 23:12:44 +0100 +Subject: [PATCH] remove typedefs now living in mesa + +--- + progs/demos/smooth_opengl3/smooth_opengl3.c | 20 -------------------- + 1 files changed, 0 insertions(+), 20 deletions(-) + +diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c +index abbdfb5..1172615 100755 +--- a/progs/demos/smooth_opengl3/smooth_opengl3.c ++++ b/progs/demos/smooth_opengl3/smooth_opengl3.c +@@ -98,26 +98,6 @@ typedef char ourGLchar; + #define APIENTRY + #endif + +-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); +-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); +-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); +-typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type); +-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); +-typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader); +-typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void); +-typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +-typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program); +-typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program); +-typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); +-typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +-typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); +-typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +-typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); +-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); +-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); +-typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); +-typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +- + PFNGLGENBUFFERSPROC gl_GenBuffers; + PFNGLBINDBUFFERPROC gl_BindBuffer; + PFNGLBUFFERDATAPROC gl_BufferData; +-- +1.7.8 + diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index a225ca748a2f..9d599560fc80 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, x11, mesa}: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }: stdenv.mkDerivation { - name = "freeglut-2.4.0"; + name = "freeglut-2.8.0"; src = fetchurl { - url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz; - sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6"; + url = mirror://sourceforge/freeglut/freeglut-2.8.0.tar.gz; + sha256 = "197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05"; }; configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings"; - buildInputs = [x11 mesa]; - patches = ./freeglut-gcc-4.2.patch; + buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ]; + patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ]; } -- cgit 1.4.1 From e0488019665c24a7694ce31a3d70c284ff519caa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 5 Jan 2012 11:56:32 +0000 Subject: Update chipmunk svn path=/nixpkgs/trunk/; revision=31310 --- pkgs/development/libraries/chipmunk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index f0613834364f..5dbb31e9bcef 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -4,7 +4,8 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.attrByPath ["version"] "4.1.0" args; + version = lib.attrByPath ["version"] "6.0.3" args; + majorVersion = lib.attrByPath ["majorVersion"] "6" args; buildInputs = with args; [ cmake freeglut mesa libX11 xproto inputproto libXi libXmu @@ -12,8 +13,8 @@ let in rec { src = fetchurl { - url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${version}.tgz"; - sha256 = "0ry17lf4kdcac91bpavks2cswch3izsmmam0yhczk7rayj9cvqsh"; + url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; + sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a"; }; inherit buildInputs; @@ -28,7 +29,7 @@ rec { demoInstall = fullDepEntry('' ensureDir $out/bin - cp chipmunk_demos $out/bin + cp Demo/chipmunk_demos $out/bin '') ["doMakeInstall" "defEnsureDir"]; name = "chipmunk-" + version; -- cgit 1.4.1