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
Eelco Dolstra
51c1d2d597
git: Update to 1.8.4
2013-09-30 17:19:06 +02:00
Moritz Ulrich
fd67fcb314
Fix chroot-build of fast-export & pinpoint revision to current HEAD.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-29 00:25:31 +02:00
Eelco Dolstra
1e8294572f
subversion: Update to 1.7.13
...
CVE-2013-4246
2013-09-25 18:11:00 +02:00
Peter Simons
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
117176fd26
git-annex: patch to fix build with recent versions of 'dns' library
2013-09-18 18:09:17 +02:00
Peter Simons
24366adf19
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-14 15:28:40 +02:00
Peter Simons
e541f509ca
git-annex: update to version 4.20130909
2013-09-11 19:59:33 +02:00
Peter Simons
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
Bjørn Forsman
bb440b3612
meld: set meta.platforms attribute
...
This makes Hydra build it and makes it available in the binary channel.
2013-09-02 21:57:08 +02:00
Peter Simons
532cf20cbc
haskell-git-annex: update to version 4.20130827
2013-08-30 10:53:02 +02:00
Peter Simons
98fcc2f746
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-08-30 10:45:11 +02:00
aszlig
efa748a166
git-and-tools/hub: Update to version 1.10.6.
...
This now uses fetchurl instead of fetchgit to speed up fetching.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-27 04:39:33 +02:00
Peter Simons
9ac8ea937c
Merge branch 'origin/master' into stdenv-updates.
2013-08-26 12:21:23 +02:00
Peter Simons
1392922727
haskell-git-annex: update to version 4.20130815
2013-08-18 18:49:10 +02:00
Peter Simons
9cf2e2d030
haskell-darcs: re-generate expression with recent version of cabal2nix
2013-08-17 11:39:11 +02:00
Peter Simons
0d7118814b
Merge branch 'origin/master' into stdenv.
2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a
unmaintain several packages
2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Joachim Schiele
12f7c0666a
qgit version bump from 2.3 to 2.5
2013-08-11 14:35:23 +00:00
Eelco Dolstra
09fc997107
subversion: Update to 1.7.11
...
CVE-2013-4131
2013-08-07 17:12:33 +02:00
Peter Simons
60a6e6802f
haskell-git-annex: update to version 4.20130802
2013-08-05 10:56:30 +02:00
Eelco Dolstra
65ad55c425
git-subtree: Remove
...
This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE ).
2013-08-01 16:37:36 +02:00
Eelco Dolstra
80a82a2858
git: Install git-subtree
2013-08-01 16:36:54 +02:00
Eelco Dolstra
4ec1f8b68a
git: Update to 1.8.3.4
2013-08-01 16:26:02 +02:00
Peter Simons
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Domen Kožar
ae7adcb6e4
git: find global configs in /etc/ instead of /etc
2013-07-29 23:40:54 +02:00
Peter Simons
49335abfd2
haskell-git-annex: update to version 4.20130723
2013-07-26 19:40:47 +02:00
Evgeny Egorochkin
da4be371e9
make package use mirror:// for gnu, savannah and gnome repositories where possible
2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b53f429c6c
rapidvn: fix version to match tarball
2013-07-14 02:08:52 +03:00
Peter Simons
70835adb28
haskell-git-annex: update to version 4.20130709
2013-07-10 10:29:22 +02:00
Peter Simons
40ad185891
git: update to version 1.8.3.2
2013-07-08 14:04:51 +02:00
Bjørn Forsman
e3a67bbb99
diffuse: new package, close #731 .
...
Diffuse is a graphical diff and merge tool.
http://diffuse.sourceforge.net/
2013-07-08 11:14:50 +02:00
Vladimír Čunát
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Vladimír Čunát
387a691f59
Merge pull request #694 from lovek323/subversion
...
subversion: fix build on darwin
2013-07-04 02:18:58 -07:00
Jason "Don" O'Conal
bd3c2c76c7
subversion: fix build on darwin
...
* remove useless -no-cpp-precomp flags
2013-07-04 19:10:41 +10:00
Peter Simons
e533af98e4
git-annex: enable web-related features
2013-07-03 18:48:12 +02:00
Peter Simons
4b75f5a2ae
haskell-git-annex: update to version 4.20130627
2013-07-01 12:11:01 +02:00
Mathijs Kwik
cbf48a8cd1
upgrade to texinfo5 for some packages
2013-07-01 07:52:14 +02:00
Peter Simons
01bc9204e0
git-annex: fix installation of git-annex-shell
2013-06-22 15:41:37 +02:00
Vladimír Čunát
842420c3e1
Merge branch 'master' into stdenv-updates
...
Conflicts (relatively simple):
pkgs/development/interpreters/python/2.7/default.nix
pkgs/development/libraries/dbus/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Domen Kozar
1a23f715f4
tig: built for linux
2013-06-18 22:42:12 +02:00
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14:45 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Eelco Dolstra
6dbb6f78bb
subversion: Update to 1.7.10
...
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
2013-06-12 15:56:40 +02:00
Peter Simons
6b1ebeccf2
Merge branch 'master' into stdenv-updates.
...
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Vladimír Čunát
7db886fdb9
Merge remote-tracking branch 'hydra/master' into x-updates
...
Conflicts (taken from @7c6f434c):
pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Evgeny Egorochkin
9c6f7cc9c1
Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.
2013-06-07 03:15:45 +03:00
Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons
7b21e19a82
git-annex: generate build instructions with cabal2nix
2013-06-03 22:09:34 +02:00
Evgeny Egorochkin
6609df220b
Merge pull request #584 from bjornfor/cgit
...
cgit: new package
2013-06-02 14:13:05 -07:00
Bjørn Forsman
4ecd9cdb14
cgit: new package
...
cgit is a web frontend for git repositories - it is a CGI program to use
with your favourite webserver. Add the latest version, 0.9.2.
2013-06-02 18:25:54 +02:00
Peter Simons
5718931dd3
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-01 11:48:21 +02:00
Peter Simons
6fadcc2d69
git-annex: disable building of the web application to fix the build in the presence of yesod 1.2
2013-05-30 12:33:40 +02:00
Peter Simons
e7975c0d33
git-annex: update to version 4.20130521
2013-05-30 12:33:40 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Peter Simons
728e305205
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-05-22 12:30:02 +02:00
Bjørn Forsman
05bb66ce20
Add myself as maintainer for several packages
...
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Eelco Dolstra
e3c641b39a
mercurial: Update to 2.6.1
...
Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
2013-05-15 13:15:53 +02:00
Eelco Dolstra
b9013993db
git: Update to 1.8.2.3
2013-05-14 11:53:28 +02:00
Gergely Risko
972b1a7d50
Download git-annex from github instead of git.kitenet.net
...
git.kitenet.net doesn't allow snapshot downloads anymore, the url
just returns 403 Forbidden.
2013-05-13 18:19:41 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Shea Levy
fde3526e7d
Merge branch 'master' into stdenv-updates
...
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Peter Simons
7b868bbff4
git-annex: update to version 4.20130501
2013-05-03 11:38:58 +02:00
Eelco Dolstra
b17ba0fbb2
subversion: Update to 1.7.9
...
CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
CVE-2013-1884.
2013-05-01 13:15:05 +02:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Eelco Dolstra
f2aaed44aa
git: Properly use symlinks instead of hard links
...
Git's Makefile has a NO_INSTALL_HARDLINKS flag to produce symlinks
instead of hard links. However, it still produces hard links between
$out/bin and $out/libexec, hence the patch.
Also, update Git to 1.8.2.1.
2013-04-22 15:55:01 +02:00
Eelco Dolstra
6ee8bca8ee
Revert "git: fix build on FreeBSD"
...
This reverts commit ab98d72fad
, which
caused the size of the Git package in the store to increase from 18
MiB to 190 MiB.
2013-04-22 15:26:26 +02:00
Peter Simons
2ffd0b6dac
Merge changes from branch 'origin/master' into stdenv-updates.
2013-04-20 22:19:39 +02:00
Bjørn Forsman
88f1e643e3
git: fix gitweb.cgi runtime dependency on gzip
...
gitweb.cgi uses gzip for creating "snapshots". Without this patch it
doesn't work.
2013-04-19 22:32:51 +02:00
Peter Simons
4914e63a89
Merge changes from branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/icu/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Vladimír Čunát
ec736312d4
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/development/compilers/vala/default.nix (it's different version)
pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
Peter Simons
0911fe7f3c
haskell-github-backup: update to version 1.20130414
2013-04-14 23:06:17 +02:00
Peter Simons
7a69341994
git-annex: drop obsolete dependency on testpack
2013-04-14 21:19:09 +02:00
Vladimír Čunát
17ae1617dc
Merge branch 'master' into x-updates
...
Conflicts (systemd version is split on x-updates):
pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Peter Simons
0b4e664a24
git-annex: update to version 4.20130405
2013-04-13 00:13:22 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Lluís Batlle i Rossell
e0249ffcd0
meld: update to 1.6.1
2013-04-08 12:14:26 +02:00
Peter Simons
9f4d510b6b
Merge branch 'master' into stdenv-updates.
2013-04-05 11:23:38 +02:00
Peter Simons
47e93cd27e
rcs: update to version 5.8.2
...
It's profoundly satisfying to know that we have the very latest version of RCS.
RCS users, you see, live on the bleeding edge.
2013-04-05 08:56:40 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Peter Simons
62e37492b9
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-04 00:51:30 +02:00
Bjørn Forsman
e21c53c211
tig: enable bash completion
...
Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.
Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
2013-04-01 18:37:52 +02:00
Peter Simons
0823aea0a6
Merge branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a
introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons
ab98d72fad
git: fix build on FreeBSD
...
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons
73c610e1d6
git: update to version 1.8.2
2013-03-22 02:11:38 +01:00
Peter Simons
22fb1ad99e
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-21 09:23:54 +01:00
Peter Simons
d28d3f37a8
topgit: fix build on FreeBSD
...
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
2013-03-20 11:43:43 +01:00
Peter Simons
51e64392ea
git-annex: update to version 4.20130314
2013-03-20 10:15:06 +01:00
Peter Simons
a1a7448e5b
topgit: update to version 0.9
2013-03-20 09:50:06 +01:00
Danny Wilson
d007a78ccb
Merge remote-tracking branch 'origin/stdenv-updates' into illumos
...
Conflicts:
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/mpc/default.nix
pkgs/development/libraries/mpfr/default.nix
pkgs/development/libraries/ppl/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Sander van der Burg
23c78e41db
git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform
2013-03-14 14:57:40 +01:00
Peter Simons
4c9ebb62d4
git: link binaries with libgcc_s.so to ensure pthread_cancel() works
2013-03-09 23:57:57 +01:00
Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
...
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Peter Simons
4f697db7dd
haskell-github-backup: update to version 1.20120314
2013-03-02 17:07:43 +01:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Danny Wilson
ecba7e947e
Update Git to 1.8.1.3 and fix build on Illumos.
2013-02-28 20:04:06 +01:00
Peter Simons
329b33c59c
git-annex: clean up build expression
2013-02-28 13:04:15 +01:00
Peter Simons
e23be1b2ef
git-annex: update to version 4.20130227
2013-02-28 11:31:44 +01:00
Peter Simons
80dc8df25d
haskell-github-backup: update to version 1.20120314
2013-02-27 12:00:52 +01:00
Peter Simons
8f1c029e33
haskell-github-backup: add version 1.20120627
2013-02-25 15:25:54 +01:00
Peter Simons
8f1756e2d4
git: update to version 1.8.1.3
2013-02-25 02:12:42 +01:00
Peter Simons
1420012eca
darcs: disable test suite to avoid 127 exit code
2013-02-25 00:37:11 +01:00
Peter Simons
dd9ff9adb7
darcs: disable test suite to avoid 127 exit code
2013-02-25 00:03:34 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Vladimír Čunát
37bae3193d
monotone: fix
2013-02-24 00:31:20 +01:00
Peter Simons
eb5ebb6063
network-protocol-xmpp: fix spelling of the attribute name
2013-02-22 16:14:27 +01:00
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +01:00
Peter Simons
9e68734d61
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-18 11:54:56 +01:00
Peter Simons
b076ab94d6
git-annex: update to version 3.20130216
2013-02-18 11:20:46 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Vladimír Čunát
684f215b4f
fix the problem of missing expat in a few packages
2013-02-11 18:34:40 +01:00
Peter Simons
2191cbb0a1
haskell-darcs: update to version 2.8.4
2013-02-09 18:24:50 +01:00
Lluís Batlle i Rossell
7bfd3fd5c8
git: adding an option not to build the manual
...
asciidoc+xsltproc take hours to run
2013-01-29 20:17:34 +01:00
Lluís Batlle i Rossell
8a9ba8c382
git: adding an option not to build the manual
...
asciidoc+xsltproc take hours to run
2013-01-28 21:24:52 +01:00
Eelco Dolstra
b0cb17257b
rcs: Update to 5.8.1 and fix build
...
http://hydra.nixos.org/build/3895835
2013-01-28 17:19:02 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
4c9cfd87aa
bazaar: Update to 2.5.1
2013-01-15 18:53:12 +01:00
Eelco Dolstra
58e9406f4b
subversion: Update to 1.7.8
2013-01-14 14:38:23 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Peter Simons
490085a811
git-annex: update to version 3.20130107
2013-01-09 16:54:31 +01:00
Peter Simons
9e9cd7b529
Merge branch 'master' into stdenv-updates.
2013-01-04 21:00:53 +01:00
Peter Simons
70b6b15215
git-annex: update to version 3.20130102
2013-01-04 19:24:09 +01:00
Peter Simons
cb329d1cd2
git: update to version 1.8.1
2013-01-04 19:24:04 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Peter Simons
918b26a59e
git-annex: update to version 3.20121211
2012-12-15 11:44:13 +01:00
aszlig
f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
...
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.
I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
cillianderoiste
5b0cd954f1
Merge pull request #206 from chaoflow/python-merge
...
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
Michael Raskin
56f1c1ec24
Update veracity
2012-12-04 10:12:38 +04:00
Peter Simons
3261d1d4aa
git-annex: update to version 3.20121127
2012-12-03 16:12:04 +01:00
Florian Friesdorf
1adc9b1b1f
python module cleanup, enable a couple of tests, add comments for failing
2012-12-03 06:38:11 +01:00
Florian Friesdorf
5436356733
a package does not need to include setuptools manually
...
this breaks for now
2012-12-03 04:40:38 +01:00
Florian Friesdorf
3438681d80
Merge branch 'channel-nixos' into python-merge
2012-11-29 21:40:33 +01:00
Florian Friesdorf
471a4b583f
Merge branch 'channel-nixos' into python-merge
2012-11-29 15:36:17 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons
8effc542b4
git-annex: update to 3.20121126
2012-11-27 13:46:27 +01:00
Peter Simons
62f8d24e56
git: update to 1.8.0.1
2012-11-27 13:46:12 +01:00
Florian Friesdorf
9208fb1edb
fix mercurial -extra PYTHONPATH +setuptools
...
- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
2012-11-24 23:24:34 +01:00
Eelco Dolstra
2da2e5137f
subversion: Update to 1.7.7
2012-11-22 16:56:03 +01:00
Peter Simons
03abf1abbc
git-annex: switch build to GHC 7.4.2
2012-11-21 17:40:56 +01:00
Peter Simons
9ada368ef8
git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod
2012-11-21 12:30:54 +01:00
Rok Garbas
d999c3f6ec
tig: typo
2012-11-17 02:20:07 +01:00
Rok Garbas
a64b34a43e
tig: update to 1.1
2012-11-17 02:13:25 +01:00
Peter Simons
84c6f6f88e
git-annex: update to version 3.20121112
2012-11-15 12:50:17 +01:00
Michael Raskin
48ad0f7443
Update Fossil to a still present version
2012-11-08 23:15:33 +04:00
Peter Simons
4ab06e5c24
Fix git-annex build.
...
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
Peter Simons
321ee97b4c
haskell-darcs: update to version 2.8.3
2012-11-05 16:25:26 +01:00
Paolo Capriotti
6ac427d391
Update git-annex to 3.20121017
2012-11-05 13:59:08 +00:00
David Guibert
b963624867
update git to 1.8.0
2012-10-24 16:33:42 +02:00
Peter Simons
58f3e47166
git: update to version 1.7.12.4
2012-10-19 10:08:07 +02:00
Peter Simons
c90a15a604
git-annex: update to version 3.20121010
2012-10-15 20:17:33 +02:00
Eelco Dolstra
7dd3236c81
git: Update to 1.7.12.2
2012-10-02 12:34:38 -04:00
Peter Simons
b5416d6ed6
darcs: install bash completion instructions
2012-09-25 15:15:38 +02:00
Peter Simons
625e2e45f7
git: update to version 1.7.12.1
2012-09-24 13:28:31 +02:00
aszlig
9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs.
...
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:35:49 +02:00
aszlig
98b7228c06
darcs-to-git: New package from upstream Git.
...
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.
During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
Peter Simons
ac751dc753
haskell-darcs: update to version 2.8.2
2012-09-10 15:08:21 +02:00
Peter Simons
14da2bf31b
git: update to version 1.7.12
2012-09-06 18:13:45 +02:00
Peter Simons
33bf9644cf
git-annex: update to version 3.20120825
2012-09-06 18:13:44 +02:00
Yury G. Kudryashov
c2ad9f873d
mr-1.13, more verbose install
2012-08-31 12:07:22 +04:00
Antono Vasiljev
61f7853e43
Merge pull request #92 from dmalikov/b125ef36b67f2a0aedabc34eb4dac12e61ae9828
...
gitAndTools: bump tig from 0.16 to 1.0
2012-08-16 06:03:54 -07:00
Michael Raskin
938d86b16b
Veracity: update to version 2.0
...
Still no permission support or commit signing, though.
2012-08-09 11:05:43 +04:00
Dmitry Malikov
b125ef36b6
Bump gitAndTools/tig from 0.16 to 1.0
2012-08-08 00:51:25 +02:00
Eelco Dolstra
f901b6d38d
git: Update to 1.7.11.4
2012-08-06 15:27:28 -04:00
Eelco Dolstra
bd8d7a8d15
Add some packages to the channel
2012-07-31 19:26:35 -04:00
Shea Levy
c3c68b6510
Mercurial: Install hgweb.wsgi as well
2012-07-28 20:25:41 -04:00
Shea Levy
deb09fd9de
Mercurial: Bump
2012-07-27 19:44:01 -04:00
Antono Vasiljev
631a59e449
Added mr - Multiple Repository management tool
2012-07-07 17:12:18 +02:00
David Guibert
3b0d9374a4
git-annex: update to 3.20120629
2012-06-29 21:09:52 +02:00
David Guibert
a97e27fc82
git-annex: update to 3.20120624
2012-06-29 21:09:52 +02:00
Eelco Dolstra
94812c9dd3
git: Fix the "notSupported" scripts for "git send-email" and "git gui"
2012-06-21 15:25:02 -04:00
Eelco Dolstra
9365981409
git: Updated to 1.7.11
2012-06-21 15:23:29 -04:00
Peter Simons
a3224ededc
git-and-tools: fixed build in the presence of QuickCheck 2.5
...
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Peter Simons
2a60c221d1
git-annex: updated to version 3.20120614
...
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
Peter Simons
330ea0887f
git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
...
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons
87d25896c1
git-annex: updated to version 3.20120605
...
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
Eelco Dolstra
104bd01e1d
* Git 1.7.10.4.
...
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Eelco Dolstra
ce10ebebac
* Subversion 1.7.5.
...
svn path=/nixpkgs/trunk/; revision=34348
2012-06-04 15:40:25 +00:00
Peter Simons
ac64ba04bd
git-annex: updated to version 3.20120522
...
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
Eelco Dolstra
5e7f049fc9
* svn2git-kde 1.0.5.
...
svn path=/nixpkgs/trunk/; revision=34169
2012-05-18 15:01:54 +00:00
Peter Simons
201bdca962
Updated Haskell packages.
...
- cryptocipher: updated to version 0.3.2
- Crypto: updated to version 4.2.5
- darcs: updated to version 2.8.1
- hamlet: updated to version 1.0.1.3
- monad-par-extras: updated to version 0.3.2
- persistent-template: updated to version 0.9.0.2
- pool-conduit: updated to version 0.1.0.2
- shakespeare-css: updated to version 1.0.1.2
- shakespeare-i18n: updated to version 1.0.0.2
- shakespeare-js: updated to version 1.0.0.2
- shakespeare-text: updated to version 1.0.0.2
- shakespeare: updated to version 1.0.0.2
- warp: updated to version 1.2.1
- wxcore: updated to version 0.90.0.1
- wxc: updated to version 0.90.0.3
- wx: updated to version 0.90.0.1
- xml-conduit: updated to version 0.7.0.3
- xss-sanitize: updated to version 0.3.2
- yesod-auth: updated to version 1.0.2.1
- yesod-core: updated to version 1.0.1.2
- yesod-default: updated to version 1.0.1.1
- yesod-form: updated to version 1.0.0.4
- yesod-json: updated to version 1.0.0.1
- yesod-persistent: updated to version 1.0.0.1
- yesod-routes: updated to version 1.0.1.2
- yesod-static: updated to version 1.0.0.2
- yesod: updated to version 1.0.1.6
svn path=/nixpkgs/trunk/; revision=34102
2012-05-15 11:50:48 +00:00
Eelco Dolstra
7c1612d6f2
* svn2git -> svn2git-kde to distinguish it from the other svn2git.
...
svn path=/nixpkgs/trunk/; revision=34071
2012-05-12 19:45:55 +00:00
Peter Simons
e0bd67afd7
git-annex: updated to version 3.20120430
...
svn path=/nixpkgs/trunk/; revision=33970
2012-05-02 09:25:28 +00:00
Peter Simons
f1135ba545
Updated Haskell packages.
...
- alternative-io: updated to version 0.0.1
- blaze-markup: added version 0.5.1.0
- crypto-conduit: updated to version 0.3.2
- cryptohash: updated to version 0.7.5
- darcs: updated to version 2.8.0
- filestore: updated to version 0.4.2
- Graphalyze: cosmetic change
- hamlet: updated to version 1.0.1.1
- happstack-hamlet: updated to version 7.0.1
- happstack-server: updated to version 7.0.1
- HFuse: updated to version 0.2.4.1
- Hipmunk: updated to version 5.2.0.8
- language-javascript: updated to version 0.5.2
- libmpd: updated to version 0.8.0
- lifted-base: updated to version 0.1.0.4
- monad-control: updated to version 0.3.1.2
- persistent: updated to version 0.9.0.3
- regex-compat: use latest version when building with GHC 7.4.1
- skein: updated to version 0.1.0.7
- snap-core: updated to version 0.8.1
- snap-server: updated to version 0.8.1.1
- tls: updated to version 0.9.5
- vty: updated to version 4.7.0.12
- wai-app-static: updated to version 1.2.0.2
- yesod-core: updated to version 1.0.1.1
svn path=/nixpkgs/trunk/; revision=33889
2012-04-23 09:34:01 +00:00
Peter Simons
4fc0e49bdd
git-annex: updated to version 3.20120418
...
svn path=/nixpkgs/trunk/; revision=33856
2012-04-20 11:35:20 +00:00
Nicolas Pierron
7a4cf21350
Add git-bz nix expression.
...
svn path=/nixpkgs/trunk/; revision=33801
2012-04-15 23:48:16 +00:00
Nicolas Pierron
7b7dd238fc
Add dulwich (git filesystem in python).
...
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)
svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Nicolas Pierron
811b035171
Mercurial: Support ssl and curses python packages for fast-export and crecord.
...
svn path=/nixpkgs/trunk/; revision=33799
2012-04-15 23:48:07 +00:00
Michael Raskin
351bcc3b70
Fix tailor URL
...
svn path=/nixpkgs/trunk/; revision=33767
2012-04-12 20:54:39 +00:00
Peter Simons
4292793d40
git-annex: updated to version 3.20120406
...
svn path=/nixpkgs/trunk/; revision=33669
2012-04-08 10:48:14 +00:00
Peter Simons
799722afde
git-annex: updated to version 3.20120405
...
svn path=/nixpkgs/trunk/; revision=33638
2012-04-05 23:11:00 +00:00
Rob Vermaas
a1d87e58c1
re-add overwritten svn2git (used/developed by kde people)
...
svn path=/nixpkgs/trunk/; revision=33567
2012-04-04 15:30:29 +00:00
Eelco Dolstra
4ae899f4bf
* Mercurial updated to 2.1.2.
...
svn path=/nixpkgs/trunk/; revision=33563
2012-04-04 14:06:04 +00:00
Eelco Dolstra
ebae9a9fd7
* Git 1.7.9.5.
...
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +00:00
Peter Simons
880dcc2c64
Removed myself as a maintainer from Haskell packages that I don't personally use.
...
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.
svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Eelco Dolstra
512357f875
* Remove a wildly outdated Git version that shouldn't have been in
...
Nixpkgs in the first place.
svn path=/nixpkgs/trunk/; revision=33272
2012-03-19 18:24:53 +00:00
Peter Simons
46f9f71439
git: updated to version 1.7.9.4
...
svn path=/nixpkgs/trunk/; revision=33145
2012-03-16 09:47:34 +00:00
Peter Simons
6ff954a5e8
git-annex: updated to version 3.20120315
...
svn path=/nixpkgs/trunk/; revision=33116
2012-03-15 18:07:49 +00:00
Peter Simons
f5219b23a4
git-annex: updated to version 3.20120309
...
The test suite failure introduced recently has been fixed.
svn path=/nixpkgs/trunk/; revision=33014
2012-03-12 14:06:11 +00:00
Eelco Dolstra
613dd942c7
* Subversion updated to 1.7.4.
...
svn path=/nixpkgs/trunk/; revision=33013
2012-03-12 13:40:40 +00:00
Eelco Dolstra
3c56e571af
* Final sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons
88d14c0e29
git-annex: updated to version 3.20120230
...
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.
svn path=/nixpkgs/trunk/; revision=32819
2012-03-06 11:24:20 +00:00
Lluís Batlle i Rossell
e1c8ab095c
Removing a duplicated line so the hydra stdenv evaluation can go.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32576
2012-02-26 16:04:57 +00:00
Shea Levy
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Peter Simons
0660134750
git: updated to version 1.7.9.2
...
svn path=/nixpkgs/trunk/; revision=32528
2012-02-23 22:31:09 +00:00
Yury G. Kudryashov
38e3d7bc86
svn merge ^/nixpkgs/trunk
...
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?
svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
c6f0449124
Let hydra build kdesvn and krusader.
...
Also fix kdesvn build with qt-4.8.
svn path=/nixpkgs/trunk/; revision=32473
2012-02-22 14:51:15 +00:00
Eelco Dolstra
f71dd91a43
* Apply r32435 from the trunk (always build Python with SSL support).
...
Remove .ssl references from some packages missed in that commit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
e64443baf1
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Yury G. Kudryashov
578847f8b3
Let hydra build kdesvn
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32455
2012-02-21 14:04:51 +00:00
Eelco Dolstra
45fed14272
* Revert r32435. We'll be doing a stdenv merge in a few days, so
...
let's put it in there rather than having the Nth near-complete
rebuild of the trunk in a few days.
svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Peter Simons
95cbf4ed55
Modified the Python 2.7 expression so that the interpreter has unconditional
...
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.
svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Yury G. Kudryashov
e5027e5b36
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
cb28766341
Re-generated Haskell package descriptions with the latest version of cabal2nix.
...
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Eelco Dolstra
cdd8d2b163
* Subversion updated to 1.7.3.
...
svn path=/nixpkgs/trunk/; revision=32305
2012-02-15 16:23:40 +00:00
Peter Simons
ac69747aa8
Regenerated all Haskell packages with the latest version of cabal2nix.
...
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
e4ee3e2c9b
* svn2git updated to 2.2.0.
...
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
Yury G. Kudryashov
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons
6e4f0b6365
git-annex: updated to version 3.20120123
...
svn path=/nixpkgs/trunk/; revision=31836
2012-01-25 16:07:52 +00:00
Peter Simons
680787f13e
mercurial: updated to version 2.0.2
...
svn path=/nixpkgs/trunk/; revision=31775
2012-01-21 19:08:48 +00:00
Peter Simons
f8eee42a66
git-annex: updated to version 3.20120116
...
svn path=/nixpkgs/trunk/; revision=31757
2012-01-21 14:32:42 +00:00
Eelco Dolstra
d4d7931a62
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Peter Simons
01bea39bad
gource: cosmetic, no functional change
...
svn path=/nixpkgs/trunk/; revision=31589
2012-01-16 11:33:57 +00:00
Peter Simons
7ccde05271
git-annex: cosmetic change for the meta.license attribute
...
svn path=/nixpkgs/trunk/; revision=31572
2012-01-15 11:44:08 +00:00
Peter Simons
3c8a798411
gource: added meta information and moved the package into version-management category
...
svn path=/nixpkgs/trunk/; revision=31570
2012-01-15 11:44:02 +00:00
Peter Simons
97e815a9af
git-annex: bumped to version 3.20120113
...
svn path=/nixpkgs/trunk/; revision=31569
2012-01-15 11:43:57 +00:00
Peter Simons
9ddd085129
subversion: instantiate SASL only when it's actually enabled
...
svn path=/nixpkgs/trunk/; revision=31532
2012-01-14 12:05:18 +00:00
Peter Simons
ef343ed3ab
subversion: add sasl support
...
svn path=/nixpkgs/trunk/; revision=31530
2012-01-14 11:41:06 +00:00
Peter Simons
bae5b8dabb
git-annex: updated to version 3.20120106
...
svn path=/nixpkgs/trunk/; revision=31509
2012-01-13 09:27:08 +00:00
Peter Simons
38f6d36e91
git-annex: updated to version 3.20111231
...
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Michael Raskin
64290dbd96
Try updating veracity
...
svn path=/nixpkgs/trunk/; revision=30990
2011-12-20 21:37:23 +00:00
Marco Maggesi
f6689d01a3
Update fossil to version 1.21
...
svn path=/nixpkgs/trunk/; revision=30875
2011-12-13 22:19:06 +00:00
Peter Simons
1817b55a7f
git: updated to version 1.7.8
...
svn path=/nixpkgs/trunk/; revision=30805
2011-12-09 11:44:42 +00:00
Eelco Dolstra
acd7288678
* Proper version number.
...
svn path=/nixpkgs/trunk/; revision=30784
2011-12-06 21:16:20 +00:00
Eelco Dolstra
3aedd3770f
* Get svn2git to work.
...
svn path=/nixpkgs/trunk/; revision=30778
2011-12-06 15:41:16 +00:00
Eelco Dolstra
b1e6ccae4e
* Subversion 1.7.2.
...
svn path=/nixpkgs/trunk/; revision=30776
2011-12-06 14:56:47 +00:00
Peter Simons
3357437461
git-annex: updated to version 3.20111203
...
svn path=/nixpkgs/trunk/; revision=30762
2011-12-05 16:23:05 +00:00
Peter Simons
42757e653a
Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version.
...
svn path=/nixpkgs/trunk/; revision=30761
2011-12-05 16:23:02 +00:00
Peter Simons
1193eabfa1
git-annex: updated to version 3.20111122
...
svn path=/nixpkgs/trunk/; revision=30538
2011-11-23 09:21:20 +00:00
Peter Simons
1c0ae7e8ed
git: updated to version 1.7.7.3
...
svn path=/nixpkgs/trunk/; revision=30476
2011-11-18 18:37:20 +00:00
Peter Simons
692efb76e4
mercurial: updated to version 2.0
...
svn path=/nixpkgs/trunk/; revision=30443
2011-11-16 14:37:11 +00:00
Peter Simons
9dcb5da174
git-annex: updated to version 3.20111107
...
svn path=/nixpkgs/trunk/; revision=30337
2011-11-08 16:59:30 +00:00
Peter Simons
a0cf7c24e1
git-annex: updated to version 3.20111025
...
svn path=/nixpkgs/trunk/; revision=30241
2011-11-05 00:03:44 +00:00
Eelco Dolstra
eeb4d231b3
* Subversion updated to 1.7.1.
...
svn path=/nixpkgs/trunk/; revision=30034
2011-10-26 15:32:56 +00:00
Lluís Batlle i Rossell
22ff0a19c3
Updating the fossil tarball hash, due to an update upstream:
...
http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06730.html
I also add readline (it may provide a nicer prompt on fossil sqlite)
and sqlite (required for some tests).
The old tarballs were broken in a way that the tests requiring sqlite were not run.
svn path=/nixpkgs/trunk/; revision=29974
2011-10-22 20:41:37 +00:00
Nicolas Pierron
87bf637319
Mercurial: Give access to ssl and curses python packages for
...
fast-export and crecord.
svn path=/nixpkgs/trunk/; revision=29972
2011-10-22 15:41:20 +00:00
Peter Simons
9016346fbd
git: updated to version 1.7.7
...
svn path=/nixpkgs/trunk/; revision=29965
2011-10-21 16:50:36 +00:00
Peter Simons
e98852cefd
git-annex: updated to version 3.20111011
...
svn path=/nixpkgs/trunk/; revision=29964
2011-10-21 16:34:38 +00:00
Marco Maggesi
11d18ba4fd
Update fossil to version 1.20
...
svn path=/nixpkgs/trunk/; revision=29954
2011-10-21 14:12:46 +00:00
Ludovic Courtès
14e951e6d5
GNU RCS 5.8.
...
svn path=/nixpkgs/trunk/; revision=29795
2011-10-12 20:43:44 +00:00
Lluís Batlle i Rossell
2c6200c025
Updating veracity
...
svn path=/nixpkgs/trunk/; revision=29772
2011-10-11 19:30:11 +00:00
Peter Simons
19769280f6
git-subtree: updated to version 0.4-2-g2793ee6
...
svn path=/nixpkgs/trunk/; revision=29333
2011-09-18 14:56:46 +00:00
Peter Simons
7b8f4ec540
git-annex: updated to version 3.20110915
...
svn path=/nixpkgs/trunk/; revision=29331
2011-09-18 08:28:29 +00:00
Peter Simons
8d0794f5e2
stgit: disable the test suite for the time being
...
There are failures, but it's unclear whether those are caused by assumptions
about the build environment or whether they signify real problems in the
software.
svn path=/nixpkgs/trunk/; revision=29295
2011-09-15 12:47:49 +00:00
Peter Simons
cd3e9099e9
stgit: updated to version 0.15
...
svn path=/nixpkgs/trunk/; revision=29294
2011-09-15 11:04:00 +00:00
Michael Raskin
90d89bfe68
Fixing some of Veracity tests
...
svn path=/nixpkgs/trunk/; revision=29187
2011-09-11 16:46:17 +00:00
Yury G. Kudryashov
fcec1593b8
git doesn't need subversion server
...
svn path=/nixpkgs/trunk/; revision=29102
2011-09-07 22:52:52 +00:00
Shea Levy
eba95e013b
viewmtn: Update to new url
...
svn path=/nixpkgs/trunk/; revision=29063
2011-09-06 17:09:41 +00:00
Lluís Batlle i Rossell
05f95c69c5
Updating meld
...
svn path=/nixpkgs/trunk/; revision=29016
2011-09-05 08:31:49 +00:00
Peter Simons
2c0eddaeaa
git-annex: updated to version 3.20110902
...
svn path=/nixpkgs/trunk/; revision=28996
2011-09-03 13:17:36 +00:00
Michael Raskin
238625aa76
Attempting to fix tests a bit..
...
svn path=/nixpkgs/trunk/; revision=28993
2011-09-03 10:21:55 +00:00
Lluís Batlle i Rossell
833eea6157
Updating fossil to 1.19. I can't still add readline as build input, because its
...
new configuration code fails to cope with nix gcc detecting readline.
svn path=/nixpkgs/trunk/; revision=28968
2011-09-01 21:03:18 +00:00
Peter Simons
c0fb177ce9
git-annex: pass an older version of QuickCheck to fix build failure of the test suite
...
svn path=/nixpkgs/trunk/; revision=28829
2011-08-26 10:51:47 +00:00
Peter Simons
1972e6f6dc
git-annex: updated to version 3.20110819
...
svn path=/nixpkgs/trunk/; revision=28771
2011-08-23 08:52:06 +00:00
Peter Simons
1c79ecc5af
git2cl: added meta data for the package and updated the build to take
...
advantage of stdenv features such as automatic updating of the shebang
path to perl, etc.
svn path=/nixpkgs/trunk/; revision=28768
2011-08-23 08:44:59 +00:00
David Guibert
19b376cc41
git-subtree: 0.3 -> 0.4
...
svn path=/nixpkgs/trunk/; revision=28760
2011-08-22 20:26:15 +00:00
Peter Simons
3e10ee5c92
Updated Haskell expressions with the latest version of cabal2nix.
...
* haskell-dataenc: updated to version 0.14.0.2
* haskell-fclabels: updated to version 1.0.1
svn path=/nixpkgs/trunk/; revision=28574
2011-08-14 22:52:05 +00:00
Peter Simons
4fad68a33e
Renamed darcs-2.nix to default.nix for sake of consistency. No functional change.
...
svn path=/nixpkgs/trunk/; revision=28503
2011-08-12 08:31:19 +00:00
Peter Simons
468c5dbc5c
The 'random' library is no longer a core library in GHC 7.2.1. For older
...
versions of the compiler, haskell-packages.nix provides a null attribute.
svn path=/nixpkgs/trunk/; revision=28500
2011-08-12 00:18:56 +00:00
Peter Simons
b1ef3e6e36
Last batch of Haskell expression updates.
...
* haskell-mkcabal: updated to version 1.0.0
* haskell-ghc-syb-utils: updated to version 0.2.1.0
* haskell-darcs: updated to version 2.5.2
svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +00:00
Peter Simons
c13f967ed5
Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
...
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Karn Kallio
a233ebf891
Switch to forward compatibility of kde45 on kde_baseapps.
...
svn path=/nixpkgs/trunk/; revision=28217
2011-08-07 01:45:26 +00:00
Michael Raskin
e3a809a9bb
Fix Veracity build
...
svn path=/nixpkgs/trunk/; revision=28157
2011-08-04 16:01:50 +00:00
Michael Raskin
58c022ab56
Update Veracity
...
svn path=/nixpkgs/trunk/; revision=28127
2011-08-02 18:58:59 +00:00
Lluís Batlle i Rossell
f5609042c0
I broke fossil in a commit where I did not mean even to touch it.
...
svn path=/nixpkgs/trunk/; revision=27880
2011-07-21 14:58:13 +00:00
Lluís Batlle i Rossell
57f59594db
Updating the linux 2.6.39 to 2.6.39.3
...
svn path=/nixpkgs/trunk/; revision=27878
2011-07-21 13:56:25 +00:00
Lluís Batlle i Rossell
bda0f3bfd0
Updating fossil.
...
svn path=/nixpkgs/trunk/; revision=27865
2011-07-21 06:58:14 +00:00
Peter Simons
efe5ab73b1
git: fixed impure path to perl in git-am and git-submodule
...
svn path=/nixpkgs/trunk/; revision=27859
2011-07-20 22:56:31 +00:00
Peter Simons
ff91dbdb35
git-annex: the latest version depends on the monad-control package
...
svn path=/nixpkgs/trunk/; revision=27839
2011-07-20 12:13:07 +00:00
Peter Simons
f61f66f46d
git-annex: updated to version 3.20110719
...
svn path=/nixpkgs/trunk/; revision=27836
2011-07-20 10:16:35 +00:00
Peter Simons
ffe01e880d
git-annex: build only on platforms that support Haskell
...
svn path=/nixpkgs/trunk/; revision=27792
2011-07-14 21:54:53 +00:00
Peter Simons
68957344fa
git-annex: updated to version 3.20110707
...
svn path=/nixpkgs/trunk/; revision=27775
2011-07-14 12:22:26 +00:00
Peter Simons
4e5cc9b965
git: removed 'lowPri' wrapper around gitFull
...
Packages that need git as build-time or run-time dependency typically refer to
the attribute 'git', which is the expression with the least possible set of
features.
Users, however, who run "nix-env -i git", don't want that version, because it
lacks support for SVN, for sending e-mail, and it doesn't include the GUI. In
other words, users want gitFull by default, which is what this change
accomplishes.
svn path=/nixpkgs/trunk/; revision=27748
2011-07-13 10:46:17 +00:00
Peter Simons
9edc2574dd
git-annex: the build system uses 'which' to determine whether ikiwiki is installed
...
svn path=/nixpkgs/trunk/; revision=27747
2011-07-13 10:41:10 +00:00
Peter Simons
9485e2392b
monotone: strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=27742
2011-07-13 09:13:28 +00:00
Peter Simons
b1b274558a
monotone: don't build this package on Cygwin
...
The expression can't build on Cygwin because it wants to know the version of
Perl that is being used. On Cygwin, however, we don't know that because we're
using sysPerl.
svn path=/nixpkgs/trunk/; revision=27741
2011-07-13 09:13:22 +00:00
Peter Simons
e4353b1f65
git: install contrib code included in the distribution
...
TODO: byte-compile emacs modules
svn path=/nixpkgs/trunk/; revision=27665
2011-07-07 23:48:38 +00:00
Peter Simons
2fee0ecef9
git: updated to version 1.7.6
...
svn path=/nixpkgs/trunk/; revision=27664
2011-07-07 23:48:34 +00:00
Peter Simons
21373bc49b
git-annex: enable the documentation build
...
svn path=/nixpkgs/trunk/; revision=27663
2011-07-07 23:48:30 +00:00
Peter Simons
39f2346b1b
git-annex: cosmetic changes in the meta section
...
svn path=/nixpkgs/trunk/; revision=27662
2011-07-07 23:48:26 +00:00
Peter Simons
0ec6325b87
git-annex: updated to version 3.20110705
...
svn path=/nixpkgs/trunk/; revision=27661
2011-07-07 23:48:22 +00:00
Karn Kallio
cd830b7e8e
Update mercurial to version 1.9
...
svn path=/nixpkgs/trunk/; revision=27581
2011-07-02 19:35:03 +00:00
Eelco Dolstra
7a8598e716
* Subversion 1.6.17.
...
svn path=/nixpkgs/trunk/; revision=27486
2011-06-16 15:13:35 +00:00
Lluís Batlle i Rossell
5a2745ae1c
Updating fossil.
...
svn path=/nixpkgs/trunk/; revision=27293
2011-05-23 08:04:59 +00:00
Michael Raskin
178d94606f
Remove hard-coded path to uname
...
svn path=/nixpkgs/trunk/; revision=27287
2011-05-21 05:07:53 +00:00