diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/hackage-packages.nix | 25 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4cc7db375f97d..a66a6ee3e4642 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -79,7 +79,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w"; + 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 index 6b7315e165295..d2046771b854a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -87167,11 +87167,11 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , 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 + , 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-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 @@ -87186,8 +87186,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180227"; - sha256 = "11p77510vcg7sjd1y5grpgbm1299qviilf4d7xw2pr0vk5qn5mgp"; + version = "6.20180626"; + sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -87202,11 +87202,11 @@ self: { ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra 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 + 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-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 @@ -87229,7 +87229,6 @@ self: { git-annex test ''; enableSharedExecutables = false; - homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; |