Peter Simons
9cc46aaa4a
git-annex: switch to the version built with GHC 7.10.1
...
Also, this change renames the "gitAnnex" attribute to "git-annex". This
seems more in-line with recent additions to the git package family,
which all used dashed names instead of camel-caps.
2015-05-30 19:54:42 +02:00
William A. Kennington III
cd52c04456
Fix more ca-bundle paths
2015-05-29 14:26:32 -07:00
William A. Kennington III
14c1e0fa1f
Fix ca-bundle paths
2015-05-29 14:03:34 -07:00
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Austin Seipp
d7de6dad5f
Merge pull request #7755 from Lassulus/gitolite-update
...
Gitolite update
2015-05-25 10:02:56 -05:00
William A. Kennington III
21247699ad
git: 2.4.0 -> 2.4.1
2015-05-15 18:38:13 -07:00
Pascal Wittmann
9c9c586534
Fixed several "package has no version" warnings
2015-05-14 17:19:41 +02:00
lassulus
23b97e4066
gitolite: v3.6.2 -> v3.6.3
2015-05-10 14:07:47 +02:00
koral
d40cf483cc
git: 2.3.6 -> 2.4.0
2015-05-09 11:46:31 +00:00
Bob van der Linden
9254ee082e
git-cola: changed platform to Linux only
2015-05-08 13:41:02 +02:00
Peter Simons
324719a5a6
Drop obsolete pre-NG Haskell builds.
2015-05-05 21:44:47 +02:00
Pascal Wittmann
9dcac56f34
bzrTools: update from 2.5 to 2.6 and refactor
2015-05-03 00:02:04 +02:00
Domen Kožar
f69cfbfa15
Merge pull request #7631 from KaiSforza/git-remote-hg
...
git-remote-hg: remove dbus, install built docs
2015-05-02 14:44:03 +02:00
Joachim Fasting
bf7ad2d84f
meta.description fixups
...
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Jascha Geerds
2efbbaaa86
Merge pull request #7595 from jraygauthier/jrg/smartgit_657
...
Updated smartgithg to version `6.5.7`.
2015-04-30 01:28:21 +02:00
Raymond Gauthier
cc1b3a7d8a
Fixed issue with smartgithg download url prefix.
...
Was using the `download` infix instead of
`downloads`.
2015-04-29 19:11:16 -04:00
Joachim Schiele
50fb7b312b
tig-2.1.1: version bump
2015-04-29 23:57:31 +02:00
William Giokas
9870ba1968
git-remote-hg: remove dbus, install built docs
...
dbus is unused in this package, no reason to include it in the
expression anywhere.
2015-04-29 09:58:04 -07:00
Raymond Gauthier
ce43dae0df
Updated smartgithg to version 6.5.7
.
2015-04-27 22:00:42 -04:00
John Wiegley
de808ae79f
Merge pull request #7276 from spwhitt/git-imerge
...
git-imerge: new package
2015-04-26 19:51:05 -05:00
koral
ffe6539c98
git: 2.3.5 -> 2.3.6
2015-04-25 23:07:02 +00:00
Peter Simons
805b9ed4bf
git-annex: use build from GHC 7.8.4 package set until 7.10.1 compiles this tool
2015-04-20 00:06:52 +02:00
Andrey Pavlov
d421a7b77b
git-and-tools/hub: 2.2.0-rc1 -> 2.2.1
2015-04-16 10:25:25 +03:00
Spencer Whitt
943fd93c14
git-imerge: new package
2015-04-14 15:50:27 -04:00
Eelco Dolstra
c98b8f4c11
subversion: Update to 1.8.13
2015-04-09 15:35:27 +02:00
John Wiegley
aec35dfa58
Revert "git-imerge: new package"
...
This reverts commit 309d0f0c8b
.
2015-04-08 14:03:14 -05:00
Spencer Whitt
309d0f0c8b
git-imerge: new package
2015-04-07 00:40:33 -04:00
Arseniy Seroka
a4ab883ab9
Merge pull request #7144 from k0ral/mercurial
...
mercurial: 3.3.2 -> 3.3.3
2015-04-03 16:15:07 +03:00
Peter Simons
844d88fe4c
Merge pull request #7146 from k0ral/git
...
git: 2.3.4 -> 2.3.5
2015-04-03 13:31:10 +02:00
koral
d54b6c903d
git: 2.3.4 -> 2.3.5
2015-04-03 10:57:36 +00:00
koral
29dc55abc3
mercurial: 3.3.2 -> 3.3.3
2015-04-03 09:58:16 +00:00
Eelco Dolstra
c82dc7018d
Remove unused Darcs expression
2015-03-27 16:17:48 +01:00
William A. Kennington III
06ea226495
cgit: 0.10.2 -> 0.11.2
2015-03-26 17:15:29 -07:00
William A. Kennington III
cd3b460200
tig: 2.0.3 -> 2.1
2015-03-26 16:41:05 -07:00
William A. Kennington III
940d381d73
git: 2.3.3 -> 2.3.4
2015-03-26 14:03:51 -07:00
Michael Raskin
61e573fcb6
Update fossil; use repository-generated tarball because release tarballs disappear
2015-03-26 10:12:25 +03:00
koral
8797078695
git: 2.3.2 -> 2.3.3
2015-03-17 17:18:12 +00:00
Eelco Dolstra
b2000f05d9
Merge pull request #6758 from k0ral/mercurial
...
mercurial: 3.2.4 -> 3.3.2
2015-03-11 15:52:16 +01:00
koral
7b4d8d361d
mercurial: 3.2.4 -> 3.3.2
2015-03-11 14:45:53 +00:00
lethalman
9b699bc9a9
Merge pull request #6705 from bobvanderlinden/gitcola
...
git-cola: add package
2015-03-11 15:35:37 +01:00
koral
5d0cc81d08
git: 2.3.1 -> 2.3.2
...
(cherry picked from commit 50933385c5
)
2015-03-10 13:20:02 +01:00
koral
a0da8638d6
git: 2.3.0 -> 2.3.1
...
(cherry picked from commit 36c1a8a6c7
)
2015-03-10 13:19:41 +01:00
Bob van der Linden
08ea20df65
git-cola: add package
2015-03-08 01:39:29 +01:00
Luca Bruno
68d23e2134
Merge branch 'meld'. Closes #6595
2015-03-01 12:54:13 +01:00
Luca Bruno
c40cb390f8
meld: fix gsettings schemas and remove LD_LIBARY_PATH
2015-03-01 12:51:36 +01:00
Thomas Tuegel
4ef3c64d2e
vsch: fetch release tarballs, not git revisions
...
We only update at releases anyway, so it doesn't really make sense to
use fetchgit. Plus, it makes monitor.nixos.org useless because we're
inevitably behind master.
2015-02-25 16:14:36 -06:00
Nikolay Amiantov
c6e0178d40
gitlab: fix checksum
2015-02-18 19:25:13 +03:00
Dan Peebles
a78d164b1e
Minor fixes for git on darwin (libiconv and Security dependencies)
2015-02-17 22:30:59 -05:00
Shea Levy
2f061ff16b
Merge remote-tracking branch 'origin/staging'
...
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Marco Maggesi
07bac418d2
Update fossil to version 1.30
2015-02-15 15:34:29 +01:00
Eric Seidel
e08b9ab8d3
kill libiconvOr*
...
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Peter Simons
ad1417ed0e
git: update to version 2.3.0
2015-02-06 13:59:57 +01:00
Edward O'Callaghan
e7ecb78aab
version-management/gitolite: Bump version 3.6.1 -> 3.6.2
...
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:45:50 +11:00
lethalman
2140080b08
Merge pull request #5750 from rycee/issue/5741
...
Wrap 'tig' command to add with git to PATH.
2015-01-28 14:52:45 +01:00
Peter Simons
b5ed72ceec
rcs: update from 5.9.3 to 5.9.4
2015-01-27 14:04:54 +01:00
Charles Strahan
cb395eaadb
gitlab-shell: fix evaluation
2015-01-25 16:28:20 -05:00
Charles Strahan
6eaa419920
gitlab: fix evaluation
2015-01-25 16:28:18 -05:00
Vladimír Čunát
45a34f65fe
meld: drop gnome2.scrollkeeper (no longer used)
...
Also indent the overlong lines in the expression.
2015-01-25 08:59:05 +01:00
Edward Tjörnhammar
770e73ee6e
Merge pull request #5893 from qknight/meld_upgrade
...
meld: bump to 3.12.3 (latest) version
2015-01-23 13:06:54 +01:00
Peter Simons
7149878010
git-annex: switch attribute over to haskell-ng package set some more
2015-01-22 23:29:09 +01:00
Peter Simons
5adc98cc50
git-annex: switch attribute over to haskell-ng package set, which is more up-to-date
2015-01-22 23:25:40 +01:00
Charles Strahan
8085f088cb
ruby: exorcise the last few remaining rubyPackages
2015-01-21 22:23:37 -05:00
Joachim Schiele
b8c2f466ba
meld: bump to 3.12.3 (latest) version
2015-01-21 22:02:20 +01:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
muflax
98556ef150
git-remote-hg: fix compatibility with mercurial 3.2
...
Close #5458 .
2015-01-20 15:49:59 +01:00
Robert Helgesson
db01e50f6a
Wrap 'tig' command to add with git to PATH.
...
This ensures that git is added as a run-time dependency of tig and
allows tig to find the git command even if git is not installed in the
user environment. Fixes #5741 .
2015-01-13 23:12:35 +01:00
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
aszlig
947a4c582e
hub: Fix build with chrooted Nix.
...
The build script is a shell script which has a shebang using
/usr/bin/env, which isn't available in a chrooted Nix daemon.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-12 03:05:40 +01:00
Arseniy Seroka
269568b7ea
Merge pull request #5565 from kirelagin/hub
...
gitAndTools.hub: Update to 2.x
2015-01-10 10:42:19 +03:00
William A. Kennington III
c82410eeda
java: Normalize to the default jre / jdk
2015-01-07 14:55:41 -08:00
Eelco Dolstra
0b8ac6b791
mercurial: Update to 3.2.4
2015-01-06 14:29:22 +01:00
Peter Simons
d8c600c129
haskell-git-annex: update to version 5.20141231
2015-01-05 18:39:18 +01:00
Kirill Elagin
4b84049bd3
gitAndTools.hub: Update to 2.x
2015-01-04 02:28:38 +03:00
John Wiegley
eba9d0d8fa
subversion: Add several compiler definitions for Darwin
2015-01-03 07:53:06 -05:00
John Wiegley
58ae62b9fa
hub: add git as a dependency of the expression
2015-01-03 07:53:01 -05:00
Charles Strahan
94dd4b9721
ruby: WIP
2014-12-30 21:05:00 -05:00
Arseniy Seroka
c087c456af
Merge pull request #5510 from k0ral/fast-export
...
fast-export: update to last revision from upstream
2014-12-31 01:19:42 +03:00
koral
10b3d1ad7b
fast-export: update to last revision from upstream
2014-12-30 14:54:12 +01:00
Domen Kožar
6dc71c19b0
Merge pull request #5480 from lostdj/ltp/upstream-master/smartgit653
...
SmartGitHg: update from 6.0.6 to 6.5.3.
2014-12-30 03:47:14 +01:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Charles Strahan
145733c479
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/redmine/default.nix
pkgs/development/interpreters/ruby/gem.nix
pkgs/development/interpreters/ruby/generated.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/tools/vagrant/default.nix
pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Thomas Tuegel
e5e6931088
vcsh: add ttuegel as maintainer
2014-12-28 09:00:49 -06:00
Thomas Tuegel
a1860dab81
vcsh: bump version to 1.20141026
2014-12-28 09:00:38 -06:00
lostdj
cf8a716baa
SmartGitHg: update from 6.0.6 to 6.5.3.
2014-12-27 11:28:38 +03:00
Peter Simons
8298636254
haskell-git-annex: update to version 5.20141219
2014-12-25 11:05:49 +01:00
Pascal Wittmann
f94580da69
Fix license attribute of many bsd-like licensed packages
2014-12-21 00:00:35 +01:00
Tom
7800270ae4
[SECURITY] Update git to 2.1.4
...
This fixes CVE-2014-9390
http://article.gmane.org/gmane.linux.kernel/1853266
2014-12-19 14:05:04 +00:00
Eelco Dolstra
cb5433b8de
mercurial: Update to 3.2.2
2014-12-18 14:11:10 +01:00
Eelco Dolstra
49282dd1af
subversion: Update to 1.8.11
2014-12-18 14:11:10 +01:00
Domen Kožar
ba5fad6dfa
Merge pull request #5323 from offlinehacker/gitlab_i686_fix
...
gitlab: fix i686-linux build and module
2014-12-14 09:48:44 +01:00
Jaka Hudoklin
90683792aa
gitlab: fix i686-linux build and module
...
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available ).
But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 02:24:12 +01:00
Peter Simons
1a0505143c
haskell-github-backup: update to version 1.20141204
2014-12-13 12:06:02 +01:00
Jaka Hudoklin
13e58784bf
nixos/gitlab: fixes
...
- fix timezone data not found
- fix module, add simple test
- allow to set port
2014-12-12 18:01:31 +01:00
Thomas Hunger
59995e168c
nixos: Add gitlab and gitlab-shell
...
I had to make several adjustments to make it work with nixos:
* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
pre-receive.
* Modify gitlab-shell to write some environment variables into
the .authorized_keys file to make sure gitlab-shell reads the
correct config file.
* Log unicorn output to syslog.
I tried various ways of adding a syslog package but the bundler would
not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
This is useful to run e.g. backups etc. with the correct
environment set up.
2014-12-12 18:01:29 +01:00
Massimo Zaniboni
32f9644943
redmine: use libc libciconv implementation on Linux.
2014-12-12 01:20:53 +01:00
Maciek Starzyk
dcad10c8e6
haskell-git-annex: Add maintainer, was removed by mistake.
2014-12-04 21:49:15 +01:00
Maciek Starzyk
81cb2c144c
haskell-git-annex: update to version 5.20141203
2014-12-04 14:45:54 +01:00
Pascal Wittmann
5e04917e65
gource: fix build with new glm version
2014-12-04 14:31:28 +01:00
wmertens
45c1b9147f
Merge pull request #5130 from wmertens/git-ssl-env
...
Let git use $SSL_CERT_FILE
2014-11-27 13:24:08 +01:00
Shea Levy
64453d01f4
src: bump
2014-11-26 18:25:13 -05:00
Spencer Whitt
fdbd5e1323
New package: git-extras
2014-11-25 20:24:43 -05:00
Wout Mertens
272f2c365c
git: Support $SSL_CERT_FILE
2014-11-26 00:29:37 +01:00
Henry Till
d4bd9779dc
mr: update to 1.20141024
2014-11-22 09:30:30 -05:00
Shea Levy
5c7c63af66
Add src revision control software
2014-11-21 16:12:33 -05:00
Pascal Wittmann
fb5dfbdbc7
gource: update from 0.42 to 0.43 and adopt it
2014-11-19 08:47:41 +01:00
Charles Strahan
e51afe5e7c
fix hub
2014-11-18 04:07:30 +00:00
Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Peter Simons
d1cec0c92d
haskell-github-backup: update to version 1.20141110
2014-11-13 14:51:36 +01:00
Vladimir Kirillov
1b9f756e4e
git: do not do install-doc when !withManual
2014-11-12 17:36:17 +02:00
Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Charles Strahan
cf8f4963a7
rename rubyLibs to rubyPackages
2014-11-09 22:16:58 +00:00
Peter Simons
820f6f2e4c
haskell-git-annex: update to version 5.20141125
2014-11-09 14:59:30 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eelco Dolstra
dde6d5708c
Add set apacheHttpdPackages containing modules for specific Apache versions
...
Similar to linuxPackages etc.
2014-11-07 12:08:30 +01:00
Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
...
Conflicts:
pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
William A. Kennington III
a9c472d16e
boost: Fix incompatible applications
2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7
boost: Remove boost.lib
2014-11-02 17:22:27 -08:00
Adam Bouhenguel
8e09c97d1c
Bump git-repo to 1.21
...
Still no versioned URL, but there’s been a new release. SHA1 pulled
from http://source.android.com/source/downloading.html#installing-repo .
2014-11-01 17:28:25 -07:00
Peter Simons
0a2e12e046
haskell-github-backup: update to version 1.20141031
2014-11-01 21:08:04 +01:00
Peter Simons
eac1d21819
darcs: jailbreak to fix build with latest version of 'text'
2014-11-01 21:08:03 +01:00
Linquize
23048155b7
git: Update to 2.1.3
2014-10-30 17:22:47 +01:00
Peter Simons
8b12277065
haskell-git-annex: update to version 5.20141024
2014-10-26 23:44:48 +01:00
Peter Simons
cc48a930ae
haskell-git-annex: update to version 5.20141013
2014-10-18 17:48:48 +02:00
John Wiegley
ba22560768
git-annex: temporary patch to build the current version
2014-10-16 17:23:01 -05:00
Peter Simons
38751005a1
git-annex: broken by update to 'persistent' and 'yesod'
2014-10-14 17:39:35 +02:00
Peter Simons
8c3757a24d
darcs: jailbreak to fix build with random 1.x
2014-10-14 17:39:33 +02:00
Eelco Dolstra
462fdfe108
mercurial: Update to 3.1.2
2014-10-14 14:37:29 +02:00
Eelco Dolstra
811de3bfaa
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
...
Conflicts:
pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Michael Raskin
57e0b9de65
Apparently now monotoneViz source got fixed
2014-10-09 10:34:11 +04:00
Michael Raskin
af53f40684
Update Monotone-viz source
2014-10-08 22:06:15 +04:00
Aristid Breitkreuz
977ad646e9
rcs: update from 5.9.2 to 5.9.3
2014-10-07 22:40:06 +02:00
Domen Kožar
8f27aedb46
add redmine package
2014-10-07 10:54:22 +02:00
Peter Simons
066db30729
haskell-git-annex: update to version 5.20140927
2014-10-06 11:21:39 +02:00
Linquize
16494e0289
git: Update to 2.1.2
2014-10-03 23:13:38 +08:00
Eelco Dolstra
6db6dea4c9
subversion: Remove apparently unnecessary environment variables
...
At least it seems to build fine (and use clang) without them.
2014-09-24 18:55:09 +02:00
Eelco Dolstra
542a4d0287
subversion: Fix broken configure flags
...
This caused an impure dependency on libsasl on Darwin.
2014-09-24 18:51:29 +02:00
Eelco Dolstra
bf44536c79
mercurial: Update to 3.1.1
2014-09-23 12:03:11 +02:00
Eelco Dolstra
cd71f7a2e6
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
...
Conflicts:
pkgs/development/interpreters/ruby/ruby-19.nix
pkgs/development/libraries/libc++/default.nix
pkgs/development/libraries/libc++abi/default.nix
pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
William A. Kennington III
31220480d8
boost: Update depdendent packages
2014-09-21 17:20:59 -07:00
Ellis Whitehead
8ea7e926cc
Add myself to the maintainers list
2014-09-21 02:13:28 +01:00
Ellis Whitehead
b4437f36c3
New package: git-remote-gcrypt.
...
A git remote for working with encrypted git repositories.
Closes #4100
2014-09-21 02:13:28 +01:00
lostdj
d8fc19da05
SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency
...
with JRE.
Closes #4081 .
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:11:35 +01:00
Peter Simons
82a46ebb5c
haskell-git-annex: update to version 5.20140919
2014-09-20 18:00:04 +02:00
Peter Simons
89438059ab
haskell-git-annex: update to version 5.20140915
2014-09-17 21:16:10 +02:00
Peter Simons
70caf9d865
git-annex: broken by optparse-applicative 0.10.x
...
Bug has been reported upstream.
2014-09-14 00:06:45 +02:00
Dmitry Malikov
7d0a7ed62c
gitAndTools.tig: update from 2.0.2 to 2.0.3
2014-09-13 22:25:17 +02:00
Nick Sauce
759cc041ed
smartgithg: new package
...
@vcunat added meta.platforms.
2014-09-11 21:51:01 +02:00