3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

762 commits

Author SHA1 Message Date
Vladimír Čunát 3dd298060a gource: fix build with newer gcc versions (-fpermissive) 2014-01-05 11:22:04 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
William A. Kennington III 184dd198fb subversion: Tweaks and Fixes
Remove ssl and compression options which are no longer valid when using
serf in place of neon. Also, make sure serf is an optional dependency.
2013-12-31 07:59:37 -06:00
Michael Raskin a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
William A. Kennington III 0270be1eb6 subversion: Update from 1.7.14 -> 1.8.5 2013-12-30 00:08:59 +00:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Florian Friesdorf 7a988c62af git-repo-1.20, update and pin python 2013-12-26 01:01:01 +01:00
Florian Friesdorf 46f627e8f7 git-repo-1.19 2013-12-26 00:45:21 +01:00
Peter Simons a4462d9a03 git-annex: fix build some more 2013-12-23 22:30:43 +01:00
Peter Simons 47a3ece984 git-annex: disable test suite to fix build
The "lock" test fails. Upstream knows this, and apparently the failure
is caused by a bug in the test suite -- not in the application code.
2013-12-23 22:30:43 +01:00
Peter Simons 2ac0fedb60 haskell-git-annex: update to version 5.20131221 2013-12-23 22:30:42 +01:00
Mathijs Kwik e966ebd5e1 kdesvn: upgrade to 1.6.0 2013-12-23 10:25:16 +01:00
Nixpkgs Monitor 8fa0f4debf gitAndTools.git: update from 1.8.5.1 to 1.8.5.2 2013-12-18 18:18:28 +02:00
Nixpkgs Monitor 296e2d5207 bazaarTools: update from 2.2.0 to 2.5 2013-12-18 18:18:18 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Peter Simons 903e36a74c git-annex: fix build some more 2013-12-14 22:05:17 +01:00
Peter Simons e706edb8ee git-annex: disable test suite in this version to fix the build 2013-12-14 21:34:34 +01:00
Peter Simons f449007ade haskell-git-annex: update to version 5.20131213 2013-12-14 15:19:27 +01:00
Nixpkgs Monitor ec83369639 subversionClient: update from 1.7.13 to 1.7.14, potentially fixes CVE-2013-4558 2013-12-13 00:10:35 +02:00
Peter Simons 2bc29e4e6d Merge branch 'master' into stdenv-updates. 2013-12-10 22:29:20 +01:00
Peter Simons c0fc46516d haskell-github-backup: update to version 1.20131203 2013-12-10 20:41:36 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich b4f93af3c9
Update git and related tools to latest releases.
Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-09 00:15:25 +00:00
Shea Levy 5588f25a15 hg 2.8.1
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-06 08:34:44 -05:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons d555031aa8 haskell-git-annex: update to version 5.20131130 2013-12-02 16:25:34 +01:00
Peter Simons 5644003632 haskell-git-annex: update to version 5.20131120 2013-11-26 21:09:18 +01:00
Eelco Dolstra e597d102d8 git: Update to 1.8.4.3 2013-11-14 15:29:58 +01:00
Peter Simons 75ec0b31f8 haskell-git-annex: update to version 4.20131106 2013-11-11 14:39:57 +01:00
Peter Simons d72afe2f1b haskell-github-backup: update to version 1.20131101 2013-11-11 14:39:51 +01:00
Peter Simons 46581c6918 subversion: install bash completion 2013-11-09 19:19:22 +01:00
Bjørn Forsman b8e890539e tig: small expression cleanup
* Add a bit of whitespace to make it easier on the eyes
* Shorten the description (and remove package name)
2013-11-09 19:13:35 +01:00
Bjørn Forsman 9b6fb1ebd5 tig: bump 1.1 -> 1.2.1
XML_CATALOG_FILES is needed to be able to build the asciidoc
documentation/manpages in this new version.
2013-11-09 19:06:09 +01:00
Eelco Dolstra a2cbc77e4f Only show/build a package on the platforms listed in meta.platforms
The function ‘mkDerivation’ now checks whether the current platform
type is included in a package's meta.platform field.  If not, it
throws an exception:

  $ nix-build -A linux --argstr system x86_64-darwin
  error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’

These packages also no longer show up in ‘nix-env -qa’ output.  This
means, for instance, that the number of packages shown on
x86_64-freebsd has dropped from 9268 to 4764.

Since meta.platforms was also used to prevent Hydra from building some
packages, there now is a new attribute meta.hydraPlatforms listing the
platforms on which Hydra should build the package (which defaults to
meta.platforms).
2013-11-05 00:06:10 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra 01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Peter Simons 576058fe0e haskell-git-annex: update to version 4.20131101 2013-11-01 17:42:08 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Jaka Hudoklin 11fd5db060 Add gitflow
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
2013-10-30 11:37:57 +01:00
Peter Simons c05bf33b77 haskell-git-annex: update to version 4.20131024 2013-10-27 19:07:14 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Brian Smith 9aa4c9fd84 Update fossil to 1.27, and enable the JSON API. 2013-10-21 18:16:27 +00:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons b224e751c0 haskell-github-backup: update to version 1.20131006 2013-10-10 20:56:33 +02:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons 85ecc3f176 haskell-git-annex: update to version 4.20131002 2013-10-03 21:29:51 +02:00
Peter Simons da17bd1352 git-annex: make sure the man page is installed 2013-10-03 17:16:19 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Peter Simons eaa38dd941 haskell-git-annex: update to version 4.20130927 2013-10-02 22:33:41 +02:00