diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-07 09:38:20 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-07 09:38:20 +0000 |
commit | c615cbae70061c0ab0ce5d433a3ff3eb19eb0180 (patch) | |
tree | ee27eb37453c430b8e67b4672e41d16f8c69315c /pkgs/development/libraries | |
parent | a810d44d8137e2af5fea2be00caecbd2fc9580ee (diff) | |
parent | a21457ffa899ee53a69651f563cdc035f6f15d19 (diff) | |
download | nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.gz nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.bz2 nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.lz nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.xz nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.tar.zst nixlib-c615cbae70061c0ab0ce5d433a3ff3eb19eb0180.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32099
Diffstat (limited to 'pkgs/development/libraries')
27 files changed, 181 insertions, 68 deletions
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index d22eb738671e..138ee6eb27f5 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, unzip, libtool }: stdenv.mkDerivation rec { - name = "crypto++-5.6.0"; + name = "crypto++-5.6.1"; src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp560.zip"; - sha256 = "1icbk50mr1sqycqbxbqg703m8aamz23ajgl22ychxdahz2sz08mm"; + url = "mirror://sourceforge/cryptopp/cryptopp561.zip"; + sha256 = "0s7jhvnfihikqp1iwpdz03fad62xkjxci6jiahrh6f3sn664vrwq"; }; patches = [ ./pic.patch ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; cxxflags = if stdenv.isi686 then "-march=i686" else - if stdenv.isx86_64 then "-march=nocona" else + if stdenv.isx86_64 then "-march=nocona -fPIC" else ""; configurePhase = '' @@ -35,12 +35,10 @@ stdenv.mkDerivation rec { -e '/^CXXFLAGS =/s|-g -O2|-O3|' ''; - # Deal with one of the crappiest build system around there. + # I add what 'enableParallelBuilding' would add to the make call, + # if we were using the generic build phase. buildPhase = '' - # These guys forgot a file or something. - : > modexppc.cpp - - make PREFIX="$out" all cryptopp.dll + make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run @@ -48,11 +46,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir "$out" make install PREFIX="$out" - cp -v cryptopp.dll "$out/lib/libcryptopp.so" ''; doCheck = true; - checkPhase = "make test"; + checkPhase = "LD_LIBRARY_PATH=`pwd` make test"; meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index 034808566692..1397bea4f2be 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.1.0.1"; - sha256 = "0n2yazdk98ia9j65n4ac7k0lnyp9cmz51d344x0jsi0xyfckm0mq"; + version = "1.2.0.0"; + sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix new file mode 100644 index 000000000000..109ea000b439 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix @@ -0,0 +1,21 @@ +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, OpenGLRaw, StateVar, Tensor +}: + +cabal.mkDerivation (self: { + pname = "GLUT"; + version = "2.3.0.0"; + sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99"; + buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL Utility Toolkit"; + 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/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index 8084ada2cd68..cdd071b2b675 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ bktrees extensibleExceptions fgl graphviz pandoc random text time ]; + patchPhase = '' + sed -i Graphalyze.cabal -e 's|pandoc == 1.8.\*|pandoc|' + ''; meta = { description = "Graph-Theoretic Analysis library"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index e55619fb3abd..25143e647bb7 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaskellForMaths"; - version = "0.4.1"; - sha256 = "0jwdxz5wqayx196giv7nj5j0k9zw50x555ig6xj00cladvplvh9h"; + version = "0.4.3"; + sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns"; buildDepends = [ random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix new file mode 100644 index 000000000000..8e616e4e0694 --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix @@ -0,0 +1,21 @@ +{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar +, Tensor +}: + +cabal.mkDerivation (self: { + pname = "OpenGL"; + version = "2.5.0.0"; + sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j"; + buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; + extraLibraries = [ libX11 mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL graphics system"; + 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/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index 3a86955a4383..70c25ea9ac6e 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenGLRaw"; - version = "1.1.0.2"; - sha256 = "0d1rjh2vq0w1pzf3vz0mw6p0w43h3sf6034qsi89m4jkx3125fwf"; + version = "1.2.0.0"; + sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r"; extraLibraries = [ mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 945e9ee35e03..2566e098656a 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.0.6"; - sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba"; + version = "1.0.8"; + sha256 = "1c1236a8829418cae3039c3479875104664827c661b8c7567dd7bdbda12e8bcc"; buildDepends = [ attoparsec attoparsecEnumerator ghcPaths hlint regexPosix ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 654d50cdc95a..acb75b05ae94 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.5.0"; - sha256 = "1y1dqfbas7ym1jghq3i7zhqcny01paqfrszj0aakg6ys2jjx0m29"; + version = "3.2.6.0"; + sha256 = "1yg97kihfxb250vk9dm2v9sh197lc6qjil0j40zgcwpss96xynax"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index ecaf46c0b77c..a4f7e906a9ea 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -1,12 +1,12 @@ -{ cabal, parsec, regexPcreBuiltin, xhtml }: +{ cabal, blazeHtml, mtl, parsec, regexPcreBuiltin }: cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.2.10"; - sha256 = "0cw89qsslrp4zh47ics7bg79fkqnxpnyz1a9xws0xzd9xmg3zrhh"; + version = "0.5.0.1"; + sha256 = "05r8w4366gi64l65k6vyda1cs96ld8i2dgch8r5fmxwiaa8dcs1l"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec regexPcreBuiltin xhtml ]; + buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ]; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 6fd387fc23b9..0a4dd110fee2 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,19 +1,19 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase -, monadControl, network, socks, text, time, tls, tlsExtra -, transformers, transformersBase, utf8String, zlibConduit +, monadControl, network, text, time, tls, tlsExtra, transformers +, transformersBase, utf8String, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.2.3"; - sha256 = "0kygmbcvv0j020ml9jgmg3yzda3k066s2h8g3c135cmad6jc8hnd"; + version = "1.2.0"; + sha256 = "1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cprngAes - dataDefault failure httpTypes liftedBase monadControl network socks - text time tls tlsExtra transformers transformersBase utf8String + dataDefault failure httpTypes liftedBase monadControl network text + time tls tlsExtra transformers transformersBase utf8String zlibConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 6d5720658ceb..063fe6f45c56 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.8.2"; - sha256 = "04whkqld2pnfz25i9rcq7d4pi9zkn6c1rpz95vdlg9r5xkhhnn3a"; + version = "1.9.0.2"; + sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 455baa9ee1d3..de998c51b93c 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,18 +1,23 @@ -{ cabal, base64Bytestring, citeprocHs, dlist, extensibleExceptions -, highlightingKate, HTTP, json, mtl, network, pandocTypes, parsec -, random, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive +{ cabal, ansiTerminal, base64Bytestring, blazeHtml, citeprocHs +, Diff, extensibleExceptions, highlightingKate, HTTP, HUnit, json +, mtl, network, pandocTypes, parsec, QuickCheck, random, syb +, tagsoup, temporary, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, texmath, time, utf8String, xml +, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.8.2.1"; - sha256 = "0cwly0j2rj46h654iwl04l6jkhk6rrhynqvrdnq47067n9vm60pi"; + version = "1.9.0.3"; + sha256 = "1p5054sdvvgl38rr0ajfavr79rwr2l8jdrpzai329ksskkh1acdp"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring citeprocHs dlist extensibleExceptions - highlightingKate HTTP json mtl network pandocTypes parsec random - syb tagsoup texmath utf8String xhtml xml zipArchive + ansiTerminal base64Bytestring blazeHtml citeprocHs Diff + extensibleExceptions highlightingKate HTTP HUnit json mtl network + pandocTypes parsec QuickCheck random syb tagsoup temporary + testFramework testFrameworkHunit testFrameworkQuickcheck2 texmath + time utf8String xml zipArchive zlib ]; configureFlags = "-fhighlighting -fthreaded"; meta = { diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix index 70709c978b97..55bc7f74d297 100644 --- a/pkgs/development/libraries/haskell/parsimony/default.nix +++ b/pkgs/development/libraries/haskell/parsimony/default.nix @@ -1,10 +1,10 @@ -{ cabal, utf8String }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "parsimony"; - version = "1.1"; - sha256 = "0476zmsjyjf58lh85806baqblq8hjxcrrnqc6ddxxq17lmvsd5ic"; - buildDepends = [ utf8String ]; + version = "1.3"; + sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg"; + buildDepends = [ text ]; meta = { description = "Monadic parser combinators derived from Parsec"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 844864ac1031..cd514f7ce232 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.3"; - sha256 = "0z7y99g8ij9ykpxsgdb0addyibvpv2s95i0wpx4yc7mgi8cl50bx"; + version = "0.3.4"; + sha256 = "184f5bb3qhag6cwmk0zc2ldkwnkzbv82pv7hy541j8jqqi5wprih"; buildDepends = [ systemFilepath text time ]; meta = { - homepage = "https://john-millikin.com/software/hs-fileio/"; - description = "High-level filesystem interaction"; + homepage = "https://john-millikin.com/software/haskell-filesystem/"; + description = "Consistent filesystem interaction across GHC versions"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index ee42d3415f25..e0ad17c6acbb 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.4"; - sha256 = "16904xwbcy82ghf1bckw8h63pfj9jfbdlqrr8jf91jzl27lqlwxf"; + version = "0.4.5"; + sha256 = "18jpn3pyy6dh20xpdlwmhcjvbywjz4vr9fvwcwhylbicrw627ybs"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix new file mode 100644 index 000000000000..fd31d2460046 --- /dev/null +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "temporary"; + version = "1.1.2.3"; + sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd"; + meta = { + homepage = "http://www.github.com/batterseapower/temporary"; + description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; + 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/test-framework/0.4.2.2.nix b/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix new file mode 100644 index 000000000000..4b920133ffd9 --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix @@ -0,0 +1,25 @@ +{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname +, random, regexPosix, time, xml +}: + +cabal.mkDerivation (self: { + pname = "test-framework"; + version = "0.4.2.2"; + sha256 = "1lwdx4z9j5wxbmmlakf6knirdhi0ic6xpmhrj9ipa5ybw2zszakr"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal ansiWlPprint extensibleExceptions hostname random + regexPosix time xml + ]; + meta = { + homepage = "http://batterseapower.github.com/test-framework/"; + description = "Framework for running and organising tests, with HUnit and QuickCheck support"; + 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/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/0.5.nix index 6ac60c1df2dd..6ac60c1df2dd 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/0.5.nix diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 032f79ce077e..b72c5ceee04e 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.5.0.4"; - sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5"; + version = "0.6.0.1"; + sha256 = "0q39a83g7kcj9qpnjg0v7pd0b4w9i090nl2s9v8lpv4n46z6cyaq"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; meta = { homepage = "http://github.com/jgm/texmath"; - description = "Conversion of LaTeX math formulas to MathML"; + description = "Conversion of LaTeX math formulas to MathML or OMML"; license = "GPL"; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 3688bb12c28c..6988cae02769 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.5.3"; - sha256 = "14h2x3yrb4fji8bf84xbfp84pax6lzr8njc0c4061xpwcmair36j"; + version = "0.5.4"; + sha256 = "0j16jmnmgksbzsq2vvxjmciywi91clak77i6zjjghvn9dpmnsmv2"; buildDepends = [ primitive vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index 27938a2fad09..62dc82b10685 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yap"; - version = "0.1"; - sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl"; + version = "0.2"; + sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; meta = { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 75a7570201dd..f3dcc7772e72 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.0a"; + name = "lcms2-2.3"; src = fetchurl { - url = "mirror://sf/lcms/${name}.tar.gz"; - sha256 = "0kq5imagri0l964nnj06f7xny2q7rwvzqpm8ibsqz5zm263ggskd"; + url = "mirror://sourceforge/lcms/${name}.tar.gz"; + sha256 = "1r5gmzhginzm90y70dcbamycdfcaz4f7v0bb4nwyaywlvsxpg89y"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix new file mode 100644 index 000000000000..3c28b95c0667 --- /dev/null +++ b/pkgs/development/libraries/libbsd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +let name = "libbsd-0.3.0"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "http://libbsd.freedesktop.org/releases/${name}.tar.gz"; + sha256 = "fbf36ed40443e1d0d795adbae8d461952509e610c3ccf0866ae160b723f7fe38"; + }; + + patchPhase = '' + substituteInPlace Makefile \ + --replace "/usr" "$out" \ + --replace "{exec_prefix}" "{prefix}" + ''; + + meta = { + description = "Common functions found on BSD systems"; + homepage = http://libbsd.freedesktop.org/; + license = "BSD3"; + }; +} + diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 63a8c53afb78..f7135e4018d8 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation { - name = "libjpeg-turbo-1.0.1"; + name = "libjpeg-turbo-1.1.1"; src = fetchurl { - url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.0.1.tar.gz; - sha256 = "094jvqzibqbzmhh7mz3xi76lzlilxzb4j1x8rpdcdkzyig9dizqf"; + url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.1.1.tar.gz; + sha256 = "553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2"; }; buildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 002a25988b69..b9d9c19a10d8 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake}: stdenv.mkDerivation rec { - name = "qhull-2011.1"; + name = "qhull-2012.1"; src = fetchurl { url = "${meta.homepage}/download/${name}-src.tgz"; - sha256 = "1i2lqw0552mvbcc1q7l4b31fpzf2l2qcabc23r4sybhwyljl9bmd"; + sha256 = "19hb10vs7ww45ifn7mpvxykn470gd1g568d84mlld6v4pnz7gamv"; }; buildNativeInputs = [ cmake ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 3dbdea9c96ba..7024478afaec 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,14 +5,14 @@ assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; - version = "3.6.6.17"; + version = "3.6.6.20"; in assert system == "i686-linux" || system == "x86_64-linux"; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "7080d53b9d3aefc591c2e181dcf97d538ce36177284fc658eca6420ea36a926f"; + sha256 = "68565086baa5a37a0fa15e1c0b7914210fa590b29a8196014cd83789da6a01ba"; }; buildInputs = [python scons readline makeWrapper]; |