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
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
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
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
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
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
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
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
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