mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity
35412 commits 234 branches 124 tags 7.1 GiB
Commit graph

3353 commits

Author SHA1 Message Date
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
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
Domen Kozar d9fe34aeb4 aircrackng: add platform & maintainers 2013-06-02 20:37:14 +02:00
Lluís Batlle i Rossell 778e09625f aircarck-ng: updating and fixing build 
Requested in issue #585
 2013-06-02 19:54:50 +02:00
Lluís Batlle i Rossell 0e57e74e6f youtube-dl: without pandoc on non-pc 2013-06-02 14:56:44 +02:00
bbenoist f7934d7b9d Add numdiff-5.6.1 
A little program that can be used to compare putatively similar files line
by line and field by field, ignoring small numeric differences or/and
different numeric formats.
 2013-06-01 00:59:58 +02:00
Rob Vermaas 1f4c75f9e8 Update euca2ools to 2.1.3 2013-05-30 15:02:36 +02:00
Rickard Nilsson 1ddfbae86a stunnel: Add explicit openssl reference (latest stunnel version did not build for me otherwise) 2013-05-30 12:12:18 +02:00
Vladimír Čunát 25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +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
Lluís Batlle i Rossell f54c4c99e3 tcpdmup/libpcap udpate 2013-05-29 19:23:40 +02:00
Lluís Batlle i Rossell 21cb347f20 Adding babeld. 2013-05-29 19:16:02 +02:00
Lluís Batlle i Rossell 08f8371a50 Adding ahcpd. 2013-05-29 19:16:01 +02:00
Lluís Batlle i Rossell 55eccc68bb Adding oslrd. 2013-05-28 22:37:59 +02:00
Eelco Dolstra 6c03d641fa openvpn: Update to 2.3.1 2013-05-28 14:48:56 +02:00
Gergely Risko 29b6370b0c Fix vboot_reference's libuuid overriding to work on systems wo libuuid 2013-05-27 23:36:43 +02:00
Gergely Risko 601e9dfd94 Add vboot_reference: tools needed for installing custom OS on Chromebooks 2013-05-27 12:10:19 +02:00
Domen Kozar 0f8a1b29d2 unzip: add bzip2 as native build input 2013-05-26 13:22:55 +02:00
Lluís Batlle i Rossell 7e7b669b3e megatools: fixing the network part 
It requires some env vars to work
 2013-05-25 00:08:42 +02:00
Lluís Batlle i Rossell a403f55ccf Adding megatools 2013-05-24 23:43:26 +02:00
Michael Raskin 1d38b4842a Support pre-start commands from newer NixOS versions in xlaunch 2013-05-24 00:43:31 +04:00
Ricardo M. Correia 200fd97b04 chrony: Add readline and libcap (on Linux) as dependencies 
libcap is needed for chronyd to drop privileges when starting up.
readline was added as a convenience for when using chronyc.
 2013-05-23 02:11:21 +00:00
Lluís Batlle i Rossell f93971ef0c filegive: update to 0.6.1 2013-05-22 19:21:11 +02:00
Peter Simons bce5681e53 gnupg: update to version 2.0.20 2013-05-22 12:27:08 +02:00
Ricardo M. Correia e28b51360d Add chrony. 
Chrony is a pair of programs which are used to maintain the accuracy of the system clock on a computer.
 2013-05-22 00:41:58 +02:00
Lluís Batlle i Rossell ec65563e2c Adding meo: Multiple Eyepairs Only 
I also add the pkcs11helper it needs.
 2013-05-20 23:13:40 +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
