diff options
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 30 insertions, 36 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 8fe78d6f825d..62132271ec99 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -3,45 +3,38 @@ { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance -, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git -, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient -, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH -, monadControl, mtl, network, networkInfo, networkMulticast -, networkProtocolXmpp, openssh, optparseApplicative, pathPieces -, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore -, securemem, SHA, shakespeare, stm, tasty, tastyHunit -, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat -, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes -, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic -, fsnotify +, exceptions, fdoNotify, feed, filepath, git, gnupg1, gnutls +, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit +, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl +, network, networkInfo, networkMulticast, networkProtocolXmpp +, openssh, optparseApplicative, pathPieces, perl, QuickCheck +, random, regexTdfa, rsync, SafeSemaphore, securemem, SHA +, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun +, text, time, transformers, unixCompat, utf8String, uuid, wai +, waiExtra, warp, warpTls, which, xmlTypes, yesod, yesodCore +, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140717"; - sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl"; + version = "5.20140817"; + sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV - dlist dns editDistance exceptions extensibleExceptions - feed filepath gnutls hamlet hS3 hslogger HTTP httpClient - httpConduit httpTypes IfElse json liftedBase MissingH monadControl - mtl network networkInfo networkMulticast networkProtocolXmpp - optparseApplicative pathPieces QuickCheck random regexTdfa - SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit - tastyQuickcheck tastyRerun text time transformers unixCompat - utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore - yesodDefault yesodForm yesodStatic - ] ++ (if self.stdenv.isDarwin then [ - fsnotify - ] else [ - dbus fdoNotify hinotify - ]); + clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus + dlist dns editDistance exceptions fdoNotify feed filepath gnutls + hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes + IfElse json MissingH monadControl mtl network networkInfo + networkMulticast networkProtocolXmpp optparseApplicative pathPieces + QuickCheck random regexTdfa SafeSemaphore securemem SHA shakespeare + stm tasty tastyHunit tastyQuickcheck tastyRerun text time + transformers unixCompat utf8String uuid wai waiExtra warp warpTls + xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic + ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fAssistant - -fProduction"; + configureFlags = "-fAssistant -fProduction"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" @@ -57,6 +50,6 @@ cabal.mkDerivation (self: { description = "manage files with git, without checking their contents into git"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fb1734c47ee1..a4d16e460607 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "2.0.2"; + version = "2.1.0"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1hk9xxnqiyxii4cfl0j88kws5h1w8xavmfp8a2qb3as5jwnc5y5w"; + sha256 = "19q1as2bjh4yifmgw6cciwfw0dswxppaf5iq8h8934i33bf15mwd"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; @@ -66,6 +66,7 @@ stdenv.mkDerivation { ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ mkdir -p $out/etc/bash_completion.d ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/ + ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 29094f1efce4..951ea29a7fca 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: let - minor = "1.6"; - version = "${minor}.1"; + minor = "1.8"; + version = "${minor}.6"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y"; + sha256 = "19g86rksrs77hd58zhs3zwbjmmhqc98v2ly8451avwsbiwmni5mg"; }; buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; |