William A. Kennington III
bdb842d5eb
Move all db4 packages to the default db5
2014-02-15 12:03:02 +01:00
Linquize
68b3fd33a7
git: Update to 1.9.0
2014-02-15 11:19:38 +01:00
Lluís Batlle i Rossell
8f64e74414
Updating fossil to 1.28.
2014-02-11 12:32:48 +01:00
Peter Simons
30e1186a0c
haskell-git-annex: update to version 5.20140210
2014-02-10 21:45:43 +01:00
Linquize
5b41db9765
git: update to 1.8.5.4 ( close #1714 )
2014-02-09 10:06:22 +01:00
Jan Malakhovski
f5de6b8fc8
updates: mr, vcsh and transmission-remote-gtk
...
- mr: copy some more stuff to output
- add vcsh package
- transmission-remote-gtk: 1.0.1 -> 1.1.1
2014-02-06 23:37:53 +00:00
Georges Dubus
b9fe0b8fb1
bazaar: updated to 2.6.0 and fixed ssl bug
...
Fixes #1216
2014-02-05 11:36:48 +01:00
Nixpkgs Monitor
d2451cbce6
mercurialFull: update from 2.8.2 to 2.9
2014-02-04 10:35:20 +01:00
Ricardo M. Correia
61d37c62c3
hub: Update from 1.10.6 -> 1.11.1
2014-02-02 13:42:07 +00:00
Peter Simons
1124a4ab08
haskell-git-annex: update to version 5.20140129
2014-01-30 08:32:41 +01:00
Peter Simons
63ec2bec8f
haskell-git-annex: update to version 5.20140127
2014-01-28 14:59:46 +01:00
Eelco Dolstra
2e70c14061
rcs: Update to 5.9.2
2014-01-27 17:58:26 +01:00
Peter Simons
e2a858379d
haskell-git-annex: update to version 5.20140116
2014-01-26 00:02:33 +01:00
Peter Simons
ff8cffed86
subversion: fix evaluation errors on FreeBSD
2014-01-22 12:44:49 +01:00
Vladimír Čunát
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Bjørn Forsman
1e3289efb4
cgit: fix snapshot feature by using full paths to gzip/bzip2/xz
2014-01-19 22:59:51 +01:00
Bjørn Forsman
3a917b5c2d
cgit: enable lua support
...
Filters can now take advantage of the built-in lua interpreter (much
faster than fork and exec).
2014-01-19 22:46:53 +01:00
Bjørn Forsman
8c25a73def
cgit: update from 0.9.2 to 0.10
2014-01-19 22:12:12 +01:00
Bjørn Forsman
2b74a47006
gource: fix build
...
gource currently fails in the configure phase:
configure: error: Could not link against -lGLU !
This is a very misleading error, it seems to happen because configure
doesn't find boost libraries and ends up with uninitialized variable(s).
That in turn cause it to fail later with this unrelated error.
Fix by using boost libraries, not only the headers. gource also grew a
dependency on GLM, so add that to buildInputs.
2014-01-18 19:05:33 +01:00
Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
3988e0ca51
gource: mark as broken
...
The configure process finds libGLU just fine, but then aborts saying:
configure: error: Could not link against -lGLU !
2014-01-16 10:25:04 +01:00
Peter Simons
222b91fedf
gource: update to version 0.40
2014-01-13 17:22:07 +01:00
Nixpkgs Monitor
dc52e6e7f8
mercurial: update from 2.8.1 to 2.8.2
2014-01-13 16:15:57 +01:00
Vladimír Čunát
a2c316288c
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Peter Simons
18626481ca
haskell-git-annex: update to version 5.20140108
2014-01-11 12:03:41 +01:00
Peter Simons
6750feec2c
haskell-git-annex: update to version 5.20140107
2014-01-09 00:45:16 +01:00
Rickard Nilsson
16ce061e11
tailor: Add extra source URL
2014-01-08 15:29:38 +01:00
Peter Simons
c70c8a7158
git-annex: try to fix test suite
2014-01-06 12:09:58 +01:00
Peter Simons
75090c7c86
haskell-git-annex: update to version 5.20131230
2014-01-06 12:09:55 +01:00
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
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