Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Andrey Pavlov
f5668437ab
hub: 2.2.2 -> 2.2.3
2016-05-06 10:39:29 +03:00
Michael Raskin
9dc5dcf6db
mercurial: 3.7.3 -> 3.8.1
2016-05-05 20:30:59 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Franz Pletz
2acea21155
gitlab: 8.5.7 -> 8.5.12
2016-05-04 01:24:55 +02:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Eelco Dolstra
8a854c2647
Merge pull request #15111 from rardiol/subversionPerl
...
subversion: fix apr-1 linking related to #14495
2016-05-02 10:56:28 +02:00
zimbatm
6cf44fed13
Merge pull request #15113 from rardiol/gitSVN
...
git: fix subversion bindings for multiple outputs
2016-05-01 10:10:31 +01:00
Ricardo Ardissone
e5a9d64787
git: fix subversion bindings for multiple outputs
2016-04-30 13:19:14 -03:00
Ricardo Ardissone
025ccbccd7
subversion: fix apr-1 linking
2016-04-30 12:13:26 -03:00
zimbatm
d2b176ace5
Merge pull request #14617 from nathan7/git-ssl-cert-file
...
git: respect $SSL_CERT_FILE
2016-04-29 23:03:52 +01:00
Tobias Geerinckx-Rice
aa8bc97dd6
git-hub -> gitAndTools.git-hub (with alias)
2016-04-29 21:42:35 +02:00
Tobias Geerinckx-Rice
2415254a52
git-hub: 0.9.0 -> 0.10
2016-04-29 21:42:35 +02:00
Tuomas Tynkkynen
b465dc202f
boost: Kill unnecessary 'lib' output
...
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Eric Seidel
2177bf3074
fossil: add libiconv on darwin
2016-04-25 09:12:05 -07:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Joachim Fasting
f49b9fe9d9
Merge pull request #14892 from danbst/tortoisehg-refactor
...
tortoisehg: 3.7.1 -> 3.7.3, refactor
2016-04-22 19:05:56 +02:00
danbst
2fce49d3e8
tortoisehg: 3.7.1 -> 3.7.3, refactor
...
update tortoisehg to 3.7.3 and remove source patch in build expression.
setup.py in TortoiseHG computes wrong paths in `build` phase
(upstream bug https://bitbucket.org/tortoisehg/thg/issues/4483/problems-with-setuppy-on-posix-systems ).
So we skip this phase and perform install manually (the `build` phase is still performed as subcommand).
2016-04-22 16:00:43 +00:00
danbst
e36339fd80
mercurial: add comment for maintainers on version bump
2016-04-22 15:59:40 +00:00
Vladimír Čunát
e9379f7416
Merge branch 'staging'
...
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Nikolay Amiantov
9a8a4b6efe
guitone: move to qmake4Hook
2016-04-20 18:55:48 +03:00
Nikolay Amiantov
e5e09e8cc7
svn2git-kde: move to qmake4Hook
2016-04-20 18:55:48 +03:00
Nikolay Amiantov
9325393959
qgit-git: move to qmake4Hook
2016-04-20 18:55:48 +03:00
Nikolay Amiantov
a4e868a102
qgit: move to qmake4Hook
2016-04-20 18:55:48 +03:00
Nikolay Amiantov
661641aeb7
git-and-tools: move to callPackage
2016-04-20 18:55:48 +03:00
Tadas Barzdzius
a2973df033
pijul: use stable rustPlatform
2016-04-20 15:08:12 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Nathan Zadoks
9eced61d2a
git: respect $SSL_CERT_FILE
...
This allows git to work on systems without
/etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing
with "error setting certificate verify locations".
2016-04-12 11:47:56 +02:00
Dan Connolly
a4ce0e233b
tortoisehg: 3.6 -> 3.7.1, fixes package
...
fixes #13507
On June 8 (e8655ee) tortoisehg changed the way
it computes the `/usr/share` directory in a way that
invalidated the assumptions behind the use
of substituteInPlace in postUnpack.
2016-04-11 10:35:31 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502
for nixpkgs
2016-04-10 11:17:52 +02:00
Graham Christensen
f9099deb8e
mercurial: 3.7.1 -> 3.7.3 for multiple CVEs
...
CVE-2016-3068
Blake Burkhart discovered that Mercurial allows URLs for Git
subrepositories that could result in arbitrary code execution on
clone.
CVE-2016-3069
Blake Burkhart discovered that Mercurial allows arbitrary code
execution when converting Git repositories with specially
crafted names.
CVE-2016-3630
It was discovered that Mercurial does not properly perform bounds-
checking in its binary delta decoder, which may be exploitable for
remote code execution via clone, push or pull.
2016-04-07 21:24:49 -05:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Bob van der Linden
318fdda01c
git-cola: 2.2.1 -> 2.5
2016-03-30 20:25:50 +02:00
zimbatm
0592eb377e
Merge pull request #14207 from zimbatm/git-and-ssh
...
git: add openssh as a runtime dependency
2016-03-30 10:23:55 +01:00
Louis Taylor
69c6f7e20a
git: 2.7.4 -> 2.8.0
2016-03-29 07:21:41 +01:00
Frederik Rietdijk
4c13595507
Merge pull request #14093 from matthiasbeyer/add-be
...
bugseverywhere: init at 1.1.1
2016-03-28 14:39:38 +02:00
Matthias Beyer
729c069108
bugseverywhere: init at 1.1.1
2016-03-28 14:35:47 +02:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
zimbatm
6579acd015
git: add openssh as a runtime dependency
...
Fixes #1923
2016-03-26 14:39:57 +00:00
Evgeny Egorochkin
5db2d9366b
subversion: fix hash
2016-03-21 12:47:54 +02:00
zimbatm
64fe2b5eb6
gitlab: remove unused parameter
2016-03-19 22:04:12 +00:00
Yann Hodique
31c317e09e
git: 2.7.3 -> 2.7.4
2016-03-18 18:07:33 -07:00
Franz Pletz
1cd99b1a48
gitlab: 8.5.5 -> 8.5.7
2016-03-17 03:39:16 +01:00
Peter Simons
abcf57a8db
git: update from version 2.7.1 to 2.7.3
2016-03-16 21:35:55 +01:00
joachifm
94f7f756b0
Merge pull request #13855 from jraygauthier/jrg/update_smart_git_from_710_to_712
...
smartgit: 7.1.0 -> 7.1.2
2016-03-14 15:12:30 +00:00