From 25fe5d43fe11840de8b773f41665952e2fef0277 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Apr 2012 19:51:53 +0000 Subject: [PATCH] Updated Haskell packages. - MemoTrie: updated to version 0.4.11 - X11: updated to version 1.6.0 - derive: updated to version 2.5.8 - gloss: updated to version 1.7.1.1 - haskell-src-exts: updated to version 1.13.0 - haskell-src-meta: updated to version 0.5.1.2 - hlint: updated to version 1.8.28 svn path=/nixpkgs/trunk/; revision=33528 --- .../libraries/haskell/MemoTrie/default.nix | 4 +-- .../haskell/X11/{default.nix => 1.5.0.1.nix} | 0 .../libraries/haskell/X11/1.6.0.nix | 19 ++++++++++++++ .../libraries/haskell/derive/default.nix | 4 +-- .../libraries/haskell/gloss/default.nix | 4 +-- .../{default.nix => 1.11.1.nix} | 0 .../haskell/haskell-src-exts/1.13.0.nix | 16 ++++++++++++ .../haskell/haskell-src-meta/default.nix | 4 +-- .../tools/haskell/hlint/default.nix | 4 +-- pkgs/top-level/haskell-packages.nix | 25 ++++++++++++++----- 10 files changed, 64 insertions(+), 16 deletions(-) rename pkgs/development/libraries/haskell/X11/{default.nix => 1.5.0.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/X11/1.6.0.nix rename pkgs/development/libraries/haskell/haskell-src-exts/{default.nix => 1.11.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index ee9f87ae8a8..8f039b19e46 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MemoTrie"; - version = "0.4.10"; - sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk"; + version = "0.4.11"; + sha256 = "0wlrsz9bsb7lkw1ja8x8jbm1v7558fg8npas1rnc5ikgfi0szzw4"; meta = { homepage = "http://haskell.org/haskellwiki/MemoTrie"; description = "Trie-based memo functions"; diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/1.5.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/X11/default.nix rename to pkgs/development/libraries/haskell/X11/1.5.0.1.nix diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.nix b/pkgs/development/libraries/haskell/X11/1.6.0.nix new file mode 100644 index 00000000000..6292f7eab5c --- /dev/null +++ b/pkgs/development/libraries/haskell/X11/1.6.0.nix @@ -0,0 +1,19 @@ +{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender, syb +}: + +cabal.mkDerivation (self: { + pname = "X11"; + version = "1.6.0"; + sha256 = "0jjnr4490mkdrmq3lvv7hha7rc9vbwsxlwsvcv56q6zgjx4zwf8j"; + buildDepends = [ syb ]; + extraLibraries = [ + libX11 libXext libXinerama libXrandr libXrender + ]; + meta = { + homepage = "https://github.com/haskell-pkg-janitors/X11"; + description = "A binding to the X11 graphics library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index bbaa68fdcf7..f3c1685998e 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.7"; - sha256 = "1a6nz0a7axgdghljcb87h4bhisjfsnpxpdbqlrxymw4zqislg9p3"; + version = "2.5.8"; + sha256 = "0l11pscya7mrn0502q8ndqn551k5aygbm7pihhs0nz8wwzr82xdv"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 46c453a5f30..d5b828cb0e7 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.0.1"; - sha256 = "1wsgrdkimpmii6iagcixsky5cnd6h0w1ssmrjcc15jlcmw460dfx"; + version = "1.7.1.1"; + sha256 = "0fmmcmmdcvc5vj33bm9xzzb2jpnnb7r89ghdqwgg2c5gxjqbcfbd"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskell-src-exts/default.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix new file mode 100644 index 00000000000..9f6c69669a0 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix @@ -0,0 +1,16 @@ +{ cabal, cpphs, happy }: + +cabal.mkDerivation (self: { + pname = "haskell-src-exts"; + version = "1.13.0"; + sha256 = "1kkhv8frvrry9jb38p5xmsqij0wrz88gszz5zcndcmbhkr5d4b64"; + buildDepends = [ cpphs ]; + buildTools = [ happy ]; + meta = { + homepage = "http://code.haskell.org/haskell-src-exts"; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 5fd332c1d34..2300d6e80ca 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5.1.1"; - sha256 = "1v192j47vxjisa5i2zd9lj7l9xa12jsg858yhx5qz624fcq73ggi"; + version = "0.5.1.2"; + sha256 = "09if8423dwf4jcr6p7d8j4r9i2n8jc7xxvjn1p1mwjp0ajzk8g9s"; buildDepends = [ haskellSrcExts syb thLift uniplate ]; meta = { description = "Parse source to template-haskell abstract syntax"; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 2945a661a36..ba7cfe7a51f 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.26"; - sha256 = "001id2853bkxnbh7jc0bvfyq7v9595zn31n7hhma3il0dqim71lp"; + version = "1.8.28"; + sha256 = "136arfmlfx15qwxvg3lw6wci8fiva1f9hjrk5qf70k9g84dxsjn8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b9d39873f9c..b7271f41898 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -422,7 +422,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Haskell libraries. - Agda = callPackage ../development/libraries/haskell/Agda {}; + Agda = callPackage ../development/libraries/haskell/Agda { + haskellSrcExts = self.haskellSrcExts_1_11_1; + }; ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; @@ -793,7 +795,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; haskellSrc = self.haskellSrc_1_0_1_5; - haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {}; + haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; + haskellSrcExts_1_13_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.0.nix {}; + haskellSrcExts = self.haskellSrcExts_1_13_0; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; @@ -1462,7 +1466,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; - X11 = callPackage ../development/libraries/haskell/X11 {}; + X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; + X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {}; + X11 = self.X11_1_6_0; X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; @@ -1630,11 +1636,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec = self.parsec3; }; - xmonad = callPackage ../applications/window-managers/xmonad {}; + xmonad = callPackage ../applications/window-managers/xmonad { + X11 = self.X11_1_5_0_1; + }; - xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {}; + xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix { + X11 = self.X11_1_5_0_1; + X11Xft = self.X11Xft.override { X11 = self.X11_1_5_0_1; }; + }; - xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {}; + xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix { + X11 = self.X11_1_5_0_1; + }; # Tools.