JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,237 Commits 2 Branches 0 Tags 13 GiB
41de162f0d
Commit Graph

1601 Commits

Author SHA1 Message Date
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
Austin Seipp
cf63016f06 nixpkgs: build bitkeeper only on linux 
The OS X build fails due to the dependency on 'crypt' failing. Perhaps
in future versions of BitKeeper this build can be re-enabled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2016-07-18 19:59:18 +00:00
Wayne Scott
af056de900 nixpkgs: add bitkeeper-7.3ce 
Closes #16928.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2016-07-18 05:22:18 -05:00
Nikolay Amiantov
aefd8c420c Merge pull request #17043 from womfoo/fix/qmake4Hook-builds 
reintroduce qmake .pro files after qmake4Hook changes
 2016-07-18 00:11:24 +04:00
Miguel Madrid
1b9f6732c7 diff-so-fancy: 0.10.0 -> 0.10.1 (#17033) 2016-07-17 17:53:51 +02:00
Kranium Gikos Mendoza
2d529cfebb guitone: fix qmake4Hook build 
pass guitone.pro which was removed in 9a8a4b6
 2016-07-17 22:41:34 +08: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
mimadrid
beec2ba127
diff-so-fancy: 0.9.3 -> 0.10.0 2016-07-05 22:54:14 +02:00
Shea Levy
6857424cf3 src: bump 2016-06-28 10:25:15 -04:00
zimbatm
de45c8d674 Merge pull request #16504 from cko/gitAndTools_git-extras 
git-ant-tools.git-extras: 3.0.0 -> 4.1.0
 2016-06-25 23:18:07 +01:00
Joachim Fasting
1e2d8bdb79 Merge pull request #16499 from mimadrid/update/meld-3.16.1 
meld: 3.16.0 -> 3.16.1
 2016-06-25 19:24:23 +02:00
mimadrid
ad16f79533
meld: 3.16.0 -> 3.16.1 2016-06-25 19:03:13 +02:00
Christine Koppelt
117fb73965 git-ant-tools.git-extras: 3.0.0 -> 4.1.0 2016-06-25 14:21:16 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
zimbatm
5da1db3dcf Merge pull request #16319 from mimadrid/update/bazaar-2.7.0 
bazaar: 2.6.0 -> 2.7.0
 2016-06-19 22:25:49 +01:00
mimadrid
cad9e875bc bazaar: 2.6.0 -> 2.7.0 2016-06-18 23:46:32 +02:00
Alexey Lebedeff
552388f8df diff-so-fancy: init at 0.9.3 
Script was mentioned at GitHub blog -
https://github.com/blog/2188-git-2-9-has-been-released :)
 2016-06-17 13:38:59 +03:00
Alexey Lebedeff
420b3c37ef git: fix perl shebangs in contrib 
There are a lot of scripts in contrib (e.g. `diff-highlight`) that
contain perl shebang line. But `patchShebangs` is unablle to fix this
without explicitly listing `perl` in `buildInputs`.
 2016-06-16 23:47:56 +03:00
Nathan Zadoks
8d3df9f6c4 git: 2.8.3 -> 2.9.0 2016-06-15 10:56:29 -04:00
Vladimír Čunát
e68191e6c4 Merge #16216: meld: 3.14.0 -> 3.16.0 2016-06-13 22:10:09 +02:00
mimadrid
1a9a72274a meld: 3.14.0 -> 3.16.0 2016-06-13 21:21:16 +02:00
Christoph Hrdinka
077ac28f2c mercurial: update source url 
The old download url isn't reachable since a few weeks. The new one uses
mercurials domain instead of selenics.
 2016-06-12 20:23:00 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
zimbatm
a5a1d45636 git-lfs: 1.2.0 -> 2016-06-07 
Fixes import issues after go1.5+
 2016-06-09 16:11:33 +02:00
Kamil Chmielewski
bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is 
a tag
 2016-06-09 13:08:10 +02:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
ece0626593 git-lfs: extracted from goPackages 2016-06-09 11:21:30 +02:00
Peter Simons
1845843cdd git-annex: take this tool from LTS Haskell while Stackage Nightly is broken 2016-06-06 09:33:30 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00: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
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +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
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00: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
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +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
Robin Gloster
a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Louis Taylor
69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00: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
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00: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
Raymond Gauthier
62f47641b1 smartgithg: 7.1.0 -> 7.1.2 
Also fixes broken download link.
 2016-03-14 10:27:22 -04:00
Robin Gloster
3f9b00c2d8 Merge pull request #13906 from Zer0-/gitlab_version_bump 
Gitlab version bump
 2016-03-14 13:29:13 +01:00
Philipp Volguine
a2424fffd3 Gitlab package version 8.5.1 -> 8.5.5 
-had to bump the versions on a few gem dependencies
 2016-03-13 21:05:11 +00:00
Graham Christensen
bdb1e5c73f svn: convert sha1 to sha256 2016-03-11 15:54:55 -06:00
Eelco Dolstra
dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging 
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
 2016-03-11 16:02:38 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
zimbatm
75d7692ab3 gitAndTools.darcsToGit: 0.2git -> 2015-06-04 
Fixes error where ruby 2.0+ doesn't have iconv anymore.

    `require': cannot load such file -- iconv (LoadError)
 2016-03-05 18:45:39 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster
fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Nathan Zadoks
819dab0203 git-remote-hg: fix the derivation name 
-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
 2016-03-03 14:51:31 +01:00
Eelco Dolstra
1c74a16e10 rcs: Fix build on gcc 5 
http://hydra.nixos.org/build/32624218
 2016-03-03 13:10:22 +01:00
Robin Gloster
4c9c4c4dcd redmine: disable format hardening 2016-03-01 22:47:29 +00:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
zimbatm
de8c119a4b redmine: fix compilation with ruby 2.3 
Just bumped the JSON dependency manually to the one bundled with ruby 2.3
 2016-02-29 10:02:59 +00:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Bjørn Forsman
070dccae7b gitstats: init at 2016-01-08 
Upstream does not make releases, using latest commit from master branch.
 2016-02-28 15:00:52 +01:00
Bjørn Forsman
d589391202 gitinspector: 0.4.1 -> 0.4.4 2016-02-28 11:32:09 +01:00
Graham Christensen
73f6410851 cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901 2016-02-27 15:35:19 -06:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab 
gitlab: 8.0.5 -> 8.5.1, service improvements
 2016-02-26 11:19:28 +00:00
Franz Pletz
af17efd014 Merge pull request #13466 from benley/git-stree-0.4.5 
git-stree: init at 0.4.5
 2016-02-26 09:59:47 +01:00
Franz Pletz
c2412bd700 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements 
8.5.0 -> 8.5.1
 2016-02-26 08:31:21 +01:00
Franz Pletz
bcfa59bf82 gitlab: 8.0.5 -> 8.5.0, service improvements 
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
 2016-02-26 07:08:31 +01:00
zimbatm
428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2 
git: fixes references to gettext properly
 2016-02-26 00:03:17 +00:00
Benjamin Staffin
fe6ad9e912 git-stree: init at 0.4.5 2016-02-25 15:26:06 -08:00
Benjamin Staffin
ca5f243697 git-and-tools: alphabetize attributes before it gets too huge 2016-02-25 14:23:34 -08:00
Robin Gloster
40c586b7ce Merge pull request #13427 from k0ral/mercurial 
mercurial: 3.5.1 -> 3.7.1
 2016-02-25 17:00:58 +01:00
koral
d4193c82c1 mercurial: 3.5.1 -> 3.7.1 2016-02-24 16:39:03 +01:00
Wout Mertens
677893f92b Merge pull request #13422 from k0ral/git 
git: 2.7.0 -> 2.7.1
 2016-02-24 15:09:28 +01:00
koral
c1504c5a94 git: 2.7.0 -> 2.7.1 2016-02-24 13:47:23 +01:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication 
buildPythonApplication: use new function for Python applications
 2016-02-23 16:02:10 +01:00
Robin Gloster
4036e9ba8c Merge branch 'up' into hardened-stdenv 2016-02-20 22:27:33 +00:00
zimbatm
11733b39b5 git: fixes references to gettext properly 
A better implementation of 5273dbf530

Fixes https://github.com/NixOS/nixpkgs/issues/13150

The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
 2016-02-20 14:47:23 +00:00
Ricardo M. Correia
fd3e02add8 Merge pull request #13027 from puffnfresh/package/pijul 
pijul: 0.1 -> 0.2-6ab9ba
 2016-02-20 15:43:53 +01:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
zimbatm
c38eb526d5 git: fix references to gettext in bash scripts 
See #13047
 2016-02-16 21:01:21 +00:00
Brian McKenna
93328bbd62 pijul: 0.2-6ab9ba 
Maintainer has been working with us, this commit was given by them.
 2016-02-17 07:28:26 +11:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
4538e70661 smartgithg: update 7_0_2 -> 7_1_0 2016-02-10 23:03:15 +01:00
Robin Gloster
c9aceaea86 gitAndTools.qgit: turn off format hardening 2016-02-09 11:04:13 +00:00
Robin Gloster
e06726ba15 rcs: use std=gnu99 to compile with gcc5 2016-02-09 01:23:58 +00:00
Robin Gloster
53e3de101b cvs: turn off format hardening 2016-02-07 19:23:40 +00:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Robin Gloster
5b67ed7c55 Merge pull request #12819 from Beauhurst/hg_crecord_revert 
hg_crecord: revert changes adding mercurial crecord
 2016-02-05 21:24:19 +01:00
Michael Raskin
0d1a188c5d Re-add Monotone-Viz with Fedora as a source 2016-02-04 20:13:49 +01:00
Robert Scott
d192057519 hg_crecord: revert changes adding mercurial crecord 
crecord is included in modern hg releases - I failed to realize this.
 2016-02-04 15:13:24 +00:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings 
... to refer to correct outputs
 2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Luca Bruno
b70310da23 Merge pull request #12750 from henrytill/mr 
mr: 1.20150503 -> 1.20160123
 2016-02-01 23:47:45 +01:00
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5f4a8de754 treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output 2016-02-01 20:45:57 +02:00
Henry Till
79b326e9e9 mr: 1.20150503 -> 1.20160123 2016-02-01 11:24:01 -05:00
Robin Gloster
9d7e2baf3b viewmtn: remove, source is offline and pkg dead 2016-01-30 20:31:04 +00:00
Robin Gloster
f295fef411 tailor: refactor from builderDefsPackage 2016-01-30 20:31:04 +00:00
Robin Gloster
6950c43467 monotoneViz: delete 
not updated in 5 years and broken build
 2016-01-30 20:31:04 +00:00
Robin Gloster
2c3013f55b cvs: Remove unneeded configureFlags 2016-01-30 20:31:01 +00:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Jascha Geerds
f7578a4d32 gitflow: 1.8.0 -> 1.9.1 2016-01-27 17:15:42 +01:00
Christoph Hrdinka
890f000146 goPackages.git-annex-remote-b2: init at 0.2 2016-01-26 17:54:53 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
c169718a6b git-bz: fix meta typo 
Thanks to @heydojo.
 2016-01-15 10:26:18 +01:00
Tobias Geerinckx-Rice
d1440745c6 git-bz: meta: un-break; fix licence; maintain 
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
36a68c8b6b git-bz: 3.20110902 -> 3.2015-09-08 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
123065aa3d git-bz: use callPackage and canonical package name 
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
b466dab8b2 veracity: remove dead package 
Last updated in 2012, broken since 2013. (OK, fine, but—)
Homepage abandoned, mailing list dead. (Hm. Spooky)
Uses builderDefsPackage. (Eek)
 2016-01-09 23:15:16 +01:00
somaticweb
2c4c9bee13 git: 2.6.4 -> 2.7.0 
Also corrected the license, which is GPL2-only
 2016-01-05 22:15:17 -08:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Arseniy Seroka
729211de7a Merge pull request #11917 from jerith666/subgit 
subgit: init at 3.1.0
 2015-12-29 14:57:47 +03:00
Matt McHenry
090efc2907 subgit: init at 3.1.0 2015-12-28 22:59:23 -05:00
Arseniy Seroka
0b6f76a1d3 Merge pull request #11934 from makefu/cvs2svn 
cvs2svn: 2.0.1 -> 2.4.0
 2015-12-25 17:26:43 +03:00
makefu
47f17939c2 cvs2nix: 2.0.1 -> 2.4.0 2015-12-24 16:58:01 +01:00
Eric Merritt
6108bb8971 hub: 2.2.1 -> 2.2.2 2015-12-23 08:37:02 -08:00
Peter Simons
e5b15f6b52 Merge pull request #11838 from k0ral/git 
git: 2.6.3 -> 2.6.4
 2015-12-20 11:55:57 +01:00
koral
016e88b2d2 git: 2.6.3 -> 2.6.4 2015-12-19 17:37:37 +00:00
Peter Simons
95dc945759 Merge pull request #11774 from ip1981/ip1981/git-crypt 
git-crypt needs GnuPG
 2015-12-17 11:03:27 +01:00
Igor Pashev
85375fc5fc git-crypt needs GnuPG 2015-12-17 11:00:50 +03:00
Eelco Dolstra
e7ae72cfb1 subversion: 1.8.14 -> 1.8.15, 1.9.2 -> 1.9.3 
CVE-2015-5343, CVE-2015-5259.
 2015-12-16 15:21:58 +01:00
Eelco Dolstra
64792ffdaa subversion: Use callPackages 2015-12-16 15:21:58 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Pascal Wittmann
84b3af19b8 Merge pull request #11365 from nlewo/fix/git-review 
git-review: init at 1.25.0
 2015-12-05 16:32:12 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra 
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
 2015-12-05 11:11:51 +01:00
Arseniy Seroka
0c05f14d53 Merge pull request #10535 from roblabla/feature-updateGitlab8.0.5 
gitlab: 7.4.2 -> 8.0.5
 2015-12-04 16:30:09 +03:00
roblabla
b7a4231aa2 gitlab: 7.4.2 -> 8.0.5 2015-12-04 01:14:24 +01:00
Antoine Eiche
e78fb0d59a git-review: init at 1.25.0 
This provides a git command for submitting branches to Gerrit.
 2015-12-02 12:36:01 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Philip Lykke Carlsen
d69e1956d7 tortoisehg: 3.4.2 -> 3.6 
It builds and runs. Tested very superficially with an empty repository.
 2015-11-17 22:09:38 +01:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
 2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
Stéphane Jourdois
221965a918 tig: add libiconv dep on darwin 2015-11-07 13:51:43 +01:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III
ebedbec72b git: 2.6.2 -> 2.6.3 2015-11-05 18:18:21 -08:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Vladimír Čunát
c5579c9184 subversion: fixup some referrers after splitting 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
c471cb866f subversion: Split into multiple outputs 2015-10-28 10:22:59 +01:00
Aaron Bull Schaefer
8e7d39835f transcrypt: init at 0.9.7 2015-10-25 23:22:21 +00:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brian McKenna
c6c1d3f777 pijul: init at 0.1 2015-10-21 21:35:02 +11:00
William A. Kennington III
cc2f78573e git: 2.5.3 -> 2.6.2 2015-10-18 17:23:51 -07:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Desmond O. Chang
b41742414e git-crypt: update maintainer 2015-10-14 21:46:27 +08:00
Jude Taylor
ec09587e5b build mercurial with cf-private 2015-10-11 10:30:13 -07:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
 2015-10-06 15:24:20 +02:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +02:00
Tobias Geerinckx-Rice
910dfd53bd git-hub: minor clean-up 
Move meta out of the way; inherit the GitHub home page from src;
`with platforms; linux` -> `platforms.linux`.
 2015-10-02 05:34:34 +02:00
Vladimír Čunát
e9fcbe67b0 kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8 
Just bringing back pre-bc54ecd811e state as well.
 2015-10-01 22:23:31 +02:00
Matthias Beyer
05fab76355 gitAndTools.git-extras: 2.2.0 -> 3.0.0 2015-09-29 12:27:22 +02:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12 
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
 2015-09-27 15:08:12 -05:00
Robert Scott
f96582fc60 mercurial: add package for crecord extension as optional dependency, include by default in mercurialFull 2015-09-24 10:59:14 +00:00
Raymond Gauthier
738acf0651 smartgithg: 7.0.0 -> 7.0.2 
Also adapted package's freedesktop item install
script so that it works in the context of nix.
(i.e.: icons and `*.desktop` file now properly
installed by the package).
 2015-09-23 22:40:03 -04:00
William A. Kennington III
a7b55bc324 subversion: 1.9.1 -> 1.9.2 2015-09-23 12:30:00 -07:00
William A. Kennington III
25dbb2d8bc git: 2.5.2 -> 2.5.3 2015-09-23 12:30:00 -07:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
Bjørn Forsman
452ebd1987 gitinspector: init at 0.4.1 2015-09-22 16:35:44 +02:00
Peter Simons
07f8f50c6d git-annex: build w/o assistant in Stackage, with assistant for Nixpkgs 2015-09-19 08:20:54 +02:00
William A. Kennington III
bc54ecd811 subversion: 1.8.14 -> 1.9.1 2015-09-17 14:12:38 -07:00
Arseniy Seroka
e8c1717ff4 Merge pull request #9895 from Mathnerd314/rabbitvcs 
rabbitvcs: init at 0.16
 2015-09-17 18:05:58 +03:00
Mathnerd314
c3ed1b17ba rabbitvcs: init at 0.16 2015-09-16 16:36:27 -06:00
Edward Tjörnhammar
f02eed27f9 gitRepo: 1.21 -> 1.22 2015-09-16 19:13:27 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
William A. Kennington III
b127f88711 git: 2.5.1 -> 2.5.2 2015-09-13 20:09:19 -07:00
Kamil Chmielewski
e77b9fff67 git-radar: init at 0.3.2 2015-09-08 08:44:51 +02:00
Rok Garbas
b2579497c6 smartgithg: 6.5.9 -> 7.0.0 2015-09-04 09:04:56 +02:00
koral
944a0c82f0 mercurial: 3.5 -> 3.5.1, fixes #9615 2015-09-04 09:04:48 +02:00
koral
0c15deaeb6 mercurial: 3.4.2 -> 3.5 2015-09-04 09:03:59 +02:00
Domen Kožar
6cb878e9c2 redmine: shorten flags line to avoid yaml parsing bug 
(cherry picked from commit c56f25d06fcd1eb4b0b232296a055b2dce997a05)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-03 10:11:41 +02:00
William A. Kennington III
6f19418b65 git: 2.5.0 -> 2.5.1 2015-08-31 10:27:07 -07:00
Daniel Fox Franke
07903b1617 cvs-fast-export: don't link against librt 
It's superfluous on Linux, and it breaks the build on Darwin.
 2015-08-29 12:05:52 -04:00
Daniel Fox Franke
0912bdfa92 cvs-fast-export: patch shebangs in source tree 
This allows unit tests to run successfully in chroot build
environments, which lack /usr/bin/env.
 2015-08-26 15:18:06 -04:00
Daniel Fox Franke
686fec3ce7 reposurgeon: init at 3.28 2015-08-25 22:06:07 -04:00
Daniel Fox Franke
2194295fff cvs-fast-export: init at 1.32 2015-08-25 22:06:06 -04:00
Eelco Dolstra
24f1a7a5cb subversion: Update to 1.8.14 
CVE-2015-3184, CVE-2015-3187.
 2015-08-24 11:51:28 +02:00
Shea Levy
b661ebe3cb rcs: Use c99 on darwin 2015-08-20 08:10:27 -04:00
Tobias Geerinckx-Rice
481d2acea8 git-hub: remove files not needed on Nix 2015-08-17 23:21:50 +02:00
Desmond O. Chang
f3cb701085 git-crypt: init at 0.5.0 2015-08-08 17:04:07 +08:00
vbgl
4d22b539b8 Merge pull request #9070 from danbst/tortoise-hg 
new package: TortoiseHg and dependencies
 2015-08-06 12:55:56 +02:00
Eelco Dolstra
525c901ce9 Make svn2git visible to nix-env 2015-08-05 14:33:12 +02:00
Eelco Dolstra
9657be0b95 svn2git-kde: Mark as broken 
The source repository no longer exists.
 2015-08-05 14:33:03 +02:00
Marco Maggesi
ba3a4a892e Update fossil to version 1.33 2015-08-05 14:09:33 +02:00
danbst
40061f66ce mercurial: bump 3.3.3 -> 3.4.2 2015-07-31 20:18:20 +00:00
danbst
fc155f74d6 tortoisehg: init at 3.4.2 2015-07-31 19:29:29 +00:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates 
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
 2015-07-31 01:34:58 +02:00
William A. Kennington III
0e947e00a0 git: 2.4.6 -> 2.5.0 2015-07-29 18:15:08 -07:00
Mateusz Kowalczyk
77857a8237 Merge pull request #7599 from jraygauthier/jrg/add_peru_pkg 
Added peru package.
 2015-07-26 17:27:02 +01:00
Raymond Gauthier
cdc58d410b peru: init at 0.2.3 
A project dependencies version management system
built on top of multiple version management systems.
 2015-07-26 09:57:51 -04:00
Vincent Laporte
9d5508d85c meld: 3.12.3 -> 3.14.0 (close #8982) 2015-07-25 13:10:24 +02:00
Vladimír Čunát
9f37e91ec5 Merge master into staging 
There are larger-rebuild changes: gnutls and samba.
 2015-07-17 06:38:04 +02:00
William A. Kennington III
d7b917e612 git: 2.4.5 -> 2.4.6 2015-07-16 20:07:17 -07:00
lostdj
a643e25286 SmartGitHg: 6.5.7 -> 6.5.9 2015-07-15 13:13:01 +03:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Austin Seipp
d1221f46e9 nixpkgs: git 2.4.4 -> 2.4.5 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-09 01:33:46 -05:00
Austin Seipp
35ca7fae8e nixpkgs: git - link git-http-backend into $PATH 
This makes it easier for tools (like Phabricator) to find
git-http-backend to enable HTTP(S) transport support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-09 01:33:15 -05:00
William A. Kennington III
dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
Jude Taylor
6f6d873069 darwin purity: mercurial 2015-07-08 14:15:04 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Pascal Wittmann
b6db9b9553 src: update from 0.13 to 0.19 2015-07-01 23:43:17 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
lethalman
d50969b66e Merge pull request #8580 from jraygauthier/jrg/fix_meld_hicolor_icon_breakage 
Fix meld package that broke the hicolor icon theme.
 2015-07-01 10:12:32 +02:00
Raymond Gauthier
d612a9e132 meld: fix for hicolor theme breakage 
This breakage was cause by the package outputing its own
version of index.cache to `share/icons/hicolor`.

Used the `hicolor_icon_theme` hook to perform automated cleanup.
 2015-07-01 00:26:02 -04:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Pascal Wittmann
dd73d2af87 Merge pull request #8505 from joachifm/delete-codeville 
codeville: delete expression
 2015-06-26 17:09:42 +02:00
Jude Taylor
9f6f299448 darwin purity: subversion 2015-06-25 16:36:05 -07:00
Jude Taylor
a8c98bc013 darwin purity: mercurial 2015-06-25 16:36:04 -07:00
Joachim Fasting
78d4f1dec6 codeville: delete expression 
Codeville is abandonware. The homepage returns 404, and the last release
is 8 years old ...
 2015-06-25 22:34:29 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Peter Simons
922c555015 mercurial: add hg-git support 
Enable this feature by putting these lines into your ~/.hgrc file:

  [extensions]
  hgext.bookmarks =
  hggit =
 2015-06-24 11:33:17 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Jascha Geerds
01e43fcd1d gitflow: 1.7.0 -> 1.8.0 2015-06-22 12:17:50 +02:00
Jascha Geerds
ed4b17bbd8 Merge pull request #8424 from bobvanderlinden/gitcola-2.2.1 
git-cola: update from 2.1.1 to 2.2.1
 2015-06-22 08:42:53 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Bob van der Linden
a768954d63 git-cola: update from 2.1.1 to 2.2.1, potentially fixes CVE-2012-0845, CVE-2012-1150, CVE-2014-9365 2015-06-19 23:56:30 +02:00
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
7fd80890c7 git: 2.4.2 -> 2.4.4 2015-06-18 21:24:46 -07:00