diff options
Diffstat (limited to 'pkgs/development/libraries')
38 files changed, 241 insertions, 83 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ad02f9b84cce..5f6291127e93 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { - name = "apr-util-1.4.1"; + name = "apr-util-1.5.1"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "52b31b33fb1aa16e65ddaefc76e41151"; + md5 = "9c1db8606e520f201c451ec9a0b095f6"; }; configureFlags = '' @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; + enableParallelBuilding = true; + passthru = { inherit sslSupport bdbSupport ldapSupport; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index d180c4761e88..abd6712736f5 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "clucene-core-0.9.21b"; src = fetchurl { - url = "mirror://sf/clucene/${name}.tar.bz2"; + url = "mirror://sourceforge/clucene/${name}.tar.bz2"; sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; }; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index dbbcf4388c5a..2504f87a230a 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cppunit-1.12.0"; src = fetchurl { - url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; + url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz; sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; }; diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix new file mode 100644 index 000000000000..6651f1783f80 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? true, x264 ? null +, xvidSupport ? true, xvidcore ? null +, vdpauSupport ? true, libvdpau ? null +, faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null +, x11grabSupport ? false, libXext ? null, libXfixes ? null +}: + +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +assert vdpauSupport -> libvdpau != null; +assert faacSupport -> faac != null; +assert x11grabSupport -> libXext != null && libXfixes != null; + +stdenv.mkDerivation rec { + name = "ffmpeg-1.1"; + + src = fetchurl { + url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; + }; + + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--disable-ffplay" + "--enable-shared" + "--enable-runtime-cpudetect" + ] + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" + ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; + + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394 + ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; + + enableParallelBuilding = true; + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + meta = { + homepage = http://www.ffmpeg.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + }; +} diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index b3038d5eaddb..7eb519a045c3 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, pkgconfig }: +{ fetchurl, stdenv, glib, pkgconfig, gettext }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; - buildInputs = [ glib pkgconfig ]; + buildInputs = [ glib pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index e61fcfd95b56..bae237375854 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.1.5"; - sha256 = "0n0qbq2hwyksdbr6fn7yj5vwicmdrn58mfz0dprl8fj456r4j3kn"; + version = "0.1.7"; + sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng"; meta = { homepage = "http://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix new file mode 100644 index 000000000000..234491cde368 --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cipher-rc4"; + version = "0.1.2"; + sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1"; + meta = { + homepage = "http://github.com/vincenthz/hs-cipher-rc4"; + description = "Fast RC4 cipher implementation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 82c735b731fc..81ae5ebddb09 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,14 +1,14 @@ -{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi -, cryptocipher, entropy, skein, tagged +{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi +, entropy, skein, tagged }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.8.0.2"; - sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r"; + version = "0.8.1"; + sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd"; buildDepends = [ - base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy - skein tagged + base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein + tagged ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index de5f400615a1..4f2aa58b7d29 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.3.2"; - sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221"; + version = "0.3.4"; + sha256 = "0k1zh4nw30qgdrkgn6x6zfbpp129f9cparzyqsdqfbf44j0mf2rw"; buildDepends = [ cipherAes cryptoApi cryptoRandomApi entropy random ]; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 9d7ad0825303..d22bfa840e78 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.4.2"; - sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3"; + version = "0.4.3"; + sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix new file mode 100644 index 000000000000..70cd3f44252a --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -0,0 +1,14 @@ +{ cabal, cryptoRandomApi, vector }: + +cabal.mkDerivation (self: { + pname = "crypto-numbers"; + version = "0.1.3"; + sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1"; + buildDepends = [ cryptoRandomApi vector ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-numbers"; + description = "Cryptographic numbers: functions and algorithms"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix new file mode 100644 index 000000000000..dc6d83a765de --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -0,0 +1,18 @@ +{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes +, cryptoRandomApi +}: + +cabal.mkDerivation (self: { + pname = "crypto-pubkey"; + version = "0.1.2"; + sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5"; + buildDepends = [ + cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; + description = "Public Key cryptography"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 89b098173ec1..275622d3cad8 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,19 +1,20 @@ -{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive -, tagged, vector +{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi +, cryptoPubkeyTypes, primitive, tagged, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.7"; - sha256 = "14qhi3969q1h9n85flb7wwsr50gdn63q7pmcpm2npy5vkp34lkp5"; + version = "0.4.0"; + sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector + cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes + primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; - description = "Symmetrical Block, Stream and PubKey Ciphers"; + description = "Symmetrical block and stream ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index e518dd879a05..aa06d0178bed 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.1.1"; - sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg"; + version = "0.10.1.2"; + sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; - jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 50ff535d874b..9b708eff0203 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,16 +1,19 @@ -{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash -, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase -, regexTdfa, snapCore, snapServer, tagsoup, text, time +{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs +, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache +, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore +, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.5.2.1"; - sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4"; + version = "4.0.0.0"; + sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + isLibrary = true; + isExecutable = true; buildDepends = [ - binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet - lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer - tagsoup text time + binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq + filepath httpConduit httpTypes lrucache mtl pandoc parsec random + regexBase regexTdfa snapCore snapServer tagsoup text time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix index 43d99b63d5a4..0547fd67b1f7 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.3"; - sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp"; + version = "1.2.0.5"; + sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh"; buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index aada13af06ae..5009d4132de9 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.2"; - sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09"; + version = "1.8.6.3"; + sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index f6185597af17..fc77388727fd 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.1"; - sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm"; + version = "0.8.0.2"; + sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj"; buildDepends = [ filepath mtl network text time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 75eb11e6a129..1bde4861b3ac 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.1"; - sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl"; + version = "0.1.0.2"; + sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/network/2.4.0.1.nix b/pkgs/development/libraries/haskell/network/2.4.1.0.nix index e0aa44c38bde..9d5ac3abe781 100644 --- a/pkgs/development/libraries/haskell/network/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.4.0.1"; - sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw"; + version = "2.4.1.0"; + sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3"; buildDepends = [ parsec ]; meta = { homepage = "https://github.com/haskell/network"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a45dbea57ae0..83bc9f53951d 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.3.2"; - sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv"; + version = "1.1.4"; + sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 467addefeebd..ef4016d003d5 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.0"; - sha256 = "0diklfkc4fq05g5fhgcdkx8y0vmq26zfnmfkj95yvmwks8p9k22r"; + version = "0.7.1.1"; + sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5"; buildDepends = [ hashable transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 7b1f7d7bcfd5..f61dedb7b8c5 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.10"; - sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4"; + version = "0.3.11"; + sha256 = "0hnjrzhzbqx9l93c8dnl5b54f72ki584cn3jh8m6z56x2lrs24zb"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index f2017af8f803..5bcce9df16b7 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,16 +1,17 @@ -{ cabal, certificate, cipherAes, cryptoApi, cryptocipher -, cryptohash, mtl, network, pem, text, time, tls, vector +{ cabal, certificate, cipherAes, cipherRc4, cryptohash +, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls +, vector }: cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.5.1"; - sha256 = "0a977qy6ig4bhgsl6y5iw0xv52yswmcc2x37ypm1601wikjv38x3"; + version = "0.6.0"; + sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; isLibrary = true; isExecutable = true; buildDepends = [ - certificate cipherAes cryptoApi cryptocipher cryptohash mtl network - pem text time tls vector + certificate cipherAes cipherRc4 cryptohash cryptoPubkey + cryptoRandomApi mtl network pem text time tls vector ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index fbd20bebdf1e..29b6b11d7913 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,17 +1,15 @@ -{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash -, mtl, network +{ cabal, cereal, certificate, cryptohash, cryptoPubkey +, cryptoRandomApi, mtl, network }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.0.3"; - sha256 = "14wgwz032skkgkxg2lyh8kwg1fkapmlg2jh74czbacvnssc2iidb"; - isLibrary = true; - isExecutable = true; + version = "1.1.1"; + sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; buildDepends = [ - cereal certificate cryptoApi cryptocipher cryptohash mtl network + cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl + network ]; - jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index bc55da654692..1f08f3f1fd4f 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.1.1"; - sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by"; + version = "1.3.2"; + sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index edd1dfd19924..6a36e873ca69 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7"; - sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf"; + version = "1.3.7.1"; + sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index c5243bc63930..04be58eb50a6 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hunspell-1.3.2"; src = fetchurl { - url = "mirror://sf/hunspell/${name}.tar.gz"; + url = "mirror://sourceforge/hunspell/${name}.tar.gz"; sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl"; }; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 9fc5ac665e8b..31cbe772916d 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "indilib-0.8"; src = fetchurl { - url = mirror://sf/indi/libindi_0.8.tar.gz; + url = mirror://sourceforge/indi/libindi_0.8.tar.gz; sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65"; }; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index a0119866df0c..4e6614345c17 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, gettext, python}: +{stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.23"; + name = "iso-codes-3.40"; src = fetchurl { - url = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${name}.tar.bz2"; - sha256 = "0lf9phrdr10biihqswq1qmwk5cz954nwavgbnpm7a5r6vzfzkfbq"; + url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; + sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr"; }; patchPhase = '' for i in `find . -name \*.py` @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { done ''; buildInputs = [ gettext ]; + nativeBuildInputs = [ xz ]; meta = { homepage = http://pkg-isocodes.alioth.debian.org/; diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index e24a93c10439..28decb9cfca0 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnova-0.12.1"; src = fetchurl { - url = "mirror://sf/libnova/${name}.tar.gz"; + url = "mirror://sourceforge/libnova/${name}.tar.gz"; sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 9c75bd51db14..bf1a1e232bb6 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libqalculate-0.9.7"; src = fetchurl { - url = "mirror://sf/qalculate/${name}.tar.gz"; + url = "mirror://sourceforge/qalculate/${name}.tar.gz"; sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; }; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index e28f4b394700..ac5c6146cbae 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libxklavier-5.0"; src = fetchurl { - url = "mirror://sf/gswitchit/${name}.tar.bz2"; + url = "mirror://sourceforge/gswitchit/${name}.tar.bz2"; sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz"; }; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e0bd1d2a53ed..8e4edcad8850 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -13,8 +13,9 @@ let secLoadPatch = fetchurl { name = "security_load.patch"; urls = [ - "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" - "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" + # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch" ]; sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; }; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 4aac06a51014..5800b562e6b0 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a4b146ff424f..af960c1b9933 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qjson-0.7.1"; src = fetchurl { - url = "mirror://sf/qjson/${name}.tar.bz2"; + url = "mirror://sourceforge/qjson/${name}.tar.bz2"; sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv"; }; diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 2cca8d7d9c44..75f9de5e96a2 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "atlas-3.9.67"; src = fetchurl { - url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2; + url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; }; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix new file mode 100644 index 000000000000..a0d607517ac3 --- /dev/null +++ b/pkgs/development/libraries/tsocks/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "tsocks-${version}"; + version = "1.8beta5"; + + src = fetchurl { + url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; + }; + + preConfigure = '' + export configureFlags="$configureFlags --libdir=$out/lib" + ''; + + meta = with stdenv.lib; { + description = "Transparent SOCKS v4 proxying library"; + homepage = http://tsocks.sourceforge.net/; + license = "GPLv2"; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} \ No newline at end of file |