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
Evgeny Egorochkin
bfd5bc0ba7
Merge pull request #645 from errge/master
...
Update xpra to 0.9.5
2013-06-18 17:16:30 -07:00
Lluís Batlle i Rossell
83dee22f4a
Fixing a crash bug in dropbear.
2013-06-18 23:35:53 +02:00
Lluís Batlle i Rossell
ae98b61850
dropbear: update to 2013.58, and build dynamically
...
I had to do a trick with GNU make, to allow it to find libs.
2013-06-18 23:35:53 +02:00
Vladimír Čunát
2058d95eb4
non-Linux platforms: extend to some important pkgs
2013-06-18 22:03:35 +02:00
Gergely Risko
79c2db389c
Update xpra to 0.9.5
2013-06-18 15:36:42 +02:00
Sander van der Burg
37b25a712e
Fix graphviz building on darwin
2013-06-18 12:24:40 +02:00
Eelco Dolstra
5bc8275075
nix: Update to 1.5.3
2013-06-18 00:56:00 +02:00
Vladimír Čunát
6bcf790d05
Merge branch 'master' into x-updates
2013-06-17 22:08:16 +02:00
Peter Simons
d5dac74d94
gnuplot: update to version 4.6.3
2013-06-17 15:25:03 +02:00
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14:45 +02:00
Vladimír Čunát
c72ed04892
Merge 'master' and 'stdenv-fixes' into x-updates
...
Final stabilization phase before merging into master.
Conflicts (glibc-2.13):
pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Rob Vermaas
ccda14879e
Add unionfs-fuse and ntfs-3g to the channel
2013-06-15 20:47:47 +02:00
Michael Raskin
81b7f5fe63
Merge remote-tracking branch 'upstream/master' into x-updates
2013-06-15 17:15:32 +04:00
Peter Simons
b7cba63031
Add moderntimeline extension for moderncv.
2013-06-15 13:00:02 +02:00
Peter Simons
9df1684126
moderncv: update to version 1.5.1
2013-06-15 13:00:02 +02:00
Christophe Raffalli
ec41f1928a
fix pgf hash
2013-06-15 07:07:26 +00:00
Christophe Raffalli
f53c60c8bb
upgrading pgf/tikz to 2.10
2013-06-15 06:57:06 +00:00
Eelco Dolstra
a0c5ff6571
nixUnstable: Update to 1.5.3pre3141_1b6ee8f
2013-06-14 13:38:36 +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
Michael Raskin
27bbff463f
Merge pull request #601 from craff/ocaml/upgrade_and_new
...
Ocaml/upgrade and new
2013-06-13 05:41:59 -07:00
Peter Simons
71439b3e96
Merge pull request #610 from lovek323/sup
...
Add sup expression
2013-06-12 23:33:19 -07:00
Jason "Don" O'Conal
b62aa175a2
gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc platforms)
2013-06-13 14:17:27 +10:00
Jason "Don" O'Conal
ee00c7aa4e
Add gpgme build input for sup
2013-06-13 10:45:42 +10:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Peter Simons
a2680cdc48
groff: explicitly disable X11 support in configure to avoid impure builds
...
Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
2013-06-11 12:14:49 +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
Eelco Dolstra
eaf98cf26e
nixUnstable: Update to 1.5.3pre3134_5c06e52
2013-06-11 12:08:37 +02:00
Peter Simons
a3cc980193
groff: explicitly disable X11 support in configure to avoid impure builds
...
Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
2013-06-11 11:55:52 +02:00
Peter Simons
a2328d7b80
Merge pull request #609 from coroa/ppp-ipv6
...
ppp: enable ipv6 support
2013-06-11 02:21:42 -07:00
Jonas Hoersch
b39a6ef532
ppp: enable ipv6 support
...
networkmanager requires pppd to have ipv6 support for managing mobile
connections since version 0.9.5.95, ref. to commit 7575f4d.
2013-06-11 01:07:06 +02:00
Michael Raskin
8271de6727
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Benjamin Cahill
923b3d032d
rmlint: Remove unneeded dependency
2013-06-09 14:44:06 -05:00
Benjamin Cahill
6e6181bc89
Add rmlint, a tool for removing duplicate files
2013-06-09 13:34:50 -05:00
Evgeny Egorochkin
dc54358ce9
Change package versions to conform to nixpkgs conventions.
2013-06-09 05:41:44 +03: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
Christophe Raffalli
e4c2a5ddc7
Upgraded openconnect to 5.01.
...
Added the new option --no-xmlpost to avoid a cisco server bug
2013-06-08 12:38:12 +02:00
Christophe Raffalli
270d929089
New ocaml packages:
...
- ocaml-cairo
- camlimages
- dypgen
- patoline
2013-06-07 21:40:38 +02:00
Domen Kozar
74bde3bedd
groff: let hydra build it
2013-06-07 09:35:20 +02: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
Evgeny Egorochkin
61baf49624
Merge pull request #595 from grrwlf/fix-nmap
...
nmap: fix GUI paths
2013-06-06 15:28:34 -07:00
Evgeny Egorochkin
a83d544f4e
Merge pull request #597 from bjornfor/solfege
...
Add Solfege, an ear training program
2013-06-06 14:21:32 -07:00
Bjørn Forsman
aaac7100c8
txt2man: new package
...
txt2man converts flat ASCII text to man page format. (Solfege, which is
added in the next commit, needs this.)
2013-06-06 19:15:18 +02:00
Christophe Raffalli
8be8701db7
Added openconnect
2013-06-06 10:48:58 +02:00
Sergey Mironov
ea82f6d0e9
nmap: help zenmap to find it's templates in nix-store
...
Zenamp wrapper confuses python so it thinks that zenmap is launched as a script
and not as an executable. This leads to incorrect /share path and missing
templates. ./zenmap.patch cures that (a bit hacky as usual).
2013-06-06 12:09:19 +04: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
Ricardo M. Correia
76b18e4204
gmvault: Fix start script
2013-06-05 02:27:18 +00:00
Ricardo M. Correia
6eb8048c8f
gmvault: New package
...
Gmvault Gmail Backup - Backup and restore your gmail account at will.
2013-06-05 02:27:18 +00:00
Vladimír Čunát
22967c71f8
network-manager: update all to 0.9.8.0
...
This should fix compilation with newer glib versions.
2013-06-04 16:36:21 +02:00
Domen Kozar
96b193a7b1
typos
2013-06-03 00:31:43 +02:00