git-annex: update to version 6.20180626

This update fixes CVE-2018-10857 and CVE-2018-10859.
NixOS · Jun 27, 2018 · e037231 · e037231
1 parent 5890588
commit e037231
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -80,7 +80,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "0cz044zjp067xjx0dw1yg3n7vnrkn1j3rvnk9i3jf1aqfvm1szwy";
+      sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb";
     };
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -83315,27 +83315,27 @@ self: {
   "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
-     , clientsession, concurrent-output, conduit, containers, crypto-api
-     , cryptonite, curl, data-default, DAV, dbus, directory
+     , clientsession, concurrent-output, conduit, connection, containers
+     , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory
      , disk-free-space, dlist, dns, edit-distance, esqueleto, exceptions
      , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger
-     , http-client, http-conduit, http-types, IfElse, lsof, magic
-     , memory, monad-control, monad-logger, mountpoints, mtl, network
-     , network-info, network-multicast, network-uri, old-locale, openssh
-     , optparse-applicative, path-pieces, perl, persistent
-     , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , http-client, http-client-tls, http-conduit, http-types, IfElse
+     , lsof, magic, memory, monad-control, monad-logger, mountpoints
+     , mtl, network, network-info, network-multicast, network-uri
+     , old-locale, openssh, optparse-applicative, path-pieces, perl
+     , persistent, persistent-sqlite, persistent-template, process
+     , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore
+     , sandi, securemem, shakespeare, socks, split, stm, stm-chans
+     , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
      , template-haskell, text, time, torrent, transformers, unix
      , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
      , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
      , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180529";
-       sha256 = "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5";
+       version = "6.20180626";
+       sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -83350,20 +83350,20 @@ self: {
        ];
        executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
-         case-insensitive clientsession concurrent-output conduit containers
-         crypto-api cryptonite data-default DAV dbus directory
+         case-insensitive clientsession concurrent-output conduit connection
+         containers crypto-api cryptonite data-default DAV dbus directory
          disk-free-space dlist dns edit-distance esqueleto exceptions
          fdo-notify feed filepath free hinotify hslogger http-client
-         http-conduit http-types IfElse magic memory monad-control
-         monad-logger mountpoints mtl network network-info network-multicast
-         network-uri old-locale optparse-applicative path-pieces persistent
-         persistent-sqlite persistent-template process QuickCheck random
-         regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
-         socks split stm stm-chans tagsoup tasty tasty-hunit
-         tasty-quickcheck tasty-rerun template-haskell text time torrent
-         transformers unix unix-compat unordered-containers utf8-string uuid
-         vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
-         yesod-static
+         http-client-tls http-conduit http-types IfElse magic memory
+         monad-control monad-logger mountpoints mtl network network-info
+         network-multicast network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare socks split stm stm-chans tagsoup tasty
+         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
+         torrent transformers unix unix-compat unordered-containers
+         utf8-string uuid vector wai wai-extra warp warp-tls yesod
+         yesod-core yesod-form yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which