Commit Graph

1475 Commits

Author SHA1 Message Date
Frederik Rietdijk
48fa032aae Merge pull request #21322 from mimadrid/update/meld-3.16.4
meld: 3.16.2 -> 3.16.4
2016-12-21 00:09:27 +01:00
mimadrid
8021c1f429
meld: 3.16.2 -> 3.16.4 2016-12-20 23:56:29 +01:00
Graham Christensen
2d249e206e Merge pull request #21146 from NeQuissimus/subversion
Subversion: 1.9.4 -> 1.9.5; 1.8.16 -> 1.8.17
2016-12-14 17:45:50 -05:00
Tim Steinbach
1edf95167a
subversion: 1.8.16 -> 1.8.17 2016-12-14 09:35:10 -05:00
Tim Steinbach
b139b17fa8
subversion: 1.9.4 -> 1.9.5 2016-12-14 09:30:31 -05:00
bnikolic
88f53c989e bazaar: enable sftp transport (#21132)
SFTP transport needs python paramiko package, which is now an optional
input
2016-12-14 15:03:54 +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
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Graham Christensen
076e3ae32c
gitRepo: 1.22 -> 1.23 2016-11-28 14:48:49 -05:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
3cd2ca2751 tortoisehg: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk
6be672a7cd tailor: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk
f1fbf04162 gitinspector: use python2 2016-11-24 22:28:02 +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
Frederik Rietdijk
24a495b7a6 cvs2svn: 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
Graham Christensen
5d7f2a40a8
cvs: disable fortify hardening 2016-11-22 07:53:50 -05: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
Vladimír Čunát
5af7b82336
Merge branch 'master' into staging
To incorporate some larger security rebuilds (jasper).
2016-11-17 11:14:05 +01:00
Tim Steinbach
ef4a335be4
git: 2.10.1 -> 2.10.2 2016-11-15 18:05:02 -05:00
Vladimír Čunát
b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Franz Pletz
b15409d6f6
gitlab: 8.12.8 -> 8.13.5 2016-11-10 06:23:58 +01:00
Austin Seipp
e79264002a nixpkgs: bitkeeper 7.3ce -> 7.3.1ce
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-11-10 03:45:51 +00:00
Karn Kallio
9b06e35d33 fossil scm version patch
The attached patch advances the version of the fossil expression in
Nixpkgs to the latest release 1.36

From fdd5d610e35eed355f5f3fec9d3675aa60f36292 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Tue, 8 Nov 2016 20:23:22 -0400
Subject: [PATCH] fossil : advance to version 1.36
2016-11-09 10:15:22 -05:00
Frederik Rietdijk
559864a951 meld: use python2 2016-11-08 22:48:55 +01:00
Franz Pletz
a7d35fdff3
gitlab: 8.12.6 -> 8.12.8, fix CVE-2016-9086
https://about.gitlab.com/2016/11/02/cve-2016-9086-patches/
2016-11-03 20:18:05 +01:00
Frederik Rietdijk
a01d7d131e mercurial: use mkPythonDerivation
since we don't want to use `--prefix PYTHONPATH` since it leaks
PYTHONPATH.
2016-10-31 16:54:33 +01:00
Tim Steinbach
d8e6f48eee Merge pull request #19978 from k0ral/nixos-unstable
mercurial, tortoisehg: 3.9.1 -> 3.9.2
2016-10-29 17:14:45 -04:00
koral
c9ba92c317 tortoisehg: 3.9.1 -> 3.9.2 2016-10-29 23:09:55 +02:00
koral
fc3eec69a0 mercurial: 3.9.1 -> 3.9.2 2016-10-29 23:03:30 +02:00
Jascha Geerds
6de23f466b gitAndTools.gitflow: 1.10.0 -> 1.10.2 2016-10-29 15:59:07 +02:00
Jaakko Luttinen
6d5b96482a yadm: 1.04 -> 1.05 2016-10-29 15:40:02 +03: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
9ab90824d3 bazaarTools: use python2 and refactor expression 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
2c4fbe30fe bazaar: use python 2 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
9b68f4272c git-cola: 2.5 -> 2.8 2016-10-17 22:11:33 +02:00
derchris
cfb843b9a9 gource: 0.43 -> 0.44 2016-10-17 15:14:28 +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
Franz Pletz
9df6c89a6e
gitlab: 8.12.1 -> 8.12.6 2016-10-14 17:34:29 +02: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
Frederik Rietdijk
efb6052f40 Python: fixup modules that were removed 2016-10-13 22:11:30 +02:00
Frederik Rietdijk
cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00