diff options
Diffstat (limited to 'pkgs/development')
19 files changed, 140 insertions, 95 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ca7c0f56bc17..b223eeb134b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -117,9 +117,6 @@ self: super: { sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8"; }); - # Already applied in darcs repository. - gnuplot = appendPatch super.gnuplot ./gnuplot-fix-new-time.patch; - ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { pname = "ghcjs-prim"; version = "0.1.0.0"; diff --git a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch b/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch deleted file mode 100644 index 1b4a60e59418..000000000000 --- a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru3 gnuplot-0.5.3.1-old/gnuplot.cabal gnuplot-0.5.3.1/gnuplot.cabal ---- gnuplot-0.5.3.1-old/gnuplot.cabal 2015-04-17 22:25:06.561715968 +0300 -+++ gnuplot-0.5.3.1/gnuplot.cabal 2015-04-17 22:27:07.610913755 +0300 -@@ -75,7 +75,7 @@ - - Library - Build-Depends: -- filepath >=1.1 && <1.4, -+ filepath >=1.1 && <1.5, - temporary >=1.1 && <1.3, - array >=0.1 && <0.6, - containers >=0.1 && <0.6, -@@ -83,12 +83,11 @@ - data-accessor-transformers >=0.2.1 && <0.3, - data-accessor >=0.2.2 && <0.3, - transformers >=0.3 && <0.5, -- deepseq >=1.0 && <1.4 -+ deepseq >=1.0 && <1.5 - If flag(splitBase) - Build-Depends: -- process >=1.0, -- time >=1.1, -- old-locale >=1.0, -+ process >=1.0 && <1.3, -+ time >=1.1 && <1.6, - base >=2 && <5 - Else - Build-Depends: -diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs ---- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs 2015-04-17 22:25:06.560715975 +0300 -+++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs 2015-04-17 22:27:49.872542430 +0300 -@@ -1,7 +1,6 @@ - module Graphics.Gnuplot.Time where - --import System.Locale (defaultTimeLocale, ) --import Data.Time.Format (FormatTime, formatTime, ) -+import Data.Time.Format (FormatTime, formatTime, defaultTimeLocale, ) - import Data.Tuple.HT (mapFst, ) - - {- | -diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs ---- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs 2015-04-17 22:25:06.560715975 +0300 -+++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs 2015-04-17 22:28:24.426238829 +0300 -@@ -9,7 +9,6 @@ - ColumnCount(ColumnCount), - ) where - --import System.Locale (defaultTimeLocale, ) - import qualified Data.Time as Time - - import Data.Word (Word8, Word16, Word32, Word64, ) -@@ -82,7 +81,7 @@ - instance C Time.Day where - text d = text $ Time.UTCTime d 0 - instance C Time.UTCTime where -- text = singleton . showString . Time.formatTime defaultTimeLocale "%s" -+ text = singleton . showString . Time.formatTime Time.defaultTimeLocale "%s" - - - instance (C a, C b) => C (a,b) where diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 481c80994e85..282ad7bfcd77 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "cppzmq-2015-03-05"; + name = "cppzmq-2015-07-06"; src = fetchgit { - url = "git://github.com/zeromq/cppzmq"; - rev = "ac705f604701e2ca1643fa31bae240f9da8b9b9a"; - sha256 = "1bcd5553601a6cdc926aa7a7c89fe54d3b14693cfce85dea97af25cf5a144398"; + url = "https://github.com/zeromq/cppzmq"; + rev = "a88bf3e0b0bc6ed5f5b25a58f8997a1dae374c8b"; + sha256 = "75a6630b870c1f0d5b9d6a0ba03e83ceee47aaa2a253894e75a8a93a6d65d3aa"; }; installPhase = '' diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 7de7cb4d102d..049a799c44fa 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "1.1.5"; + version = "2.0.1"; name = "double-conversion-${version}"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "1a264wpnvxmnq5pdlnp417ld1ybrng83lnbg38bv4ahz7a29ap4z"; + sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index e941f0f65476..e7a3bd495132 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf"; }; - configureFlags = [ "--with-boost=${boost.dev}" ]; + configureFlags = [ + "--with-boost=${boost.dev}" + ]; buildInputs = [ expat zlib boost ]; diff --git a/pkgs/development/libraries/expat/CVE-2015-1283.patch b/pkgs/development/libraries/expat/CVE-2015-1283.patch new file mode 100644 index 000000000000..33b975912d40 --- /dev/null +++ b/pkgs/development/libraries/expat/CVE-2015-1283.patch @@ -0,0 +1,77 @@ +Found at https://hg.mozilla.org/releases/mozilla-esr31/rev/2f3e78643f5c on 2015-07-27. Modified: replaced path parser/expat/lib/xmlparse.c with lib/xmlparse.c. +diff --git a/lib/xmlparse.c b/lib/xmlparse.c +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -1646,29 +1646,40 @@ XML_ParseBuffer(XML_Parser parser, int l + XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position); + positionPtr = bufferPtr; + return result; + } + + void * XMLCALL + XML_GetBuffer(XML_Parser parser, int len) + { ++/* BEGIN MOZILLA CHANGE (sanity check len) */ ++ if (len < 0) { ++ errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } ++/* END MOZILLA CHANGE */ + switch (ps_parsing) { + case XML_SUSPENDED: + errorCode = XML_ERROR_SUSPENDED; + return NULL; + case XML_FINISHED: + errorCode = XML_ERROR_FINISHED; + return NULL; + default: ; + } + + if (len > bufferLim - bufferEnd) { +- /* FIXME avoid integer overflow */ + int neededSize = len + (int)(bufferEnd - bufferPtr); ++/* BEGIN MOZILLA CHANGE (sanity check neededSize) */ ++ if (neededSize < 0) { ++ errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } ++/* END MOZILLA CHANGE */ + #ifdef XML_CONTEXT_BYTES + int keep = (int)(bufferPtr - buffer); + + if (keep > XML_CONTEXT_BYTES) + keep = XML_CONTEXT_BYTES; + neededSize += keep; + #endif /* defined XML_CONTEXT_BYTES */ + if (neededSize <= bufferLim - buffer) { +@@ -1687,17 +1698,25 @@ XML_GetBuffer(XML_Parser parser, int len + } + else { + char *newBuf; + int bufferSize = (int)(bufferLim - bufferPtr); + if (bufferSize == 0) + bufferSize = INIT_BUFFER_SIZE; + do { + bufferSize *= 2; +- } while (bufferSize < neededSize); ++/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */ ++ } while (bufferSize < neededSize && bufferSize > 0); ++/* END MOZILLA CHANGE */ ++/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */ ++ if (bufferSize <= 0) { ++ errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } ++/* END MOZILLA CHANGE */ + newBuf = (char *)MALLOC(bufferSize); + if (newBuf == 0) { + errorCode = XML_ERROR_NO_MEMORY; + return NULL; + } + bufferLim = newBuf + bufferSize; + #ifdef XML_CONTEXT_BYTES + if (bufferPtr) { + + + + diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 9a49225d1723..05cfeaee4232 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"; }; + patches = [ ./CVE-2015-1283.patch ]; + meta = with stdenv.lib; { homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 79584a99f630..0cea9413baef 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,14 +2,14 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.38.0"; + version = "0.52.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0b273iwizy08r8lap367q79lai4l4aib2bvd827lkkdax5jpqf6b"; + sha256 = "16g3hpy1gy56zqnhwzkvzzpm6dgm01qa9yaigmrqr9b59c3k6cqf"; }; buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 631c7c778ae2..119a46bfc31d 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -8,7 +8,7 @@ # https://wiki.archlinux.org/index.php/BluRay let baseName = "libaacs"; - version = "0.8.0"; + version = "0.8.1"; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2"; - sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y"; + sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"; }; buildInputs = [ libgcrypt libgpgerror ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbluray.html; + homepage = https://www.videolan.org/developers/libaacs.html; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index a7a8e7cea63a..d85712549672 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,12 +19,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.8.0"; + version = "0.8.1"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "027xbdbsjyp1spfiva2331pzixrzw6vm97xlvgz16hzm5a5j103v"; + sha256 = "13zvkrwy2fr877gkifgwnqfsb3krbz7hklfcwqfjbhmvqn0cdgnd"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index f7834c56b63a..6fc17256a390 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libchardet-1.0.4"; src = fetchurl { - url = "ftp://ftp.oops.org/pub/oops/libchardet/${name}.tar.bz2"; + url = "http://yupmin.net/wp-content/uploads/2014/03/libchardet-1.0.4.tar.bz2"; sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl"; }; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index eddc4eed55c0..6a68b5610da2 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.4"; + version = "4.9.3"; name = "libiberty-${version}"; src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a"; + sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3"; }; postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 036d9c61d07a..3805e8c1ce84 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,14 +1,17 @@ -{ fetchurl, stdenv, binutils }: +{ stdenv, fetchurl, binutils }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "lightning-2.0.5"; + + name = "lightning-${version}"; + version = "2.1.0"; src = fetchurl { url = "mirror://gnu/lightning/${name}.tar.gz"; - sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5"; + sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz"; }; - # Needs libopcodes.so from binutils for 'make check' + # Needs libopcodes.so from binutils for 'make check' buildInputs = [ binutils ]; doCheck = true; @@ -16,7 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/lightning/; description = "Run-time code generation library"; - longDescription = '' GNU lightning is a library that generates assembly language code at run-time; it is very fast, making it ideal for Just-In-Time @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { to the clients a standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; - - license = stdenv.lib.licenses.lgpl3Plus; + maintainers = [ maintainers.AndersonTorres ]; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix new file mode 100644 index 000000000000..900c9dc5a512 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.0.0-alpha-3.1"; + # make sure you test also -A pythonPackages.protobuf + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = "v${version}"; + sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45"; + }; +}) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 939351750920..340f4558f819 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, zlib, perl }: -let version = "5.1.2"; +let version = "5.1.3"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1zbvhrp0zjzbi6q2bnbxbg6399r47pq5gw3kspzph81j19fqvpg9"; + sha256 = "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index eb795d6b28eb..26eb8f526c87 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,19 +1,16 @@ { fetchurl, stdenv, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-0.3.0"; + name = "libtirpc-0.3.2"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna"; + sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210"; }; propagatedBuildInputs = [ libkrb5 ]; - # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf preConfigure = '' - echo "" > src/des_crypt.c - sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 2492063be270..e68415951c76 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://sourceforge.net/projects/xlslib/files/; + homepage = http://sourceforge.net/projects/xlslib/; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ab50d9d0c3c5..d04ce8664fc3 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1502,6 +1502,20 @@ let ]; otherOverrides = old: new: { + stringi = old.stringi.overrideDerivation (attrs: { + postInstall = let + icuName = "icudt52l"; + icuSrc = pkgs.fetchzip { + url = "http://static.rexamine.com/packages/${icuName}.zip"; + sha256 = "0hvazpizziq5ibc9017i1bb45yryfl26wzfsv05vk9mc1575r6xj"; + stripRoot = false; + }; + in '' + ${attrs.postInstall or ""} + cp ${icuSrc}/${icuName}.dat $out/library/stringi/libs + ''; + }); + xml2 = old.xml2.overrideDerivation (attrs: { preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2"; }); diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 239416535755..71e8dcc49537 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; + sourceRoot = "."; + installPhase = '' install -D apktool.jar "$out/libexec/apktool/apktool.jar" mkdir -p "$out/bin" |