Commit Graph

1454 Commits

Author SHA1 Message Date
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
romildo
83d25e490b smartgithg: 7_1_2 -> 8_0_3 2016-10-12 20:15:35 -03: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
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Joachim F
9270aa6677 Merge pull request #19388 from cko/git-extras
git-extras: 4.1.0 -> 4.2.0
2016-10-09 14:08:13 +02:00
Robin Gloster
30accf4d3e
treewide: fix licence -> license occurences 2016-10-09 12:45:32 +02: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
Graham Christensen
f9c9c1dac8
redmine: mark as broken
https://github.com/NixOS/nixpkgs/issues/18856
2016-09-28 08:52:17 -04:00
Franz Pletz
77779323c5
gitlab: 8.11.2 -> 8.12.1 2016-09-27 18:41:02 +02:00
Eelco Dolstra
81447b6a59 subversion: Remove openssl.dev from the runtime closure 2016-09-26 19:58:57 +02:00
Aneesh Agrawal
e6897a3fb4 mercurial: Pin to Python 2 2016-09-26 11:41:54 -04:00
Frederik Rietdijk
9c5610d759 bazaar: use buildPythonApplication 2016-09-26 14:16:18 +02:00
Frederik Rietdijk
3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Frederik Rietdijk
24314edbc8 diffuse: do not use top-level python packages 2016-09-25 23:12:26 +02:00
Thomas Tuegel
1e741cf603 Merge pull request #18926 from PierreR/master
vcsh: 1.20141026-1 -> 1.20151229-1
2016-09-24 10:10:24 -05:00
Pierre Radermecker
e9bac709e2 vcsh: 1.20141026-1 -> 1.20151229-1 2016-09-24 16:50:08 +02:00
Tim Steinbach
d965064280
tortoisehg: 3.8.1 -> 3.9.1 2016-09-23 11:51:54 -04:00
Tim Steinbach
18b5e607d9
mercurial: 3.8.2 -> 3.9.1 2016-09-23 11:50:14 -04:00
Damien Cassou
4d15b2cdb0
hub: 2.2.5 -> 2.2.8 2016-09-22 09:26:58 +02:00