Lluís Batlle i Rossell 8160f816af mtr: adding ncurses support 2013-05-20 17:43:27 +02:00
Ricardo M. Correia 84e69bf619 tinc: update to 1.0.21 (fixes CVE-2013-1428) (merge #545) 2013-05-20 17:18:28 +02:00
Petr Rockai 7abebbad4d curl: Optionally add support for GSSAPI (Kerberos). 
@vcunat also did some configureFlags refactoring
 2013-05-18 13:24:30 +02:00
Lluís Batlle i Rossell 61e7a72931 mosh: update to 1.2.4 2013-05-18 13:17:41 +02:00
Song Wenwu d762e574fa add parcellite-1.1.4 2013-05-18 13:22:49 +08:00
Lluís Batlle i Rossell d72da0329d zsync: update to 0.6.2 2013-05-17 23:48:22 +02:00
Marc Weber 87a579dd53 partclone, partimage. both are used by clonezilla and drbl (which I haven't packaged yet) 2013-05-16 17:18:11 +02:00
David Guibert c887f9e932 update gnuplot to 4.6.0 2013-05-14 15:42:14 +02:00
Eelco Dolstra fdd06dc094 nix: Update to 1.5.2 2013-05-14 00:01:38 +02:00
Rok Garbas 0e29127928 pa-audio: adding hash 2013-05-13 10:10:05 +02:00
Domen Kožar d16e50c3fe Merge pull request #518 from NixOS/networkmanager-openvpn 
make openvpn work with networkmanagerapplet
 2013-05-11 10:18:47 -07:00
Domen Kozar b38ae22a2d make openvpn work with networkmanagerapplet 2013-05-11 19:17:48 +02:00
Eelco Dolstra 7f4e473832 e2fsprogs: Fix manpages 
See issue #523.
 2013-05-11 18:18:40 +02:00
Eelco Dolstra 534c5c5d9c e2fsprogs: Update to 1.42.7 2013-05-11 18:09:05 +02:00
Mathijs Kwik 7761952d06 btrfsprogs: upgrade to latest git 
this incorporates all patches we already used and makes btrfs-send
work with kernel 3.9+
 2013-05-11 15:27:54 +02:00
Domen Kozar 1aaa1a7b5b add networ-manager-openvpn, WIP 2013-05-10 19:17:51 +02:00
Evgeny Egorochkin 675c4c70ad bluedevil: update to 1.3.1 2013-05-10 04:38:16 +03: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
Eelco Dolstra 84b0bf63b7 pwnat: Fix evaluation 2013-05-09 13:21:10 +02:00
Lluís Batlle i Rossell e9cbe5439e Adding udptunnel 
(Fixing a semicolon in pwnat expr too)
 2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell a8b576ecaf Adding pwnat. 2013-05-08 22:51:39 +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
Lluís Batlle i Rossell e087ce095e filegive: update to 0.5.2 
(fixing miniupnpd support)
 2013-05-07 12:19:38 +02:00
Evgeny Egorochkin 026b9971f5 Remove KBluetooth. BlueDevil should be used instead. 2013-05-07 09:37:53 +03:00
Evgeny Egorochkin 12be8c30a6 Improve bluedevil meta. 2013-05-07 09:36:46 +03:00
Joachim Schiele fd8e249b5d byobu 5.37 integration 2013-05-06 11:06:59 +00:00
Rickard Nilsson 9c73572ecf gnu parallel: Update to version 20130422 2013-05-06 11:27:28 +02:00
Domen Kozar 7cc21354d5 pa-applet: add pulseaudio applet 2013-05-05 23:09:59 +02:00
Domen Kozar db04466380 xarchive: add gtk archiver 2013-05-05 22:03:50 +02:00
Domen Kozar 1a003e7dfc autojump: add bash as buildInput 2013-05-05 16:24:16 +02:00
David Guibert 9b5685271d fix autojump licence attribute 2013-05-05 12:46:23 +02:00
Domen Kozar 8aabef6875 autojump: bump and reogranize a bit, not functional yet 2013-05-05 11:06:13 +02:00
Domen Kozar 301d2e5431 ncdu: set platforms 2013-05-04 20:34:15 +02:00
Lluís Batlle i Rossell a5adbf19a6 filegive: fixing licence, adding maintainer 2013-05-04 10:08:52 +04:00
Lluís Batlle i Rossell 5465a118e1 filegive: update to 0.5.1 
nat-pmp, fixed upnp bugs, ...
 2013-05-04 01:04:17 +04:00
Eelco Dolstra 233aca358f checkinstall: Fix build on i686-linux 
http://hydra.nixos.org/build/4844549
 2013-05-03 13:43:47 +02:00
Moritz Ulrich 24466df152 Update isync to 1.0.6 2013-05-03 11:03:49 +02:00
Evgeny Egorochkin 6414a306a4 filegive: bump version to 0.3.1 2013-05-02 13:15:50 +03:00
Lluís Batlle i Rossell 28f87c0eb5 Adding description to filegive 2013-05-02 11:34:42 +04:00
Lluís Batlle i Rossell bd55358159 Adding filegive, my file sending program 2013-05-02 11:32:58 +04:00
Shea Levy faddfc97b0 x11vnc: Properly hard-code the path to xdpyinfo 
This never worked before, I don't think

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-01 20:49:56 -04:00
Lennart Kats aa555c56ac lftp: use a download location that keeps old versions around 2013-05-01 10:58:32 +02:00
Vladimír Čunát 8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Eelco Dolstra ef6fc4a345 nixUnstable: Update to 1.5.2pre3091_772b709 2013-04-30 00:17:18 +02:00
Lluís Batlle i Rossell 678e983f5e Adding reaver-wps. 2013-04-26 17:14:09 +04:00
Eelco Dolstra 607437122b dhcpcd: Update to 5.6.8 2013-04-26 14:06:32 +02:00
Peter Simons 06d02090d2 bup: enable Hydra builds 2013-04-26 12:51:46 +02:00
Lluís Batlle i Rossell b4687c6966 tahoe-lafs: update to 1.9.2 
I had to update a python package too (foolscap)
 2013-04-24 22:41:17 +04: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 d44ffc5338 curl: Update to 7.30.0 
CVE-2013-1944
 2013-04-23 14:54:51 +02:00
Rok Garbas f1184916dd Merge pull request #477 from coroa/offlineimap 
offlineimap: enable support for the sqlite status backend
 2013-04-23 03:47:15 -07:00
Michael Raskin b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
viric 4311ba66e0 Merge pull request #474 from logann2019/autocutsel 
Autocutsel
 2013-04-22 10:32:37 -07:00
Jordi 97de12b58e Fix indention, remove maintainers. 2013-04-22 19:23:50 +02:00
Rickard Nilsson 51bf1ae795 munge 0.5.10: New package, a credentials handler for clusters 2013-04-22 16:04:41 +02:00
Jonas Hoersch 93c39d24b5 offlineimap: enable support for the sqlite status backend 2013-04-22 10:40:36 +02:00
Jordi 4ed2c81817 Licence to GPLv2+ 2013-04-21 18:50:51 +02:00
Jordi 8680d5bc5a Add autocutsel tool. 2013-04-20 16:21:01 +02:00
Vladimír Čunát 1c22316af6 Merge pull request #429 from ierton/wicd-fixes 
wicd: some fixes
 2013-04-20 01:32:29 -07:00
Rickard Nilsson 40ac613f85 obnam: Update to 1.4 2013-04-18 16:09:35 +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
Vladimír Čunát 6ee2cce9ef glxinfo: update the mesa-demos source 2013-04-17 13:36:05 +02:00
Peter Simons d6bdc558c7 nbd: update to version 3.3 2013-04-14 21:33:04 +02:00
Vladimír Čunát d8a2ae8d01 some libintl and libiconv cleanups + non-linux fixes 2013-04-14 13:43: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
Eelco Dolstra 4d5ba15ea9 openssh: Update to 6.2p1 2013-04-12 15:27:13 +02:00
Eelco Dolstra 8fc1fe9f6b socat: Update to 1.7.2.1 
CVE-2012-0219
 2013-04-12 15:01:01 +02:00
Eelco Dolstra 4adad458e7 Remove the "proprietary" license 
We already had "unfree".
 2013-04-12 14:37:50 +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
Cillian de Róiste 7f8ecc65ac hdf5: download URL no longer available for 1.8.5, upgrade to 1.8.10 2013-04-11 10:54:31 +02:00
Lluís Batlle i Rossell 91a94932d9 coreutils: fixing cross-build 
coreutils can't generate the man pages cross-building. I do a trick
to get them from a non-cross-built coreutils.
 2013-04-10 15:56:14 +02:00
Cillian de Róiste 277816eb00 lftp: update to 4.4.5 2013-04-10 14:13:27 +02:00
Rickard Nilsson 7870db8b10 unionfs: Add mount helper (mount.unionfs-fuse) 
This makes it possible to mount unionfs directly with mount or fstab.

Example fstab entry:

  none /mnt/union unionf-fuse allow-other,dirs=/source1=RW,/source2=RW

Note, the dirs= option need to be the last option, due to limitations
in the mount helper provided by unionfs-fuse. Maybe we should write a
better helper ourselves.

Also, you need to specify your branches as dirs= option, NOT as
the device, since the latest version of libmount always interprets
"=" characters in the device name as a tag (like LABEL, UUID etc)
and will try to resolve the tag before calling the mount helper.
This will of course not succeed and the mount will fail.
 2013-04-09 16:36:38 +02:00
Rickard Nilsson 08f1b426bc stunnel: Update to 4.56 
Note, I had to add "fips = no" to my stunnel configuration after
the update.
 2013-04-09 16:34:59 +02:00
Sergey Mironov 8b3b208f33 wicd: rename icons/hicolour to icons/hicolor 2013-04-09 09:27:45 +04:00
Peter Simons 48a2fb0aaa httpie: update to version 0.4.1 to fix the build 2013-04-08 01:19:20 +02:00
Peter Simons 2fe970d6f2 httpie: the build input 'requests014' doesn't exist anymore, it's now called 'requests' 2013-04-08 01:17:44 +02:00
Peter Simons 938486848e grub: fix download URL for grub-0.97-once.patch 2013-04-07 23:33:20 +02:00
Peter Simons 2879cf569e bup: update to version 0.25-rc1-107-g96c6fa2 and drop -Werror to fix the build 
/nix/store/4jfqcb4mzh3vl08zgfh9ir46jii7rcb9-python-2.7.3/include/python2.7/modsupport.h:27:1: error: 'PyArg_ParseTuple' is an unrecognized format function type [-Werror=format=]
   PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
   ^
  cc1: all warnings being treated as errors
 2013-04-07 23:33:19 +02:00
Domen Kozar 41c6d26e16 garden 2013-04-06 08:20:27 +02:00
Domen Kozar 130c081966 add thinkfan package 2013-04-06 00:34:50 +02:00
Eelco Dolstra 477c53cec0 sudo: Fix building outside of a chroot 2013-04-05 19:38:07 +02:00
Shea Levy 2d38aee71b xpra: Use new ffmpeg attribute 
It still builds, but it's a pythonPackage so who knows if it works
right. Was breaking the tarball, though.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-04-05 06:49:23 -04: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
Sergey Mironov 18681ae58e wicd: remove unused patches, remove ast with plain rm 2013-04-04 13:44:43 +04:00
Cillian de Róiste 69ad5c5c04 Fix the path to ping 
iputils-20101006/sbin/ping has moved to iputils-20121221/bin/ping
Wicd uses ping to test the connection and produced and error message.
 2013-04-03 23:34:02 +02:00
Vladimír Čunát 96d5b0fc26 Merge pull request #419 from MarcWeber/submit/lprof 
lprof: add
 2013-04-03 08:15:30 -07:00
Vladimír Čunát 2cd7d9d29e Merge pull request #417 from the-kenny/g500-control 
g500-control: add
 2013-04-03 08:14:18 -07:00
Eelco Dolstra 91ff5e33cc sudo: Update to 1.8.7p7 
Ouch, our sudo was criminally outdated.

CVE-2013-1775, CVE-2013-1776, CVE-2012-2337, CVE-2011-0010.
 2013-04-03 13:15:38 +02:00
Cameron Matheson 934bfc618a tmux: update to version 1.8 2013-04-01 16:24:08 -06:00
Peter Simons 6382266e58 Merge pull request #431 from jcumming/cuetools.130317 
cuetools-1.3.1
 2013-04-01 02:39:17 -07:00
Peter Simons 7b6b0a85d4 Merge pull request #430 from orbitz/add-multitail-5.2.12 
Add multitail
 2013-04-01 02:36:57 -07:00
Jack Cummings 4527d677cc cuetools metadata: license, maintainer, platforms 2013-03-31 21:43:53 -07:00
Sergey Mironov 6901f6346d wicd: [HACK] fix various gtk issues 
* hack around s.translate situation
* fix KeyError exception in error dialog
* fix Russian translation
 2013-03-31 18:10:28 +00:00
Domen Kozar ea4b0c33d8 Set correct paths when using nm-applet without desktop 2013-03-31 20:08:01 +02:00
Malcolm Matalka d819ee8b7e Add multitail 2013-03-31 19:40:11 +02:00
Sergey Mironov ee921d9df4 wicd: fix missing application icon 2013-03-31 13:06:31 +04:00
Sergey Mironov f7efab5fd8 wicd: bring translations back. 2013-03-31 13:06:27 +04:00
Sergey Mironov a8a3cc00fd wicd: fix dhclient interaction 
wicd used to write dhclient config file into $out/var/lib/wicd directory attempting
to change nix-store. That didn't work and thats why we couldn't use dhclient.
With this patch wicd will generate temporary file name for this purpose. File is
generated each time the daemon starts.
 2013-03-31 13:06:24 +04:00
Lluís Batlle i Rossell 6281042def Adding oath-toolkit and xmlsec 
I added xmlsec to make it work with oath-toolkit (to build one extra tool
there, that I don't need), but I couldn't make it work together.
 2013-03-31 00:08:17 +01:00
Domen Kožar 3c7ec2b559 Merge pull request #422 from offlinehacker/xpra-0.8.8 
Upgrading xpra to 0.8.8
 2013-03-30 07:45:40 -07:00
Jaka Hudoklin 06425fca37 Upgrading xpra to 0.8.8 2013-03-30 15:23:51 +01:00
Domen Kozar 9a31d2ef0d aircrack-ng: bump 2013-03-29 19:02:51 +01:00
Domen Kozar 92f72cb80f pwgen, wgetpaste: set platforms 2013-03-29 18:32:58 +01:00
Rob Vermaas 2fa4e36946 Add weighttp 0.3 2013-03-29 15:04:59 +01:00
Marc Weber 4926ad90e7 adding lprof 2013-03-29 14:52:47 +01:00
Moritz Ulrich da90131e5a g500-control: Add meta.platforms. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-27 20:59:57 +01:00
Moritz Ulrich e70954f8c8 New package: g500-control 
g500-control is a small tool to configure internal profiles of a
Logitech G500 mouse.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-27 19:51:32 +01:00
Domen Kozar c07d0b9b78 Add almir and it's dependencies. 2013-03-27 02:30:07 +01:00
Eelco Dolstra 5262980561 nixUnstable: Bump 2013-03-26 16:00:47 +01:00
Peter Simons e825c522b6 Merge pull request #409 from pcapriotti/renameutils 
Add renameutils package.
 2013-03-25 11:40:36 -07:00
Lluís Batlle i Rossell 26ec1abf41 Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00
Paolo Capriotti f85025a30e Add renameutils package. 2013-03-25 13:45:01 +00:00
Vladimír Čunát f8fb55b4cc gparted: update 2013-03-23 20:25:35 +01:00
Peter Simons 6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Rok Garbas fb1f25e532 Merge pull request #400 from iElectric/bacula_improvements 
bacula: add postgresql support, add myself as maintainer and set meta.platforms
 2013-03-22 05:14:37 -07:00
Peter Simons 7e24ae77fe latex2html: update to version 2008 2013-03-22 12:50:21 +01:00
Peter Simons 617394eaf8 latex2html: update meta information 2013-03-22 12:50:21 +01:00
Domen Kozar 1ee0f43bb1 bacula: add postgresql support, add myself as maintainer and set meta.platforms 2013-03-22 01:53:41 +01:00
Ludovic Courtès 31c513d4b7 gawk: Remove now-unneeded Cygwin patch. 2013-03-21 14:27:07 +01:00
Michael Raskin 3c1ce85692 Fix ZBar build by passing it gtk2 2013-03-21 11:59:07 +04:00
Michael Raskin a9ec58c8b3 Fix pdf2djvu build via an update 2013-03-21 11:44:01 +04:00
Lluís Batlle i Rossell ac807625a7 storebrowse: update fixing bugs 
I try to add build rules for arm too.
 2013-03-18 22:45:47 +01:00
Eelco Dolstra 93a963f347 nixUnstable: Update to the latest 
This is mostly to get rid of those annoying Perl warnings in NixOS...
 2013-03-18 22:35:33 +01:00
Lluís Batlle i Rossell d711dcc070 Adding setup-hook for opensp, to set the sgml catalog files 
This sets the SGML_CATALOG_FILES, similar to how libxml2 does the same with
XML_CATALOG_FILES.

I based the hook on the libxml2 one, and I followed the instructions about this
variable here:
http://docbook.sourceforge.net/release/dsssl/1.79/doc/install.html
 2013-03-18 15:07:20 +01:00
Peter Simons ac022ec7af smartmontools: update to version 6.1 (using latest drivedb.h revision 3797 from trunk) 2013-03-18 12:17:26 +01:00
Peter Simons 4fce144369 Merge pull request #387 from aforemny/cloc 
Add cloc-1.58
 2013-03-18 04:04:04 -07:00
Jack Cummings dbee2b8ee9 cuetools-1.3.1 2013-03-17 16:18:36 -07:00
Jan Malakhovski 16972d2415 screen: fix some annoying bugs by importing patches from ArchLinux 2013-03-17 12:24:49 +00:00
Eelco Dolstra 82f947c78a runLaTeX: Fix dependency detection 
Since Nix 1.4, expressions like "${path}/blabla" always evaluate to a
string rather than a path.  However, findLaTeXIncludes depended on the
old (weird) behaviour, leading to errors like:

  error: string `/nix/store/4c32q75in74m1148anlzdhb8jpppab0s-bla/IEEEtran.cls' cannot refer to other paths

So use path concatenation instead.
 2013-03-16 16:56:19 +01:00
Lluís Batlle i Rossell c9ffddb9d7 storebrowse: newer version 2013-03-16 15:15:38 +01:00
Alexander Foremny 4e5b7cd5d1 Add cloc-1.58 2013-03-16 15:06:23 +01:00
Cillian de Róiste 924be9b524 Wicd: #379 Also add the gtk-2.0 directory in pygobject to the PYTHONPATH 2013-03-16 08:34:14 +01:00
Lluís Batlle i Rossell 5bffa00f18 storbrowse: fix name 2013-03-16 01:42:49 +01:00
Lluís Batlle i Rossell 6ee91a0304 storebrowse: update 
Easier to launch, dramatic improvement printing of the URL where to browse.
 2013-03-16 01:40:47 +01:00
Lluís Batlle i Rossell 4dbdbda37f Adding storebrowse, a tool to browse the nix store with a web browser. 
The build script is a bit long due to the upstream go style of things.
 2013-03-16 00:59:25 +01:00
Eelco Dolstra 82dc43c28b checkinstall: Make installwatch.so work with old Glibcs 2013-03-15 14:04:32 +01:00
Eelco Dolstra 4c67972e9b checkinstall: Support Glibc >= 2.16 2013-03-15 14:04:32 +01:00
Cillian de Róiste 0037e518b0 Merge branch 'wicd-gobject' 2013-03-15 01:00:19 +01:00
Cillian de Róiste ef3da5eecd #379 wicd: Add ifconfig and ping to the PATH 
/var/log/wicd/wicd.log showed that it failed to find ifconfig
that was probably the main issue (after the gobject import failure)
 2013-03-15 00:59:17 +01:00
Cillian de Róiste 2393f6b96f #379 Update wicd to 1.7.2.4, fix patches, disable translations 2013-03-15 00:14:30 +01:00
Rob Vermaas 629c36cfef rsyslog: enable TLS support 2013-03-14 15:27:34 +01:00
Rob Vermaas 4619675011 Add rsyslog 7.2.6 and its dependencies 2013-03-14 14:13:55 +01:00
Cillian de Róiste 0d191de368 Fix wicd to find the python gobject on its PYTHONPATH 2013-03-14 01:22:55 +01:00
Peter Simons 5f758431d4 lzip: build the binary with -O3 and assertions disabled 2013-03-13 15:13:40 +01:00
Peter Simons c187516152 lzip: enable documentation build 2013-03-13 15:13:40 +01:00
Peter Simons 6d5c6af427 lzip: update to version 1.14 2013-03-13 13:59:33 +01:00
Lluís Batlle i Rossell 8d1ff12cdc mktorrent: fixing the usual pthread_cancel problem 2013-03-12 20:01:07 +01:00
Lluís Batlle i Rossell 90bca24b38 Adding mktorrent 1.0 2013-03-12 19:43:57 +01:00
Peter Simons 746bf427a8 pkgs/tools/networking/snx/snx_install.sh: delete file accidentally checked in earlier 2013-03-11 11:01:28 +01:00
Shea Levy 86aa2853f6 Merge branch 'graphviz-vimdot-fix' of git://github.com/bjornfor/nixpkgs 
Branch contains a trivial fix.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-10 22:06:04 -04:00
Peter Simons f59aaaed4b smartmontools: update drivedb.h to the latest version 2013-03-10 00:43:08 +01:00
Bjørn Forsman 74d6315024 graphviz: fix vimdot program 
vimdot doesn't work at the moment because one of its dependencies,
'which', is missing; vimdot fails to find gvim or vim and aborts.
Instead of adding a dependency on 'which', replace it with the POSIX
command 'command -v'.
 2013-03-09 21:45:20 +01:00
Vladimír Čunát 56b4a71c21 netpbm: update and attempt to fix i686 build 2013-03-09 14:59:39 +01:00
Vladimír Čunát 2e1dd8e076 recutils: supply the forgotten patch 2013-03-09 13:54:55 +01:00
Michael Raskin 5ec1806564 Adding ZPAQ archiver 2013-03-09 16:33:14 +04:00
Michael Raskin b494b3b468 Update lrzip 2013-03-09 16:33:14 +04:00
Vladimír Čunát 87ec597ce7 recutils: fix build with new glibc 2013-03-09 13:24:31 +01:00
Vladimír Čunát e218c79b85 grive: fix build with new binutils headers 2013-03-09 12:27:38 +01:00
Vladimír Čunát f0f34067e7 recode: fix build after stdenv merge + #354 
ToDo: tests don't pass yet.
 2013-03-09 11:32:22 +01:00
Michael Raskin dcf04b6063 zbar requires v4l1; disabe video 2013-03-09 12:59:45 +04:00
Shea Levy 8934644d20 tor: minor cleanups 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:15:26 -05:00
Shea Levy 9a5ca5aced tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do 2013-03-08 19:14:43 -05:00
Shea Levy 35d957b8f9 Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs 
This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:13:17 -05:00
Shea Levy 9158ad45f1 Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs 
This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:08:56 -05:00