alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

git-annex: update to version 6.20170818

Browse source 
Fixes CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116, and CVE-2017-1000117.
This commit is contained in:
Peter Simons 2017-08-21 12:21:49 +02:00
parent 499b9ebc01
commit 7b16f5974e
3 changed files with 1 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -79,7 +79,7 @@ self: super: {
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version;
sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";
sha256 = "15d29hmbl146axjgbm4qhxpz6ypcq1bjf2aj29yhwh5jmznh58i2";
};
})).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -786,7 +786,6 @@ default-package-overrides:
- gio ==0.13.3.1
- giphy-api ==0.5.2.0
- git ==0.2.0
- git-annex ==6.20170520
- github ==0.16.0
- github-release ==1.0.5
- github-types ==0.2.1

76
pkgs/development/haskell-modules/hackage-packages.nix
View file

@ -77287,81 +77287,6 @@ 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
, 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
, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
, template-haskell, text, time, torrent, transformers, unix
, unix-compat, unordered-containers, utf8-string, uuid, wai
, wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
, yesod-default, yesod-form, yesod-static
}:
mkDerivation {
pname = "git-annex";
version = "6.20170520";
sha256 = "05r701gd7jqjcxcvm8l11fb04z8rqjalf4z8id693q9c2x29pkzq";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
"-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
"-fwebapp-secure" "-fwebdav" "-fxmpp"
];
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
base bytestring Cabal data-default directory exceptions filepath
hslogger IfElse process split unix unix-compat
];
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
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 tasty tasty-hunit
tasty-quickcheck tasty-rerun template-haskell text time torrent
transformers unix unix-compat unordered-containers utf8-string uuid
wai wai-extra warp warp-tls yesod yesod-core yesod-default
yesod-form yesod-static
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
];
preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
installPhase = "make PREFIX=$out BUILDER=: install";
checkPhase = ''
ln -sf dist/build/git-annex/git-annex git-annex
ln -sf git-annex git-annex-shell
export PATH+=":$PWD"
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;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git;
inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh;
inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget;
inherit (pkgs) which;};
"git-annex_6_20170818" = callPackage
({ mkDerivation, aeson, async, aws, base, blaze-builder
, bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
, clientsession, concurrent-output, conduit, conduit-extra
@ -77430,7 +77355,6 @@ self: {
description = "manage files with git, without checking their contents into git";
license = stdenv.lib.licenses.gpl3;
platforms = [ "i686-linux" "x86_64-linux" ];
hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git;
inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh;