Commit Graph

766 Commits

Author SHA1 Message Date
Frederik Rietdijk
3eaa599699 Merge pull request #27846 from mimadrid/update/git-hub-0.11.1
git-hub: 0.11.0 -> 0.11.1
2017-08-01 21:51:56 +02:00
mimadrid
d942615651
gitflow: 1.10.2 -> 1.11.0 2017-08-01 20:51:16 +02:00
mimadrid
5234545da8
git-hub: 0.11.0 -> 0.11.1 2017-08-01 20:49:48 +02:00
mimadrid
bc563c5973
git-cola: 2.10 -> 2.11 2017-08-01 20:48:21 +02:00
mimadrid
efb2b32bd7 gitAndTools.diff-so-fancy: 1.1.0 -> 1.1.1 2017-08-01 00:13:31 +02:00
Franz Pletz
75d53270cb
gitAndTools.diff-so-fancy: 0.11.4 -> 1.1.0 2017-07-18 18:04:16 +02:00
Tim Steinbach
eb5263a9f1
git: 2.13.2 -> 2.13.3 2017-07-13 08:45:43 -04:00
Jörg Thalheim
9d28cd9ca4 Merge pull request #27206 from nthorne/InitGitBigPicture
git-big-picture: init at 0.9.0
2017-07-13 09:54:26 +01:00
Alexander Schmolck
2c1097a83b git: add missing deps for filter-branch etc (#27221)
Several git commands are implemented as shell scripts that run awk, sed, grep
and perl. There is some existing patching in the postinstall for perl to rewrite
it to an absolute reference to pkgs.perl, but several other packages are both
missing as a dependency and have no rewrite logic.

In particular git filter-branch depends on sed and grep.

Additionally, the perl logic also seds git-am, which is now a binary not a shell
script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
was obsolete.

I tested this by grepping all shell scripts for the relevant commands and then
comparing the diffs of the new version to what is produced in master. All
changes in the scripts seem good to me.
2017-07-11 17:00:17 +01:00
Niklas Thörne
4ae629dd91 git-big-picture: init at 0.9.0
Updated after review comments.
2017-07-09 21:21:51 +02:00
Niklas Thorne
17dbed4c07 git-big-picture: init at 0.9.0 2017-07-07 14:12:02 +02:00
Tim Steinbach
1a25495b63
git: 2.13.1 -> 2.13.2 2017-06-25 21:13:23 -04:00
Tim Steinbach
385ba07615
git: 2.13.0 -> 2.13.1 2017-06-05 09:10:26 -04:00
montag451
cce8dbf8d3 git-annex-remote-rclone: 0.4 -> 0.5 2017-05-28 18:16:00 +02:00
Tim Steinbach
ce8662e693
git: 2.12.2 -> 2.13.0 2017-05-09 21:57:24 -04:00
Yann Hodique
c2cbe7c4cd tig: 2.2.1 -> 2.2.2 2017-05-07 14:22:29 -07:00
Jaakko Luttinen
dee8865d03
gitAndTools.gitflow: fix runtime dependencies #25487
If `git-flow` was installed without explicitly installing `getopt` and `git`
too, it couldn't find those executables. Now it can find those and it can be
used as `git-flow` executable. Note, however, that in order to use `git-flow` as
git subcommand (`git flow`), one needs to install `git` too.
2017-05-06 09:33:27 +03:00
Bjørn Forsman
83129a6eed qgit: fix meta: maintainer -> maintainers 2017-04-30 16:54:59 +02:00
José Luis Lafuente
7b20341727
git-recent: init at 1.0.3 2017-04-18 11:09:33 +02:00
José Luis Lafuente
cb624198e8
git-open: init at 1.3.0 2017-04-16 19:32:12 +02:00
Yann Hodique
04b30942bf ghq: init at 0.7.4 2017-04-14 20:59:45 -07:00
Yann Hodique
a78ce1d4c6 tig: 2.2 -> 2.2.1 (#24770)
* tig: 2.2 -> 2.2.1

Also move to different project URLs, as requested in
https://github.com/jonas/tig/releases/tag/tig-2.2.1

* tig: fix fetching mechanism

Rework the dependencies to allow use of fetchFromGitHub.
2017-04-10 15:03:04 +02:00
Aaron Bull Schaefer
55d1237c6b transcrypt: 1.0.1 -> 1.0.2 2017-04-05 11:18:12 -05:00
Jörg Thalheim
3e7c485e19 Merge pull request #24553 from ndowens/git-imerge
git-imerge: 0.7.0 -> 1.0.0
2017-04-02 23:39:53 +02:00
Jörg Thalheim
6df9e84773 Merge pull request #24554 from ndowens/git-radar
git-radar: 0.3.2 -> 0.5
2017-04-02 23:28:52 +02:00
Jörg Thalheim
a18ac4fd35 Merge pull request #24552 from ndowens/git-cola
git-cola: 2.8 -> 2.10
2017-04-02 23:26:29 +02:00
ndowens
ff4fa6387e diff-so-fancy: 0.11.1 -> 0.11.4 (#24562) 2017-04-02 22:22:32 +02:00
ndowens
6ee0d284c1 git-cola: 2.8 -> 2.10
git-cola: Remove postFixup
2017-04-02 08:56:18 -05:00
ndowens
02dddacc75 git-radar: 0.3.2 -> 0.5 2017-04-01 21:30:23 -05:00
ndowens
45fa146829 git-imerge: 0.7.0 -> 1.0.0 2017-04-01 21:24:08 -05:00
Orivej Desh
ecf5daa5d7 subgit: 3.1.0 -> 3.2.4 2017-04-01 02:19:51 +00:00
Tim Steinbach
10725a6329
git: 2.12.0 -> 2.12.2 2017-03-25 10:25:54 -04:00
Guillaume Maudoux
525a663174 curl, git: Fix curl default CA, let git use it
Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.
2017-03-22 11:22:53 +01:00
Domen Kožar
c3c9412c7d
git, openssl, curl: Respect $NIX_SSL_CERT_FILE
Slightly modified version of 942dbf89c6
2017-03-20 14:11:20 +01:00
Jörg Thalheim
d6f586bbff
git-octopus: init at 1.4 2017-03-14 21:01:10 +01:00
Eric Bailey
ea07961294
gitflow: tweak for darwin
On Darwin, wrap the git-flow binary and set:

    FLAGS_GETOPT_CMD=${getopt}/bin/getopt

Without this change, I was getting the following error:

    flags:ERROR short flag required for (showcommands) on this platform
2017-02-28 05:52:25 -06:00
Tim Steinbach
7611525c00
git: 2.11.1 -> 2.12.0 2017-02-26 16:18:42 -05:00
Franz Pletz
ae1c0add81
git-dit: fix evaluation
cc @Profpatsch
2017-02-25 11:48:22 +01:00
Profpatsch
e1656bc46d git-dit: init at 0.1.0 2017-02-25 10:18:43 +01:00
Changlin Li
f6dd263d42 bfg-repo-cleaner: init at 1.12.15 2017-02-12 01:53:08 -05:00
Tim Steinbach
c1e7832591
git: 2.11.0 -> 2.11.1 2017-02-03 18:54:35 -05:00
Peter Hoeg
3d16d69b40 qgit: 2.5 -> 2.6 (#22360)
Also:

 - build the qt5 version by default instead of qt4
 - use cmake
2017-02-02 02:55:47 +01:00
Robert Helgesson
41a0d05872
git-hub: 0.10 -> 0.11.0
Includes fixes for CVE-2016-7793 and CVE-2016-7794.
2017-01-29 17:04:57 +01:00
Jörg Thalheim
202b953c92
bitbucket-server-cli: use gemdir 2017-01-18 00:52:54 +01:00
Eric Bailey
a0e5cbbd6a
hub: 2.2.8 -> 2.2.9 2017-01-09 19:10:18 -06:00
Aaron Bull Schaefer
196eb75b88 transcrypt: 1.0.0 -> 1.0.1 2017-01-05 16:20:45 -08:00
jgertm
52a7b6549f bitbucket-server-cli: init at 0.7.0 (#21616) 2017-01-05 10:21:06 +00:00
Aaron Bull Schaefer
e98bd77ef3 transcrypt: 0.9.9 -> 1.0.0 2017-01-01 11:49:22 -08:00
Vladimír Čunát
dbde4eb465
gitAndTools.qgitGit: remove
It's rather old and abandoned, the source is dead, and our stable qgit
version seems more recent.  /cc @MarcWeber.
2016-12-30 12:30:35 +01:00
Bjørn Forsman
bef30f322f cgit: 0.12 -> 1.1 2016-12-27 15:46:22 +01:00
Chris Martin
18ee6b9a6d git-bz: add pycrypto dependency (#21013) 2016-12-08 22:59:53 -05:00
Tim Steinbach
f1a0cadaec
git: 2.10.2 -> 2.11.0 2016-11-29 18:37:24 -05:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
643b12221a stgit: use python2 2016-11-24 22:28:02 +01:00
Frederik Rietdijk
bea967016e git-hub: use python2 2016-11-24 22:28:02 +01:00
montag451
278196e854 git-annex-remote-rclone: init at 0.4 2016-11-23 21:06:21 +01:00
montag451
d212fc99f4 git-remote-gcrypt: 20140715 -> 1.0.0 (#20623) 2016-11-22 03:46:26 +01:00
Alex Dunn
80bff0b459 git: link git-credential-netrc into $out/bin 2016-11-19 13:36:30 -08:00
Tim Steinbach
ef4a335be4
git: 2.10.1 -> 2.10.2 2016-11-15 18:05:02 -05:00
Jascha Geerds
6de23f466b gitAndTools.gitflow: 1.10.0 -> 1.10.2 2016-10-29 15:59:07 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Frederik Rietdijk
c431f11d1f gitAndTools.git-hub: use python2
imports urllib2
2016-10-18 23:16:04 +02:00
Frederik Rietdijk
9b68f4272c git-cola: 2.5 -> 2.8 2016-10-17 22:11:33 +02:00
zimbatm
13293d108d Merge pull request #19459 from dipinhora/git-osxkeychain
git: enable credential-osxkeychain for darwin
2016-10-16 12:03:31 +01:00
Eelco Dolstra
811b876fab Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Vladimír Čunát
061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
Eelco Dolstra
942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Jascha Geerds
19c42ee0b7 gitAndTools.gitflow: 1.9.1 -> 1.10.0 2016-10-11 23:38:29 +02:00
dipinhora
641a1e433a git: enable credential-osxkeychain for darwin 2016-10-11 15:25:08 -04:00
Christine Koppelt
9d85dd7ec0 git-extras: 4.1.0 -> 4.2.0 2016-10-09 12:37:22 +02:00
Frederik Rietdijk
2fb5289d83 git: 2.10.0 -> 2.10.1 2016-10-05 10:37:09 +02:00
Michael Fellinger
c2f6752e01
git-crypt: remove platforms
fixes #18811
2016-10-01 00:48:12 +02:00
Damien Cassou
4d15b2cdb0
hub: 2.2.5 -> 2.2.8 2016-09-22 09:26:58 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Peter Simons
f649d4eefa git-annex: fix GHC 8.x build 2016-09-09 13:55:39 +02:00
Aaron Bull Schaefer
598ccfdec9 transcrypt: 0.9.7 -> 0.9.9 2016-09-06 14:55:19 -07:00
J Phani Mahesh
2b86ccbf32 git: 2.9.3 -> 2.10.0 2016-09-03 16:20:32 +05:30
Gabriel Ebner
b6f9f3de46 Merge pull request #18236 from mimadrid/update/hub-2.2.5
hub: 2.2.3 -> 2.2.5
2016-09-03 07:35:55 +02:00
mimadrid
307a4650c8
hub: 2.2.3 -> 2.2.5 2016-09-03 00:38:38 +02:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Peter Simons
bdc38c6a67 Merge pull request #17829 from mimadrid/update/git-2.9.3
git: 2.9.2 -> 2.9.3
2016-08-19 10:16:46 +02:00
mimadrid
7f3a4688f0
git: 2.9.2 -> 2.9.3 2016-08-18 21:13:00 +02:00
Silvio Fricke
dc7c848e10 tig: 2.1.1 -> 2.2
Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
2016-08-18 16:24:25 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Miguel Madrid
bd20aaa767 diff-so-fancy: 0.10.1 -> 0.11.1 (#17691) 2016-08-12 15:12:29 +02:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
mimadrid
59caf069a4
git: 2.9.1 -> 2.9.2 2016-07-29 11:28:31 +02:00
Bjørn Forsman
e7ef33c50a git: fix gitweb.cgi breakage due to missing CGI.pm
CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi
script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to
Perl 5.22 with a85ba820a4 ("perl: Make 5.22 the default").

Fix it by bringing in the Perl CGI module (and dependency HTMLParser).
The closure size of "nix-build -A git" increase by 1 MiB, to 201 MiB.
2016-07-26 15:20:24 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Peter Simons
641fc0e683 haskell: remove all but the latest LTS package sets (version 6.7)
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.

More details are at:

  http://permalink.gmane.org/gmane.linux.distributions.nixos/20505

Closes https://github.com/NixOS/nixpkgs/issues/14897.

Also relevant:

 - https://github.com/NixOS/nixpkgs/issues/16130
 - https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Miguel Madrid
1b9f6732c7 diff-so-fancy: 0.10.0 -> 0.10.1 (#17033) 2016-07-17 17:53:51 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
mimadrid
8c09317018
git: 2.9.0 -> 2.9.1 2016-07-13 15:43:49 +02:00