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