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
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
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
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