mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 10:00:56 +00:00
Code Issues Wiki Activity
29252 commits 270 branches 125 tags 5.4 GiB
Commit graph

3248 commits

Author SHA1 Message Date
Domen Kožar 332dd4854f Move namePrefix="" python packages out of python-packges.nix 
It doesn't make sense to build tools/applications with three different
python interpreter versions, so move them out of python modules list.

Also reverts 53ffc6e0ef.
 2013-07-31 13:34:11 +02:00
Bjørn Forsman 7e0bd8d360 offlineimap: remove python prefix from package name 
OfflineIMAP is primarily a program/tool, not a python module (although
it installs a python module too, for those who want to poke at its
internals).

Now we can install it with "nix-env -i offlineimap" instead of
"nix-env -i python2.7-offlineimap".
 2013-07-30 21:30:34 +02:00
Michael Raskin 0a8b83fdd0 Fix unneeded inherit 2013-07-30 16:02:39 +04:00
Michael Raskin 9acc0d4bc9 Adding x-cape keyboard mapping helper 2013-07-30 15:51:01 +04:00
Sander van der Burg 44731b5251 Bump disnix,disnixos and dysnomia to latest development versions 2013-07-30 12:03:03 +02:00
Domen Kozar 0be7ef35bb gmvault: use logbook 0.4.2 2013-07-29 21:16:35 +02:00
Bjørn Forsman 386bef322d iftop: improve meta attributes 
- The description attribute is very long, so rename it to
  longDescription and add a short text in the description attribute.
- Use licenses.gpl2Plus instead of free form text "GPLv2+".
- Add platforms attribute so that hydra will build the package.
 2013-07-28 14:04:44 +02:00
Jason \"Don\" O'Conal b4105cfaff php53: fix build on darwin (close #748) 
* add empty unix.h header
* build with kerberos
* ensure the binary has no extension
 2013-07-28 09:41:58 +02:00
Sergey Mironov 5b4e0207ba wmctrl: add command-line window-manipulation tool (close #781) 2013-07-27 20:12:55 +02:00
Sergey Mironov 1fa3afeb91 wmctrl: command-line window-manipulation tool 2013-07-27 20:11:29 +02:00
Peter Simons 30e9f13d81 smartmontools: update to version 6.2 2013-07-27 11:05:59 +02:00
Domen Kozar 0f98ddf8fd Revert "networkmanager: we dont need networkmanager group anymore, just use at_console policy" 
This reverts commit 52fe694360.
 2013-07-26 23:09:50 +02:00
aszlig 311c96ac0f
hetzner-nixops-installer: Remove package. 
This package now is in NixOps directly, so we don't need it here
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-26 06:18:04 +02:00
Russell O'Connor 0990730038 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-07-25 06:50:31 -04:00
Russell O'Connor 4e723ca537 Update tarsnap to version 1.0.35 2013-07-25 06:49:25 -04:00
Bjørn Forsman 7b4b03616c bmon: new package 
bmon is a ncurses network bandwidth monitor.

Homepage: http://www.carisma.slowglass.com/~tgr/bmon/
 2013-07-25 12:43:40 +02:00
Zef Hemel aa0ecfa5ac Added httrack, website copier tool 2013-07-25 10:21:22 +02:00
Bjørn Forsman 63f9aed9eb minicom: 2.4 -> 2.6.2 
This also fixes the annoying issue that minicom doesn't work out of the
box:

  $ minicom
  minicom: there is no global configuration file /etc/minirc.dfl
  Ask your sysadmin to create one (with minicom -s).

  $ sudo minicom -s
  minicom: there is no global configuration file /etc/minirc.dfl
  Ask your sysadmin to create one (with minicom -s).

minicom 2.4 basically refuses to enter setup unless /etc/minirc.dfl
already exists. sudo touch /etc/minirc.dfl is enough to fix that though,
but with this commit "sudo minicom -s" will work out of the box.
 2013-07-24 14:40:40 +02:00
Rob Vermaas 850f20567e Fix apg 2013-07-24 12:27:58 +02:00
Rok Garbas 626c4d5f5b venus: new package 2013-07-23 22:41:18 +02:00
Domen Kozar 52fe694360 networkmanager: we dont need networkmanager group anymore, just use at_console policy 2013-07-23 18:51:20 +02:00
Domen Kozar 949c4fe758 networkmanagerapplet: fix the build 2013-07-23 18:23:13 +02:00
Vladimír Čunát fb37586d77 Merge pull request #721 from vcunat/p/hw-utils 
pci and usb utils update
 2013-07-23 06:48:08 -07:00
Domen Kozar 11eef4f79f networkmanagerapplet: fix build 2013-07-23 13:18:54 +02:00
Domen Kozar bea0ac29d4 networkmanagerapplet: propagatedBuildInputs -> propagatedUserEnvPkgs 2013-07-23 11:53:12 +02:00
Domen Kozar a143c0bb10 networkmanagerapplet: add GConf libgnome_keyring to propagatedBuildInputs 2013-07-23 11:19:32 +02:00
Lluís Batlle i Rossell 04a9e809d4 Updating go to 1.1.1 2013-07-23 11:19:32 +02:00
Eelco Dolstra 4dd9507b83 netpbm: Fix a truly random build failure 
Since "src" is a fetchsvn directory, the source is copied with "cp
--no-preserve=timestamps" (see commit
6d928ab684).  So some source files might
get a slightly different timestamp.  Here, if lib/standard.ppmdfont
gets a newer timestamp than the generated file lib/standardppmdfont.c,
Make will try to rebuild the latter.  But that fails because the
ppmdcfont program doesn't exist (yet).

