From 576058fe0e6d2188a5f3ed9bc2506dd1a09f6ad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 17:41:52 +0100 Subject: haskell-git-annex: update to version 4.20131101 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 e32a7dc52b9b..394e7580771e 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 @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131024"; - sha256 = "1a4mrx8zr5znhcy2cszv5ri9avqj7lcn467nmaj172f00vn4fd5x"; + version = "4.20131101"; + sha256 = "0fm7bkd8rxcagrmn28a1fq8fidda4xb1arj6wi9ds7prc50ajlgw"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 9b6fb1ebd50422281d92b7ad538e66ebd5542ac4 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 9 Nov 2013 19:03:16 +0100 Subject: tig: bump 1.1 -> 1.2.1 XML_CATALOG_FILES is needed to be able to build the asciidoc documentation/manpages in this new version. --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/tig/default.nix | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index af1ab52c04d7..9f7f26041ca6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -66,7 +66,7 @@ rec { }; tig = import ./tig { - inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl; + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45; }; hub = import ./hub { diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index bdd6e806fe3b..335c533fe448 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }: +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tig-1.1"; + name = "tig-1.2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - md5 = "adeb797a8320962eeb345a615257cbac"; + sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; }; buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + preConfigure = '' + export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' + ''; installPhase = '' make install make install-doc -- cgit 1.4.1 From b8e890539e236a5a6c59a08e094aac65b741f3d0 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 9 Nov 2013 19:06:55 +0100 Subject: tig: small expression cleanup * Add a bit of whitespace to make it easier on the eyes * Shorten the description (and remove package name) --- .../version-management/git-and-tools/tig/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 335c533fe448..23009efdbd54 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -2,24 +2,29 @@ stdenv.mkDerivation rec { name = "tig-1.2.1"; + src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; }; - buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + + buildInputs = [ ncurses asciidoc xmlto docbook_xsl ]; + preConfigure = '' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' ''; + installPhase = '' make install make install-doc mkdir -p $out/etc/bash_completion.d/ cp contrib/tig-completion.bash $out/etc/bash_completion.d/ ''; + meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; - description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; - maintainers = [ maintainers.garbas maintainers.bjornfor maintainers.iElectric ]; + description = "Text-mode interface for git"; + maintainers = with maintainers; [ garbas bjornfor iElectric ]; license = licenses.gpl2; platforms = platforms.linux; }; -- cgit 1.4.1 From d72afe2f1b66486c59bddeca88402f30076932a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: haskell-github-backup: update to version 1.20131101 --- .../version-management/git-and-tools/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 557886a4deb1..0752504278be 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20131006"; - sha256 = "0yc2hszi509mc0d6245dc8cq20mjjmr8mgrd8571dy9sgda532pf"; + version = "1.20131101"; + sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 75ec0b31f83999bd094919e9e4588e3570038c62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:30:59 +0100 Subject: haskell-git-annex: update to version 4.20131106 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 394e7580771e..2506de8d14e4 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 @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131101"; - sha256 = "0fm7bkd8rxcagrmn28a1fq8fidda4xb1arj6wi9ds7prc50ajlgw"; + version = "4.20131106"; + sha256 = "019k3zhbc3wjg8isndw6hkgrr3h3qxrbfydv7m6zpgv2khjyhfh0"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From e597d102d8f11d892d780ea1c0109a2797c374ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Nov 2013 15:29:52 +0100 Subject: git: Update to 1.8.4.3 --- pkgs/applications/version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 fb2e34c7aac9..050cfd1aabee 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 = "1.8.4"; + version = "1.8.4.3"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "156bwqqgaw65rsvbb4wih5jfg94bxyf6p16mdwf0ky3f4ln55s2i"; + sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; -- cgit 1.4.1 From 5644003632ded3c4f0f5f5bcd09d4612425427d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: haskell-git-annex: update to version 5.20131120 --- .../git-and-tools/git-annex/default.nix | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 2506de8d14e4..01eda5002952 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 @@ -2,32 +2,33 @@ , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet -, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit -, IfElse, json, lsof, MissingH, MonadCatchIOTransformers -, monadControl, mtl, network, networkInfo, networkMulticast -, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa -, rsync, SafeSemaphore, SHA, stm, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiLogger, warp, which -, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm -, yesodStatic +, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse +, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl +, network, networkInfo, networkMulticast, networkProtocolXmpp +, openssh, perl, QuickCheck, random, regexTdfa, rsync +, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text +, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger +, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault +, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131106"; - sha256 = "019k3zhbc3wjg8isndw6hkgrr3h3qxrbfydv7m6zpgv2khjyhfh0"; + version = "5.20131120"; + sha256 = "0l046dx10z59k5xqp8vjnqx6r7aiqr4v71cviy9gxdy05y0873j5"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter caseInsensitive clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns editDistance extensibleExceptions feed filepath gnutls hamlet - hinotify hS3 hslogger HTTP httpConduit httpTypes HUnit IfElse json + hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json MissingH MonadCatchIOTransformers monadControl mtl network networkInfo networkMulticast networkProtocolXmpp QuickCheck random - regexTdfa SafeSemaphore SHA stm text time transformers unixCompat - utf8String uuid wai waiLogger warp xmlConduit xmlTypes yesod - yesodCore yesodDefault yesodForm yesodStatic + regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck + text time transformers unixCompat utf8String uuid wai waiLogger + warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm + yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 -- cgit 1.4.1 From d555031aa80f94009b09a3d58fc1b5c6c352ee63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:08 +0100 Subject: haskell-git-annex: update to version 5.20131130 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 01eda5002952..ea27852c4fd8 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 @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20131120"; - sha256 = "0l046dx10z59k5xqp8vjnqx6r7aiqr4v71cviy9gxdy05y0873j5"; + version = "5.20131130"; + sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1