1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Commit graph

1297 commits

Author SHA1 Message Date
mimadrid 1a9a72274a meld: 3.14.0 -> 3.16.0 2016-06-13 21:21:16 +02:00
Kazunori Kajihiro 5c1f0990e3 hub: fix incorrect hash (#15830) 2016-05-30 14:23:32 +01:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Rok Garbas 800de8db21 git: 2.8.0 -> 2.8.3 2016-05-27 14:58:48 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Michael Raskin 3bf1348bf7 mercurial: 3.8.1 -> 3.8.2 2016-05-25 16:01:43 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Alexander Ried 9e073bd110 subversionClient: fix build with gcc5
fixes #15483
2016-05-20 14:38:14 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen 05d8174b0e treewide: Make explicit that 'dev' output of subversion is used 2016-05-19 10:04:37 +02:00
Tuomas Tynkkynen e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen 3672f3edcb treewide: Make explicit that 'dev' output of libxslt is used 2016-05-19 10:00:48 +02:00
Tuomas Tynkkynen 29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Tuomas Tynkkynen 16cc4ac83b treewide: Make explicit that 'dev' output of apacheHttpd is used 2016-05-19 10:00:23 +02:00
Pascal Wittmann 8029ee27b6 subversion: 1.9.3 -> 1.9.4 (fixes CVE-2016-2168, CVE-2016-2167) 2016-05-18 21:34:25 +02:00
Pascal Wittmann 032ba2d578 subversion: 1.8.15 -> 1.8.16 (fixes CVE-2016-2168, CVE-2016-2167) 2016-05-18 21:34:25 +02:00
Frederik Rietdijk 197ff2c5aa Merge pull request #15518 from danbst/thg81
tortoisehg: 3.7.3 -> 3.8.1
2016-05-17 14:43:34 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
danbst 2f24e11992 tortoisehg: 3.7.3 -> 3.8.1 2016-05-17 14:02:06 +03:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
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