Probably stdenv should ensure that every file has the same timestamp.
 2013-07-23 11:17:26 +02:00
Peter Simons bee4c41e13 smartmontools: update drive database to the latest version 2013-07-23 10:40:40 +02:00
Domen Kozar 8ea138d212 add development version of speedtest-cli 2013-07-20 12:48:32 +02:00
Ludovic Courtès 6e97ea6b00 guix: update to 0.3 2013-07-19 23:21:47 +02:00
Domen Kozar b139a69f7c netpbm: set platforms 2013-07-19 20:48:56 +02:00
Domen Kozar aeef361b0d netpbm: add tiff support 2013-07-19 19:42:34 +02:00
Eelco Dolstra 3c35daeebe nixUnstable: Update to 1.6pre3166_15e5ac8 2013-07-19 15:19:38 +02:00
Evgeny Egorochkin 589d6ff51c vfdecrypt: fix source location 2013-07-19 07:30:17 +03:00
Peter Simons 7f9e83f8cc dosfstools: update to version 3.0.21 2013-07-18 21:38:06 +02:00
Peter Simons d898762d8b unetbootin: update to version 585 2013-07-18 11:07:59 +02:00
Russell O'Connor 9fe9527f57 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-07-14 23:43:00 -04:00
Russell O'Connor 8e9f501fd7 Update tarsnap to version 1.0.34. 2013-07-14 23:38:20 -04:00
Lluís Batlle i Rossell 206706503a cromfs: update to 1.5.10.1. 2013-07-14 22:27:51 +02:00
Mathijs Kwik 0fa697405c dmg2img: upgrade to 1.6.4 2013-07-14 08:57:47 +02:00
Evgeny Egorochkin fba8b902da fix packages to use mirror://xorg 2013-07-14 05:39:02 +03: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 b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin 5ae43d2494 Change more packages from direct downloads to mirror://sourceforge 2013-07-14 02:48:32 +03:00
Evgeny Egorochkin aa85b80459 Change package urls to use mirror://sourceforge 2013-07-14 02:35:26 +03:00
Evgeny Egorochkin 4c952c64de eggdrop: fix version to match tarball 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin 9afe9c9c53 uw-imap: fix version to match tarball 2013-07-14 02:08:53 +03:00
Evgeny Egorochkin f61a4118d0 renameutils: fix version to match tarball 2013-07-14 02:08:53 +03:00
Evgeny Egorochkin 8c8ac0fc8b mktorrent: fix version to match tarball 2013-07-14 02:08:50 +03:00
Evgeny Egorochkin 9a3d4fba5e hdf5: fix version to match tarball 2013-07-14 02:08:49 +03:00
Evgeny Egorochkin a42ba6d8fe filegive: change url so that it's friendlyto automated processing. This changes the tarball a 
little(likely metadata) but it still builds.
 2013-07-14 02:08:48 +03:00
Evgeny Egorochkin 83e37cdac8 atool: fix version to match tarball 2013-07-14 02:08:48 +03:00
aszlig b47e2c2ab6
nixpart: New upstream version 0.4.0. 
Changes are:

 - Properly detect GPT disklabels and create proper BIOS boot partitions
   if necessary.
 - Return exit code 100 if reboot is required due to the kernel not
   picking up the new partition table.
 - Don't include BIOS boot partition in GRUB devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-12 18:41:11 +02:00
Bjørn Forsman 1af178559f ethtool: 3.2 -> 3.10 
And add package meta data.
 2013-07-12 16:26:48 +02:00
