3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

981 commits

Author SHA1 Message Date
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
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