Commit Graph

598 Commits

Author SHA1 Message Date
Domen Kožar
8feda47bee pinentry: fix build /cc wkennington 2015-03-26 10:07:05 +01:00
William A. Kennington III
70a8bfbcd5 pinentry: Fix for darwin 2015-03-25 16:19:02 -07:00
William A. Kennington III
79cfdb2afe pinentry: Slight refactoring 2015-03-25 16:10:00 -07:00
William A. Kennington III
4fc94e6222 pinentry: Update build 2015-03-25 16:09:00 -07:00
Chris Double
9369daf134 Update tor-browser to 4.0.5 2015-03-25 13:39:23 +13:00
Chris Double
9549f1c88f Update tor to 0.2.5.11 2015-03-25 13:39:23 +13:00
Austin Seipp
a11078a78c nixpkgs: afl - add QEMU support
This adds support for `afl-fuzz -Q`, which can be used to instrument
arbitrary black-box binary code for fuzz testing using American Fuzzy
Lop through QEMU emulation.

This requires a custom QEMU 2.2.0 build of the Linux userspace emulators
(system emulators aren't required) with some custom patches. Furthermore
we have to patch the patches a little to make the build more sane (there
are some notes in the README about this).

Overall, the addition of this feature by default doesn't significantly
impact build times (since building QEMU for only one target builds only
a fraction of the source code, and many features are disabled), so it's
enabled by default.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-22 22:52:57 -05:00
Austin Seipp
624fcfce64 nixpkgs: afl 1.56b -> 1.57b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-22 18:29:57 -05:00
Eric Seidel
51d465646a gnupg: don't demand pcsclite on darwin 2015-03-21 09:14:36 -07:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Vladimír Čunát
80c7a6f107 nmap: extend platforms
Tested briefly by @jcf on darwin, web site claims BSDs are also supported.
2015-03-18 23:51:19 +01:00
Eric Seidel
fd60b5f496 gnupg: dont demand pcsclite on darwin 2015-03-17 17:26:01 -07:00
devhell
6a8a739d68 gnupg21: Add texinfo as a dependency
This adds texinfo as a dependency, without which the build will fail.
2015-03-16 00:32:16 +00:00
_1126
f1f3c2c775 torbrowser: bump version to 4.0.4 2015-03-14 14:36:25 +01:00
Edward Tjörnhammar
ec77aca091 srm: 1.2.14 -> 1.2.15 2015-03-11 19:22:25 +01:00
Austin Seipp
ed75d612d6 nixpkgs: afl 1.49b -> 1.56b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-10 01:19:51 -05:00
William A. Kennington III
e1703a836e gnupg: 2.0.26 -> 2.0.27 2015-03-09 15:22:59 -07:00
William A. Kennington III
9631f5a718 gnupg: Fix default path to pcsclite 2015-03-09 15:22:59 -07:00
Peter Simons
97feb65c00 pcsctools: fix evaluation 2015-03-09 16:02:48 +01:00
Lluís Batlle i Rossell
a2f4b94dbe Add pcsc-tools, to test ccid cards. 2015-03-09 15:37:50 +01:00
obadz
fcd5d8fdc6 ecryptfs: lib.maintainers vs maintainers 2015-03-08 16:03:52 -07:00
obadz
e5d4624420 PAM/eCryptfs now able to mount ecryptfs'd home directories on login 2015-03-08 16:03:51 -07:00
Petar Bogdanovic
31955c869f Update gnupg1orig package to gpg-1.4.19
A test build pulled too many packages (including perl) for my VM so
while it's a simple bump, it's also untested.
2015-03-05 16:04:29 +01:00
William A. Kennington III
919894f4fe opensc: Fix pcsclite reference 2015-03-03 14:52:02 -08:00
William A. Kennington III
4db81f081b opensc: 0.13.0 -> 0.14.0 2015-03-03 14:27:49 -08:00
Austin Seipp
0d266b2392 nixpkgs: afl 1.21b -> 1.49b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-02-25 07:54:15 -06:00
Eelco Dolstra
9e9e446880 sudo: Fix incorrect runtime path 2015-02-25 12:39:06 +01:00
Eelco Dolstra
3d3db3550f sudo: Update to 1.8.12 2015-02-24 18:04:35 +01:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Shea Levy
df0016a8ce Fix pass on darwin 2015-02-15 16:14:13 +00:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
6827c7d8b0 Merge pull request #6315 from matthiasbeyer/update-gnupg
Update gnupg21 package to gpg-2.1.2
2015-02-12 18:58:06 +01:00
Matthias Beyer
91c31bcc57 Update gnupg21 package to gpg-2.1.2 2015-02-12 16:52:07 +01:00
Shea Levy
52879c9050 pass: fix completion installation 2015-02-11 15:29:34 +00:00
j-keck
dc9cdb2beb kpcli: 2.7 -> 2.8 2015-02-09 09:17:33 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Moritz Ulrich
6a24650cb5 pass: update from 1.6.3 to 1.6.5 2015-02-07 18:49:49 +01:00
lethalman
0e987968e5 Merge pull request #6198 from joachifm/update-clamav
clamav: bump to version 0.98.6
2015-02-06 10:37:41 +01:00
Joachim Fasting
37649e76e3 clamav: bump to version 0.98.6 2015-02-06 08:56:38 +01:00
Moritz Ulrich
a5807eb7c4 pass: default to withX = true & install passmenu. 2015-02-04 12:06:48 +01:00
Nikolay Amiantov
0867c43294 fprintd: update package 2015-02-03 14:27:49 +03:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Benno Fünfstück
0b9af69347 kpcli: XMLParser is required for KeePass2 format 2015-01-25 22:10:10 +01:00
Markus Kohlhase
8295846f6f nixpkgs: torbrowser 4.0.2 -> 4.0.3 2015-01-25 09:03:19 +00:00
Edward Tjörnhammar
a83cfbfc7c Merge pull request #5541 from nckx/eid-viewer-association
eid-viewer: associate with XML & text/plain (MIME type of .eid files)
2015-01-24 23:31:24 +01:00
Austin Seipp
7581c422d4 nixpkgs: afl 1.06b -> 1.21b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-23 10:46:10 -06:00
Tobias Geerinckx-Rice
0fd09d1165 eid-{mw,viewer}: run tests
Not doing so in this case seems downright irresponsible.
2015-01-20 07:26:48 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Pascal Wittmann
56e3d5d99e Merge pull request #5742 from j-keck/kpcli
add kpcli: KeePass Command Line Interface
2015-01-14 14:28:06 +01:00
j-keck
4e21ef88fb add kpcli: KeePass Command Line Interface 2015-01-14 14:12:29 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Tobias Geerinckx-Rice
6565714873 eid-viewer: associate with XML & plain text .eid files
The .eid files are in fact XML, but lack the <?xml...?> declaration that
file(1) seems to expect. At least the viewer now appears as an option in
most GUIs.
2015-01-13 21:10:49 +01:00
lethalman
908c47b281 Merge pull request #5550 from abbradar/fprintd
add fprintd support
2015-01-08 14:58:22 +01:00
Nikolay Amiantov
006dceba14 fprint_demo: add package 2015-01-03 19:50:40 +03:00
Nikolay Amiantov
63af25130e fprintd: add package 2015-01-03 19:50:40 +03:00
John Wiegley
a00a8d0711 gnupg: correct a typo in their source code 2015-01-03 07:53:09 -05:00
William A. Kennington III
afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Austin Seipp
c619e54e60 nmap: fix dependencies on makeWrapper/python
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-29 12:55:14 -06:00
Austin Seipp
2cabafd363 nixpkgs: afl-1.04b -> 1.06b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:45:25 -06:00
Austin Seipp
bf5935e34c nixpkgs: p0f 3.07b -> 3.08b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:43:34 -06:00
Austin Seipp
baa2e7326f nixpkgs: nmap 6.40 -> 6.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:41:54 -06:00
Austin Seipp
79f82686e1 nixpkgs: afl 0.89b -> 1.04b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-26 21:43:05 -06:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Karn Kallio
23010cf71a gnupg: Port socket activation patch to version 2.1.1. 2014-12-24 19:16:38 +01:00
William A. Kennington III
86971fd33b gnupg: Fix src hash 2014-12-18 11:37:58 -08:00
Eelco Dolstra
6866712a39 sudo: Update to 1.8.11p2 2014-12-18 12:31:56 +01:00
William A. Kennington III
56908ab49f pinentry: 0.8.4 -> 0.9.0 2014-12-16 15:30:16 -08:00
William A. Kennington III
b671a46f92 gnupg: 2.1.0 -> 2.1.1 2014-12-16 15:24:28 -08:00
Jaka Hudoklin
1465d9321d thc-hydra: include postgresql brute-force support 2014-12-11 23:25:26 +01:00
Jaka Hudoklin
3ceb789c36 john: use systemd wide config, and not from store 2014-12-11 23:25:26 +01:00
Austin Seipp
5c52382448 tor-arm: kill tabs
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:21:14 -06:00
Austin Seipp
7a51e5f416 nixpkgs: fix tor-arm dependencies
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:14:11 -06:00
Austin Seipp
0d63eae992 tor-arm: Fix python path
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:06:02 -06:00
Austin Seipp
b31283dd8b nixpkgs: add tor-arm 1.4.5.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 03:59:59 -06:00
Domen Kožar
0ec12d53e6 tcpcrypt: 2011.07.22 -> 0.3rc1, fix nixos service 2014-12-10 10:23:46 +01:00
Austin Seipp
323113ef6d nixpkgs: afl 0.85b -> 0.89b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-09 21:59:28 -06:00
wmertens
24924e4fdf Merge pull request #5125 from nckx/eid-mw
Add eid-mw: authenticate & sign with Belgian eID identity cards
2014-12-08 16:40:54 +01:00
Domen Kožar
de99c9c955 Merge branch 'staging' 2014-12-08 16:28:45 +01:00
Edward Tjörnhammar
3ce89ba002 srm: added package 2014-12-08 11:51:39 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Austin Seipp
c3bdbd3b52 nixpkgs: tor-browser 4.0.1 -> 4.0.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:28 -06:00
Austin Seipp
92eb86e110 nixpkgs: add myself as a 'tor' maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:27 -06:00
Austin Seipp
c206c728a8 nixpkgs: tor depends on torsocks
This may seem strange, but tor distributes its 'torify' wrapper which in
turn attempts to use torsocks to bridge a connection, meaning 'tor'
users out the box may want it to work.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:27 -06:00
Austin Seipp
d92d0eca92 nixpkgs: torsocks 1.3 -> 2.0.0
Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:26 -06:00
Tobias Geerinckx-Rice
b7425f8fef Add eid-mw: authenticate & sign with Belgian eID identity cards 2014-12-05 23:15:44 +01:00
Charles Strahan
aadb556e29 lastpass-cli: new package
This adds the official lastpass CLI, a utility for manipulating lastpass logins.
2014-12-04 18:23:25 -05:00
Austin Seipp
25d883a46d nixpkgs: afl 0.79b -> 0.85b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-03 18:53:20 -06:00
Austin Seipp
8f6279be5c afl: 0.68b -> 0.79b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-11-30 13:19:26 -06:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Austin Seipp
57ec90f90f nixpkgs: Fuzzing test case optimizer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-11-25 13:03:43 -06:00
Austin Seipp
b0dc5b17ca nixpkgs: American Fuzzy Lop
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-11-25 12:43:03 -06:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Tobias Geerinckx-Rice
d72f6c85e4 Add eid-viewer: Java reader for Belgian eID identity cards 2014-11-23 00:42:52 +01:00
vbgl
a4a235c0d0 Merge pull request #5082 from robberer/pkgs/clamav
clamav: bump 0.98.4 to 0.98.5
2014-11-22 10:35:21 +00:00
Longrin Wischnewski
a8bce0cf73 clamav: bump 0.98.4 to 0.98.5 2014-11-22 09:50:41 +01:00
vbgl
3e8fd1b30b Merge pull request #5014 from doublec/tor
Update Tor to 0.2.5.10.
2014-11-21 07:33:53 +00:00
Thomas Tuegel
dfaa39db41 polkit-qt-1: Qt 5 support
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
2014-11-20 11:10:39 -06:00
Shea Levy
25b4674e67 gnupg-2.1: Add socket activation patch 2014-11-18 16:58:14 -05:00
Chris Double
32d09e2699 Update Tor Browser to 4.0.1
Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime.

Add myself to the maintainers.
2014-11-18 23:46:42 +13:00
Chris Double
75425ff879 Update Tor to 0.2.5.10.
Updates Tor to latest stable version.

Add myself to the maintainer list.
2014-11-18 01:47:42 +13:00
Thomas Hunger
41d89224c9 Update fail2ban to 0.9.1.
Version 0.9 is no longer available for downloat at github.
2014-11-15 16:54:40 +00:00
William A. Kennington III
6fbb5711f5 pcsclite: 1.8.12 -> 1.8.13 2014-11-14 22:22:12 -08:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Boris Sukholitko
1e8e9b9398 volatility: upgrade to 2.4 2014-11-12 22:35:42 +02:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
William A. Kennington III
850da1803f gnupg: Add gnupg 2.1 as default
Additionally, move all gnupg expressions into the gnupg folder.
2014-11-06 11:44:12 -08:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Evgeny Egorochkin
ac8c944332 add myself as a maintainer 2014-11-05 11:35:32 +02:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Rob Vermaas
c9d40dc6f8 oathToolkit: update from 2.0.2 to 2.4.1, potentially fixes CVE-2013-4204, CVE-2013-6280, CVE-2013-7322 2014-11-04 10:22:46 +01:00
Vladimír Čunát
ed867a50eb iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
2014-11-03 12:58:54 +01:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Evgeny Egorochkin
eb8f380f4e pwgen: update from 2.06 to 2.07 2014-11-01 14:52:11 +02:00
Emery Hemingway
6b7eda4ddc mbox does not support i686 2014-10-31 11:48:55 -04:00
William A. Kennington III
4e8d55c59f pinentry: 0.8.3 -> 0.8.4 2014-10-29 02:05:17 -07:00
Emery Hemingway
358acd7d52 mbox: initial package
http://pdos.csail.mit.edu/mbox
2014-10-28 12:43:51 -04:00
Evgeny Egorochkin
a6dc9ce957 tor: update from 0.2.4.23 to 0.2.4.24 2014-10-25 20:31:54 +03:00
cillianderoiste
5c6ae9c6d3 Merge pull request #4623 from abbradar/rng-tools
rng-tools: update package
2014-10-23 19:35:08 +02:00
Mateusz Kowalczyk
342e7748e2 Merge pull request #4624 from abbradar/wipe
wipe: add package
2014-10-23 11:50:12 +01:00
Mateusz Kowalczyk
f5c9daf99e Merge pull request #4530 from ts468/simple-tpm
Add package: simple-tpm-pk11
2014-10-23 11:47:44 +01:00
Mateusz Kowalczyk
0e840902ff Merge pull request #4629 from ts468/aide
New package: AIDE, version 0.16a2
2014-10-23 11:47:22 +01:00
Mateusz Kowalczyk
d5385034be Merge pull request #4508 from ts468/opencryptoki
Add package: opencryptoki
2014-10-23 11:46:33 +01:00
Thomas Strobel
c89c3649d2 New package: AIDE, version 0.16a2
Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker
2014-10-23 01:29:14 +02:00
Nikolay Amiantov
0f2af778b7 wipe: add package 2014-10-23 02:08:37 +04:00
Nikolay Amiantov
9fa041e3e6 rng-tools: update package 2014-10-23 02:07:46 +04:00
Thomas Strobel
49fd0c32ff Add package: simple-tpm-pk11
Simple PKCS11 provider for TPM chips
2014-10-15 01:14:34 +02:00
Thomas Strobel
d206122ade Add package: opencryptoki
Make tpm-tools depend on opencryptoki as well.
2014-10-14 09:03:50 +02:00
Thomas Strobel
0dd66a50de Update: trousers 0.3.11 -> 0.3.13 2014-10-14 09:00:31 +02:00
Peter Simons
fb30eb932b thc-hydra: fix download url 2014-10-13 15:58:27 +02:00
Peter Simons
525a850511 thc-hydra: don't call this package "hydra"; that name is taken in NixOS 2014-10-12 17:34:49 +02:00
Austin Seipp
9b391aadce ssdeep: 2.10 -> 2.11
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:06:17 -05:00
Austin Seipp
5c805fe266 p0f: 3.06b -> 3.07b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:00:25 -05:00
Aristid Breitkreuz
8c615a656d apg: update from 2.2.3 to 2.3.0b 2014-10-09 20:16:03 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Michael Raskin
77f497b78d Merge pull request #4428 from mknight-tag/master
New package: MKRAND
2014-10-09 11:50:47 +04:00
M Knight
ab17c2b8f5 Add MKRAND 2014-10-08 20:03:09 -05:00
Aristid Breitkreuz
5b352c409f sudo: update from 1.8.10p3 to 1.8.11 2014-10-08 20:23:25 +02:00
Aristid Breitkreuz
3cb125a925 gnupg1orig: update from 1.4.17 to 1.4.18 2014-10-07 21:50:40 +02:00
William A. Kennington III
f7bb4f7dbe pcsclite: 1.8.11 -> 1.8.12 2014-10-01 13:18:55 -07:00
Jaka Hudoklin
8eed86fba9 add mfoc, Mifare Classic Offline Cracker 2014-09-24 11:20:47 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Mateusz Kowalczyk
aa72e7a5dc pius: update from 2.0.9 to 2.0.11 2014-09-21 19:25:32 +01:00
Jaka Hudoklin
1a87e651e9 add thy-hydra: very fast network logon cracker which support many different services 2014-09-21 01:50:43 +02:00
roconnor
cbf79969b3 Merge pull request #4120 from NixOS/gnupg
Add pinentry optional dependency for gnupg.

Delete gnupg2_1.
2014-09-19 23:44:53 -04:00