aszlig f75f7e793b
nixpart: New upstream version 0.3.0. 
This fixes two issues:

 - Don't _always_ print out NixOS configuration, only when explicitly
   requested with -p.
 - Add GRUB boot devices to NixOS configuration output.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-11 16:05:59 +02:00
Jaka Hudoklin 9a8677caeb Add easyrsa 2013-07-10 21:00:56 +02:00
Rob Vermaas 5a58b0e57a Update nixops to version 1.0.1 2013-07-10 17:45:51 +02:00
Domen Kožar 17962c1aa0 Merge pull request #683 from grwlf/wicd-fixes 
wicd: obtain dhclinet's config template from shares correctly
 2013-07-10 01:00:38 -07:00
Rickard Nilsson 92083803e6 nss-pam-ldapd: Upgrade to 0.8.13 2013-07-10 08:49:54 +02:00
aszlig aa35e66257
hetzner-nixops-installer: Build on Hydra. 
This is in order to prepare for fetching the build output from the corresponding
target machine to even further speed up deployment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 11:54:50 +02:00
aszlig 049d2381c5
hetzner-nixops-install: Correct typo in meta attr. 
I think it's called maintainerS :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 11:45:24 +02:00
aszlig 99e4890e9e
hetzner-nixops-installer: Reset helper timestamps. 
This should prevent some annoying messages such as:

tar: usr/bin/nix-build: time stamp 2013-07-09 07:45:19 is 0.159248271 s in the f
uture
tar: usr/bin/nix-channel: time stamp 2013-07-09 07:45:19 is 0.159088763 s in the
future
tar: usr/bin/nix-collect-garbage: time stamp 2013-07-09 07:45:19 is 0.15901664 s
in the future
tar: usr/bin/nix-copy-closure: time stamp 2013-07-09 07:45:19 is 0.158948028 s i
n the future
tar: usr/bin/nix-daemon: time stamp 2013-07-09 07:45:19 is 0.158888042 s in the
future

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 08:27:53 +02:00
aszlig d58a5eb572
Move nixpartHetzner into hetzner-nixops-installer. 
This should keep all Hetzner/NixOps specific stuff in one place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 08:27:53 +02:00
aszlig 2fd13d8fca
Add new hetzner-nixops-installer package. 
This fixes a bunch of issues for the NixOps Hetzner backend, because over there,
it's quite difficult to export the references graph without either duplicaing
lots of code or make a bunch of workarounds.

A detailed description about how it works can be found in the
meta.longDescription attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 08:27:52 +02:00
Domen Kozar d7d873fb95 add extundelete 2013-07-08 21:08:40 +02:00
Domen Kozar 58975755ea add bpython 2013-07-08 20:58:44 +02:00
aszlig 6fcc6816e7
nixpart: Update to new version 0.2.1. 
This is a minor bugfix release and only corrects "type" in fileSystems output to
"fsType".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-08 14:27:44 +02:00
aszlig b2311fbf3a
python-nixpart: Propagate overrides of blivet. 
This allows for easy overriding of blivets udev dependency using only
nixpart.override.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-08 14:27:43 +02:00
aszlig 513de0ff57
python-nixpart: Move into tools/filesystems/. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-08 14:27:42 +02:00
Jason \"Don\" O'Conal 3fe02f7c8b aescrypt: fix build on darwin 
* add libiconvOrEmpty to build inputs
* add '-liconv' to LDFLAGS
 2013-07-07 13:46:08 +02:00
Jason "Don" O'Conal 03f716d05e autojump: fix build on darwin 
* remove install.sh shell check
 2013-07-07 19:21:45 +10:00
Vladimír Čunát 52ed09d210 pciutils: update 
This breaks udev145 due to enabling compression again,
but I rather think we should remove udev145 (not used anywhere).
 2013-07-06 11:54:16 +02:00
Eelco Dolstra 20301af497 testdisk: Add to channel 2013-07-05 17:29:53 +02:00
Michael Raskin b2e912fd8d Update fdm 2013-07-05 18:43:21 +04:00
Vladimír Čunát 6726776c74 kdiff3: maintenance update 2013-07-05 14:45:59 +02:00
Aristid Breitkreuz 7a2daf2db7 update xdg-utils to 1.1.0-rc1, fixes problems with generic xdg-open code 2013-07-04 23:36:29 +02:00
Jonas Hoersch 5597e9a2a5 aria2: update to version 1.17.1 and add sqlite support 
also add missing pkgconfig dependency, so that the buildInputs zlib,
openssl, and sqlite are properly found.
 2013-07-04 19:26:03 +02:00
