alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
68533 commits 217 branches 121 tags 4.5 GiB
Commit graph

1104 commits

Author SHA1 Message Date
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
Joel Taylor 7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra 4ae3e32e82 Merge pull request #4012 from ibeex/master 
added darwin as supported platform for meld
 2014-09-09 15:35:58 +02:00
Ivan Brkanac 841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Domen Kožar 78e5e556cc Revert "fixes #1923" 
This reverts commit 1849840aa3.

Breaks git-annex
 2014-09-09 12:11:53 +02:00
Domen Kožar 1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Moritz Ulrich c5697874c2 diffuse: update from 0.4.7 to 0.4.8 2014-09-04 19:31:33 +02:00
Moritz Ulrich 32a3b65571 cgit: update from 0.10.1 to 0.10.2 2014-09-04 19:31:32 +02:00
Moritz Ulrich 332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich 0863bcb683 gitAndTools.hub: update from 1.12.0 to 1.12.2, potentially fixes CVE-2014-0177 2014-09-04 17:05:20 +02:00
Peter Simons e5878fa70b git-annex: re-build expression with latest cabal2nix 2014-09-04 16:20:57 +02:00
Moritz Ulrich cce6dd11b6 subversionClient: update from 1.8.9 to 1.8.10, potentially fixes CVE-2014-3504, CVE-2014-3522, CVE-2014-3528 2014-09-04 16:06:42 +02:00
Moritz Ulrich 4678ddc1c0 gitAndTools.svn2git: update from 2.2.5 to 2.3.2 2014-09-04 16:06:41 +02:00
Peter Simons ccd4a52f68 haskell-git-annex: update to version 5.20140831 2014-09-02 11:48:19 +02:00
Michael Raskin 08131bd5d5 Update guitone 2014-09-01 00:38:07 +04:00
Longrin Wischnewski a555193ee9 gource: update to version 0.42 2014-08-31 12:44:29 +02:00
Cray Elliott f237f31b93 darcs updated to 2.8.5 
tested to work with ghc 7.8.3
 2014-08-25 15:58:21 -07:00
Bjørn Forsman c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Peter Simons 3fad02dab8 haskell-git-annex: update to version 5.20140817 2014-08-19 23:47:59 +02:00
Rüdiger Sonderfeld d809e775e8 git: Add git-prompt.sh to /etc/bash_completion.d. 
This will make the git-prompt.sh features available to bash users when
completions are enabled.  It is done in this way in Debian/Ubuntu as well.
 2014-08-19 16:34:51 +02:00
Linquize 1916bc0412 git: Update to 2.1.0 2014-08-17 06:18:38 +02:00
Vladimír Čunát d75cf6fffb meld: update to latest stable 2014-08-16 18:58:51 +02:00
Peter Simons e823c123a8 Don't build broken Haskell packages on Hydra. 
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
 2014-08-12 12:37:44 +02:00
Michael Raskin 05a3b156f0 Update Mercurial to version 3.1 2014-08-12 02:47:04 +04:00
Eelco Dolstra 2f056c5237 subversion: Fix build on Darwin 2014-08-09 23:54:58 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Eelco Dolstra b4c4e2d28d subversion: Update to 1.8.9 2014-08-05 11:46:04 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Peter Simons 62bb741348 haskell-github-backup: update to version 1.20140721 2014-07-22 14:20:57 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Linquize 4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
John Wiegley 73e0c50b30 haskell-git-annex: fix for darwin 
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
 2014-07-18 18:37:54 -05:00