Peter Simons 70a437e4a7 editres: add version 1.0.6 
The tool doesn't seem to work well for me. Not sure whether I'm building
it wrong, maybe?
 2013-07-04 14:12:42 +02:00
Jason \"Don\" O'Conal 1f9005a3f6 php53: add imap option 2013-07-04 13:12:13 +02:00
Vladimír Čunát 01548459be Merge pull request #711 from lovek323/gnuplot 
gnuplot and others: fix build on darwin
 2013-07-04 02:17:35 -07:00
Jason "Don" O'Conal 4c9cff322a gnuplot: fix build on darwin 
* add readline to build inputs
* don't use wxGTK
 2013-07-04 08:51:25 +10:00
Ludovic Courtès b9960211ab add GNU Guix 2013-07-03 15:33:17 +02:00
Eelco Dolstra 80213cbb05 meta.license is a list of strings (not attribute sets) 
http://hydra.nixos.org/build/5453648
 2013-07-03 12:41:27 +02:00
Rok Garbas bf540904de haproxy: update to 1.4.24 (set platform to linux, for now) 2013-07-03 03:36:15 +02:00
Joachim Schiele e6bf2413ef Merge pull request #685 from qknight/aescrypt 
added AES crypt with fixes from edolstra
 2013-07-02 01:02:28 -07:00
Joachim Schiele 431cd91f01 fixed requested changes 2013-07-01 18:24:43 +02:00
Sander van der Burg 47931dcefa dysnomia: Some updated meta information 2013-07-01 14:27:18 +02:00
Domen Kožar 13017198de Merge pull request #688 from bencahill/master 
rmlint: Install to /bin, not /usr/bin
 2013-06-29 10:12:39 -07:00
Domen Kozar 175eb450cd Revert "fix rmlint" 
This reverts commit 18ddfda81a.
 2013-06-29 19:12:11 +02:00
Domen Kozar efa4aac21e dd-agent: ab14fde6f9 -> 3.8.0 2013-06-29 18:46:37 +02:00
Domen Kozar 18ddfda81a fix rmlint 2013-06-29 18:43:17 +02:00
Domen Kožar 8971ceeb15 Merge pull request #684 from qknight/mcrypt 
added mcrypt
 2013-06-29 03:26:40 -07:00
Benjamin Cahill baf822a287 rmlint: Install to /bin, not /usr/bin 2013-06-28 16:48:40 -05:00
Rickard Nilsson 916fc48210 moderntimeline: Add extra source URL 2013-06-27 17:49:19 +02:00
Sander van der Burg 9936b7c230 disnix: push to latest 0.3 development release 2013-06-27 15:32:11 +02:00
Joachim Schiele 4d3c59f454 added AES crypt 2013-06-27 13:44:29 +02:00
Joachim Schiele b0c946a86a added mcrypt 2013-06-27 12:04:57 +02:00
Sergey Mironov 6afd6588d3 wicd: fix copying dhclient's config to it's initial location 2013-06-27 14:03:09 +04:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Eelco Dolstra cbf2526bfd Add nixops 2013-06-25 14:12:16 +02:00
Rickard Nilsson 9e85628fb9 mkpasswd: Update to 5.0.25 2013-06-25 12:20:11 +02:00
aszlig 4e10617bc4
winswitch: Basic somewhat working version. 
Wow, this is one of the most dangerous programs I've seen in a while. It not
only tries to probe for a package manager to install dependencies but also
tries to execute a whole bunch of programs in $PATH. That's why I decided to
override the postFixup phase for now in order to get rid of the current $PATH
and meanwhile getting the basics working.

So, I'm still not sure how to do the best implementation here on NixOS without
allowing winswitch to be too invasive and without restricting it too much so
that it's of no use.

But let's figure that out once we trimmed down the radiation level of this
"living" thing ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-24 10:33:15 +02:00
Mathijs Kwik e387731b82 youtube-dl: upgrade to 2013.06.21 2013-06-23 16:26:37 +02:00
Jaka Hudoklin 2f4d1a5656 memtest86: udpate to 4.1.0, fix download url 2013-06-22 14:11:47 +02:00
Domen Kozar dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2 
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
 2013-06-21 19:59:20 +02:00
Lluís Batlle i Rossell b38308553b Adding cjdns. 
The executable runs; I haven't tried to run a node.
 2013-06-20 20:53:37 +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
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
Eelco Dolstra eaf98cf26e nixUnstable: Update to 1.5.3pre3134_5c06e52 2013-06-11 12:08:37 +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