cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
42130 commits 1 branch 0 tags 3.7 GiB
Commit graph

35814 commits

Author SHA1 Message Date
Peter Simons
745dd43b05 perlPackages.PathClass: update from 0.29 to 0.33 2014-04-08 13:25:08 +02:00
Peter Simons
0f845d8e8b perlPackages.ParseRecDescent: update from 1.965001 to 1.967009 2014-04-08 13:25:08 +02:00
Peter Simons
2c967e872e perlPackages.ParamsValidate: update from 1.07 to 1.08 2014-04-08 13:25:08 +02:00
Peter Simons
5a410b1a9d perlPackages.PadWalker: update from 1.96 to 1.98 2014-04-08 13:25:07 +02:00
Peter Simons
3aed6ef4e9 perlPackages.PackageStashXS: update from 0.26 to 0.28 2014-04-08 13:25:07 +02:00
Peter Simons
5adbf4d447 perlPackages.PackageStash: update from 0.34 to 0.36 2014-04-08 13:25:07 +02:00
Peter Simons
fcec9de869 perlPackages.PSGI: update from 1.03 to 1.102 2014-04-08 13:25:07 +02:00
Peter Simons
c07679d2ef perlPackages.PPIxRegexp: update from 0.034 to 0.036 2014-04-08 13:25:07 +02:00
Peter Simons
ab6accf891 perlPackages.ObjectSignature: update from 1.05 to 1.07 2014-04-08 13:25:07 +02:00
Peter Simons
68dd97208c perlPackages.ObjectInsideOut: update from 3.97 to 3.98 2014-04-08 13:25:07 +02:00
Peter Simons
630586c605 perlPackages.NumberCompare: update from 0.01 to 0.03 2014-04-08 13:25:07 +02:00
Peter Simons
0c5d9983bf perlPackages.NetSSLeay: update from 1.52 to 1.58 2014-04-08 13:25:07 +02:00
Peter Simons
97e5d3c0d0 perlPackages.NetSMTP: update from 1.22 to 1.25 2014-04-08 13:25:07 +02:00
Peter Simons
2a1b8bc26a perlPackages.NetOpenIDConsumer: update from 1.13 to 1.15 2014-04-08 13:25:06 +02:00
Peter Simons
d94a1ee167 perlPackages.NetOpenIDCommon: update from 1.14 to 1.18 2014-04-08 13:25:06 +02:00
Peter Simons
acf86052dd perlPackages.NetLDAP: update from 0.43 to 0.4001 2014-04-08 13:25:06 +02:00
Peter Simons
c168ae1bbf perlPackages.NetHTTP: update from 6.05 to 6.06 2014-04-08 13:25:06 +02:00
Peter Simons
8da8abba86 perlPackages.NetDNS: update from 0.63 to 0.74 2014-04-08 13:25:06 +02:00
Peter Simons
470adc4acf perlPackages.NetAmazonS3Policy: update from 0.1.2 to 0.1.6 2014-04-08 13:25:06 +02:00
Peter Simons
11979f6cfa perlPackages.NetAddrIP: update from 4.071 to 4.072 2014-04-08 13:25:06 +02:00
Peter Simons
f4b043b8e0 perlPackages.MooseXTypesURI: update from 0.03 to 0.05 2014-04-08 13:25:06 +02:00
Peter Simons
e6b6a0d4fc perlPackages.MooseXTypesStructured: update from 0.28 to 0.30 2014-04-08 13:25:06 +02:00
Peter Simons
1538094756 perlPackages.MooseXTypesStringlike: update from 0.001 to 0.002 2014-04-08 13:25:06 +02:00
Peter Simons
cd94d0198f perlPackages.MooseXTypesPerl: update from 0.101341 to 0.101343 2014-04-08 13:25:06 +02:00
Peter Simons
49df464bf4 perlPackages.MooseXTraitsPluggable: update from 0.10 to 0.12 2014-04-08 13:25:06 +02:00
Peter Simons
48cf24ace0 perlPackages.MooseXRoleParameterized: update from 1.00 to 1.02 2014-04-08 13:25:06 +02:00
Peter Simons
6bfd49596c perlPackages.MooseXOneArgNew: update from 0.003 to 0.004 2014-04-08 13:25:06 +02:00
Peter Simons
6678e8e1a3 perlPackages.MooseXNonMoose: update from 0.22 to 0.26 2014-04-08 13:25:06 +02:00
Peter Simons
82457b53b4 perlPackages.MooseXConfigFromFile: update from 0.11 to 0.13 2014-04-08 13:25:05 +02:00
Peter Simons
f7a2bc48dd perlPackages.MooseXAliases: update from 0.10 to 0.11 2014-04-08 13:25:05 +02:00
Peter Simons
0e7425ce28 perlPackages.MooseAutobox: update from 0.13 to 0.15 2014-04-08 13:25:05 +02:00
Peter Simons
aa1a352064 perlPackages.ModuleRuntime: update from 0.013 to 0.014 2014-04-08 13:25:05 +02:00
Peter Simons
c6dc49d29b perlPackages.ModulePluggableFast: update from 0.18 to 0.19 2014-04-08 13:25:05 +02:00
Peter Simons
bce3f0f708 perlPackages.ModulePluggable: update from 4.8 to 5.1 2014-04-08 13:25:05 +02:00
Peter Simons
f6eb58826f perlPackages.ModulePath: update from 0.09 to 0.13 2014-04-08 13:25:05 +02:00
Peter Simons
7b89b37781 perlPackages.ModuleImplementation: update from 0.06 to 0.07 2014-04-08 13:25:05 +02:00
Peter Simons
ea1fcba63c perlPackages.ModuleFind: update from 0.11 to 0.12 2014-04-08 13:25:05 +02:00
Peter Simons
8b8a07ed17 perlPackages.ModuleBuildWithXSpp: update from 0.13 to 0.14 2014-04-08 13:25:05 +02:00
Peter Simons
f79624df5a perlPackages.MathPlanePath: update from 101 to 114 2014-04-08 13:25:05 +02:00
Peter Simons
4c217a5094 perlPackages.MailTools: update from 2.04 to 2.13 2014-04-08 13:25:05 +02:00
Peter Simons
96fb4dbb5b perlPackages.MailIMAPClient: update from 2.2.9 to 3.35 2014-04-08 13:25:05 +02:00
Peter Simons
7bc7132ddf perlPackages.LogDispatchouli: update from 2.006 to 2.009 2014-04-08 13:25:05 +02:00
Peter Simons
b79bfc7de1 perlPackages.LogDispatchArray: update from 1.002 to 1.003 2014-04-08 13:25:04 +02:00
Peter Simons
21d3c04e80 perlPackages.LogContextual: update from 0.005003 to 0.006003 2014-04-08 13:25:04 +02:00
Peter Simons
70c85b5d7a perlPackages.Log4Perl: update from 1.41 to 1.43 2014-04-08 13:25:04 +02:00
Peter Simons
f52121cab0 perlPackages.LockFileSimple: update from 0.207 to 0.208 2014-04-08 13:25:04 +02:00
Peter Simons
7d76f2c4b0 perlPackages.LocaleMaketextSimple: update from 0.18 to 0.21 2014-04-08 13:25:04 +02:00
Peter Simons
25f3995666 perlPackages.LocaleMaketext: update from 1.13 to 1.23 2014-04-08 13:25:04 +02:00
Peter Simons
34e0eb81be perlPackages.LinguaENTagger: update from 0.23 to 0.24 2014-04-08 13:25:04 +02:00
Peter Simons
eaf4f0c7c7 perlPackages.LWPxParanoidAgent: update from 1.07 to 1.10 2014-04-08 13:25:04 +02:00
Peter Simons
b4c012700f perlPackages.LWPUserAgent: update from 6.04 to 6.05 2014-04-08 13:25:04 +02:00
Peter Simons
02fce7df41 perlPackages.JSONXS: update from 2.33 to 2.34 2014-04-08 13:25:04 +02:00
Peter Simons
67b484af45 perlPackages.IPCRun3: update from 0.046 to 0.048 2014-04-08 13:25:04 +02:00
Peter Simons
798a139bd3 perlPackages.IOTieCombine: update from 1.002 to 1.004 2014-04-08 13:25:04 +02:00
Peter Simons
5a74c9e87a perlPackages.IODigest: update from 0.10 to 0.11 2014-04-08 13:25:04 +02:00
Peter Simons
811474227f perlPackages.IOCaptureOutput: update from 1.1102 to 1.1103 2014-04-08 13:25:04 +02:00
Peter Simons
6d394b5177 perlPackages.IOAll: update from 0.50 to 0.60 2014-04-08 13:25:04 +02:00
Peter Simons
8aef65dc04 perlPackages.HookLexWrap: update from 0.22 to 0.24 2014-04-08 13:25:04 +02:00
Peter Simons
aa3278dd1f perlPackages.HashUtilFieldHashCompat: update from 0.03 to 0.07 2014-04-08 13:25:03 +02:00
Peter Simons
771c5e5658 perlPackages.HashMultiValue: update from 0.13 to 0.15 2014-04-08 13:25:03 +02:00
Peter Simons
3dd6683cb2 perlPackages.HashMerge: update from 0.12 to 0.200 2014-04-08 13:25:03 +02:00
Peter Simons
b8487aeb80 perlPackages.HTTPParserXS: update from 0.14 to 0.16 2014-04-08 13:25:03 +02:00
Peter Simons
8d185a638b perlPackages.HTTPLite: update from 2.4 to 2.43 2014-04-08 13:25:03 +02:00
Peter Simons
dfd408338c perlPackages.HTMLTemplate: update from 2.9 to 2.95 2014-04-08 13:25:03 +02:00
Peter Simons
c9e26b0632 perlPackages.HTMLSelectorXPath: update from 0.15 to 0.16 2014-04-08 13:25:03 +02:00
Peter Simons
21cbb9eede perlPackages.HTMLFormHandler: update from 0.40055 to 0.40056 2014-04-08 13:25:03 +02:00
Peter Simons
08be8f66ec perlPackages.Graph: update from 0.94 to 0.96 2014-04-08 13:25:03 +02:00
Peter Simons
223edd8fe4 perlPackages.GoogleProtocolBuffers: update from 0.08 to 0.11 2014-04-08 13:25:03 +02:00
Peter Simons
0799fc8cb2 perlPackages.FreezeThaw: update from 0.43 to 0.5001 2014-04-08 13:25:03 +02:00
Peter Simons
17fd0cc414 perlPackages.ForksSuper: update from 0.67 to 0.72 2014-04-08 13:25:03 +02:00
Peter Simons
f964d637f7 perlPackages.FontTTF: update from 0.43 to 0.48 2014-04-08 13:25:03 +02:00
Peter Simons
93e50bec8c perlPackages.FileShareDirInstall: update from 0.04 to 0.08 2014-04-08 13:25:03 +02:00
Peter Simons
70e0d0a921 perlPackages.FileShare: update from 0.02 to 0.03 2014-04-08 13:25:02 +02:00
Peter Simons
e297787704 perlPackages.FileChangeNotify: update from 0.23 to 0.24 2014-04-08 13:25:02 +02:00
Peter Simons
19cca58cd4 perlPackages.FatalException: update from 0.05 to 0.0204 2014-04-08 13:25:02 +02:00
Peter Simons
7b13fd4a4e perlPackages.ExtUtilsParseXS: update from 3.22 to 3.24 2014-04-08 13:25:02 +02:00
Peter Simons
3a8fbfda11 perlPackages.ExtUtilsInstallPaths: update from 0.009 to 0.010 2014-04-08 13:25:02 +02:00
Peter Simons
ae520cd465 perlPackages.ExtUtilsHelpers: update from 0.021 to 0.022 2014-04-08 13:25:02 +02:00
Peter Simons
05ff444d56 perlPackages.ExtUtilsDepends: update from 0.304 to 0.306 2014-04-08 13:25:02 +02:00
Peter Simons
d644332491 perlPackages.ExtUtilsCBuilder: update from 0.280212 to 0.280216 2014-04-08 13:25:02 +02:00
Peter Simons
055cf38d58 perlPackages.ExporterLite: update from 0.02 to 0.04 2014-04-08 13:25:02 +02:00
Peter Simons
b602b53964 perlPackages.ExceptionBase: update from 0.25 to 0.2401 2014-04-08 13:25:02 +02:00
Peter Simons
9c90b4faf6 perlPackages.EvalClosure: update from 0.08 to 0.11 2014-04-08 13:25:02 +02:00
Peter Simons
d2187ff378 perlPackages.Error: update from 0.17019 to 0.17022 2014-04-08 13:25:02 +02:00
Peter Simons
0e01506bf6 perlPackages.EmailSimple: update from 2.102 to 2.203 2014-04-08 13:25:01 +02:00
Peter Simons
8e5416e01f perlPackages.EmailMessageID: update from 1.402 to 1.404 2014-04-08 13:25:01 +02:00
Peter Simons
e5e0ba713b perlPackages.EmailAddress: update from 1.897 to 1.901 2014-04-08 13:25:01 +02:00
Peter Simons
293a26e46a perlPackages.EmailAbstract: update from 3.004 to 3.007 2014-04-08 13:25:01 +02:00
Peter Simons
c8e83e4882 perlPackages.DistZillaPluginTestEOL: update from 0.07 to 0.10 2014-04-08 13:25:01 +02:00
Peter Simons
531c1e65c5 perlPackages.DistZillaPluginPodWeaver: update from 3.101642 to 3.102000 2014-04-08 13:25:01 +02:00
Peter Simons
c07739c247 perlPackages.DistZillaPluginBundleTestingMania: update from 0.20 to 0.21 2014-04-08 13:25:01 +02:00
Peter Simons
adbe515602 perlPackages.DistZilla: update from 4.300036 to 4.300039 2014-04-08 13:25:01 +02:00
Peter Simons
b8b23dd843 perlPackages.DigestMD4: update from 1.5 to 1.9 2014-04-08 13:25:01 +02:00
Peter Simons
b053b81d4c perlPackages.DevelStackTraceAsHTML: update from 0.11 to 0.14 2014-04-08 13:25:01 +02:00
Peter Simons
a0a50476c0 perlPackages.DevelStackTrace: update from 1.30 to 1.31 2014-04-08 13:25:01 +02:00
Peter Simons
22e43904c3 perlPackages.DevelHide: update from 0.0008 to 0.0009 2014-04-08 13:25:01 +02:00
Peter Simons
697b169bd4 perlPackages.DevelGlobalDestruction: update from 0.09 to 0.12 2014-04-08 13:25:01 +02:00
Peter Simons
1531d17512 perlPackages.DevelChecklib: update from 0.98 to 1.01 2014-04-08 13:25:01 +02:00
Peter Simons
5aeb9b3c61 perlPackages.DebugShowStuff: update from 1.14 to 1.16 2014-04-08 13:25:00 +02:00
Peter Simons
55ca4f0135 perlPackages.DateTimeSet: update from 0.31 to 0.3400 2014-04-08 13:25:00 +02:00
Peter Simons
de72951544 perlPackages.DateTime: update from 1.07 to 1.08 2014-04-08 13:25:00 +02:00
Peter Simons
ebb5c742d7 perlPackages.DateManip: update from 6.42 to 6.43 2014-04-08 13:25:00 +02:00
Peter Simons
f9e3f4f4af perlPackages.DataVisitor: update from 0.28 to 0.30 2014-04-08 13:25:00 +02:00
Peter Simons
4594bd017b perlPackages.DataSerializer: update from 0.59 to 0.60 2014-04-08 13:25:00 +02:00
Peter Simons
bab9a16e50 perlPackages.version: update from 0.9902 to 0.9908 2014-04-08 13:25:00 +02:00
Austin Seipp
ccd104940c spiped: add patch to fix linux build 
The build fails with permission denied on /dev/stderr, which I imagine
is due to the fact it's in a chroot build. So disable all that for now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-08 06:23:36 -05:00
Peter Simons
d9c8db4a20 Elm: fix build by ignoring the build instructions provided by upstream 
According to <https://github.com/elm-lang/Elm/issues/384>, Elm's release
archive comes with a Setup.hs that cannot compile an Elm release. Duh!

Replacing the custom Setup.hs file with a dummy version fixes this
issue.

Close <https://github.com/NixOS/nixpkgs/issues/2089>.
 2014-04-08 13:17:51 +02:00
Peter Simons
c7c65daf32 Merge pull request #2167 from ocharles/remove-aeson-lens 
Remove haskellPackages.aesonLens
 2014-04-08 12:50:30 +02:00
Peter Simons
7f90e454fb ikiwiki: update to version 3.20140227 2014-04-08 12:48:22 +02:00
Peter Simons
79f19f687c flymake-cursor: the sha256 hash of the file has changed 
No change was documented on the emacs wiki. Not sure what happened. :-(
 2014-04-08 12:48:22 +02:00
Peter Simons
1b1225fb0b flymake-cursor: remove redundant 'meta.platforms = stdenv.lib.platforms.all' setting 2014-04-08 12:48:22 +02:00
Peter Simons
d9332659d2 haskell-Elm: require a recent version of binary 2014-04-08 12:48:22 +02:00
Oliver Charles
1e7c38920d Remove haskellPackages.aesonLens 
This doesn't build, has no reverse dependencies, and the lens library
itself now provides this functionality.
 2014-04-08 11:44:41 +01:00
Oliver Charles
3a9a8b58ad haskellPackages.httpClientMultipart: Do not build haddocks 
This package now has no modules, so there is no documentation to build.
The library itself is deprecated, and should probably be removed from
nixpkgs soon.
 2014-04-08 11:35:20 +01:00
Rob Vermaas
a4ebaa61e4 Update dd-agent to 4.2.0 2014-04-08 09:27:09 +02:00
Mathijs Kwik
593c633aa8 emacs-idris-mode: upgrade to support idris 0.9.12 2014-04-08 08:38:43 +02:00
Jaka Hudoklin
ff836a6f15 pythonPackages: ipdb, use ipythonLight by default 2014-04-08 00:19:33 +02:00
Shea Levy
cea0460d41 Missed file 2014-04-07 16:37:02 -04:00
Shea Levy
c7899ae8ea haskell-libjenkins: fix build with new conduit 2014-04-07 16:35:26 -04:00
Shea Levy
08c7105503 haskell-scotty: fix build with new conduit 2014-04-07 16:35:12 -04:00
Alex Berg
7dff8a8aaf Bump Docker to v0.9.1. Tested pulling, committing, pushing. 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 15:08:07 -05:00
Austin Seipp
05ec851050 kernel: longterm updates 
- longterm: 3.4.85  -> 3.4.86
 - longterm: 3.10.35 -> 3.10.36
 - longterm: 3.12.15 -> 3.12.17

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 13:56:50 -05:00
Domen Kožar
1140f06e0f openssl: 1.0.1f -> 1.0.1g 
CVE-2014-0160, CVE-2014-0076
 2014-04-07 20:33:38 +02:00
Austin Seipp
4dc15c087a musl: version 1.0.0 
NB: This currently doesn't add a working musl-wrapper around musl-gcc to
allow it to work properly (musl has its own dynamic linker as well as
libc too which must be accounted for). But at the moment it builds fine,
and I plan on working more on it in the future. So lets get it
integrated and building on Hydra.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 10:31:31 -05:00
Peter Simons
a29b90b4c7 haskell-language-javascript: update to version 0.5.12 2014-04-07 17:06:37 +02:00
Peter Simons
017a8975e7 haskell-github: patch to fix build with recent versions of conduit 
Cc: @jwiegley
 2014-04-07 17:06:37 +02:00
Peter Simons
9ec3e833f7 hledger-web: patch to fix build with recent versions of conduit 
Cc: @simonmichael
 2014-04-07 17:06:37 +02:00
Peter Simons
bdc3361515 haskell-keter: update to version 1.3.0 2014-04-07 17:06:37 +02:00
Peter Simons
6876e696b4 haskell-HaRe: update to version 0.7.2.2 2014-04-07 17:06:37 +02:00
Peter Simons
8673cef70d haskell-yesod-core: update to version 1.2.11 2014-04-07 17:06:36 +02:00
Peter Simons
180673ccec haskell-yesod-bin: update to version 1.2.8 2014-04-07 17:06:36 +02:00
Peter Simons
aebf705dbf haskell-twitter-types: update to version 0.2.20140406 2014-04-07 17:06:36 +02:00
Peter Simons
9b15ca7178 haskell-temporary: update to version 1.2.0.2 2014-04-07 17:06:36 +02:00
Peter Simons
73411b90dd haskell-resourcet: update to version 1.1.1 2014-04-07 17:06:36 +02:00
Peter Simons
cbe4a977de haskell-random-fu: update to version 0.2.5.0 2014-04-07 17:06:36 +02:00
Peter Simons
7e539c72ef haskell-quickcheck-io: update to version 0.1.1 2014-04-07 17:06:36 +02:00
Peter Simons
59f7f63792 haskell-hspec: update to version 1.9.2 2014-04-07 17:06:35 +02:00
Peter Simons
7f6404001d haskell-hspec-meta: update to version 1.9.2 2014-04-07 17:06:35 +02:00
Peter Simons
afd7e3c1de haskell-hakyll: update to version 4.5.0.2 2014-04-07 17:06:35 +02:00
Peter Simons
1b32db652a haskell-fay: update to version 0.19.1.2 2014-04-07 17:06:35 +02:00
Peter Simons
ec4e1295ca haskell-fay-base: update to version 0.19.1.1 2014-04-07 17:06:35 +02:00
Peter Simons
9e04637777 haskell-cryptohash-cryptoapi: update to version 0.1.3 2014-04-07 17:06:35 +02:00
Peter Simons
448d6458a6 haskell-crypto-conduit: update to version 0.5.3 2014-04-07 17:06:34 +02:00
Peter Simons
b5ab38cd74 haskell-TypeCompose: update to version 0.9.10 2014-04-07 17:06:34 +02:00
Peter Simons
e235f6b608 haskell-Hipmunk: update to version 5.2.0.13 2014-04-07 17:06:34 +02:00
Peter Simons
1acfe0a811 haskell-HStringTemplate: update to version 0.7.3 2014-04-07 17:06:34 +02:00
Peter Simons
6acbb0df12 haskell-DAV: update to version 0.6.2 2014-04-07 17:06:34 +02:00
Peter Simons
ff49602b17 haskell-git-annex: update to version 5.20140405 2014-04-07 17:06:34 +02:00
Austin Seipp
5aa4495cb5 boolector: add version 1.5 and 1.6 
There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 09:17:05 -05:00
Ricardo M. Correia
807fad571a grsecurity: Update stable and test patches 
stable: 3.0-3.2.56-201404012135 -> 3.0-3.2.56-201404062126
test:   3.0-3.13.8-201404011912 -> 3.0-3.13.9-201404062127
 2014-04-07 15:31:12 +02:00
Ricardo M. Correia
c494289c12 linux: Update to 3.13.9 2014-04-07 15:31:12 +02:00
Eelco Dolstra
59ea2d7ba5 Apply patch for CVE-2014-0004 to udisks-1.0.4 
(cherry picked from commit 3b1f9899618f81794ce8b88fe4eaa867e549eb06)
 2014-04-07 13:22:12 +02:00
Eelco Dolstra
fa6b9baea9 Revert "udisks1: bump to fix CVE-2014-0004" 
This reverts commit 0194a44d63c613065bb5c55d50470881c00563c2 because
it breaks udisks on 13.10 (e.g. running "udisks --enumerate" will
print "Unit udisks.service failed to load").

(cherry picked from commit d7daf1a47f0d3d759555a3f0a0f09398c69c6b28)
 2014-04-07 13:22:12 +02:00
Peter Simons
53d7a1c882 haskell-criterion: downgrade to hastache 0.5.1 to fix the build 
Closes <https://github.com/NixOS/nixpkgs/pull/2133>.
 2014-04-07 11:54:57 +02:00
vi
3d3648f261 Added a derivation for Ozgun's's retry (Haskell.) 2014-04-07 12:15:33 +08:00
Domen Kožar
296dd89030 buildPythonPackage: don't return on shellHook 
Entering environment might not always be the desired effect.
 2014-04-07 00:43:50 +02:00
Luca Bruno
65c46befcf gnome-shell: depend upon gnome-settings-daemon gsettings schemas 2014-04-07 00:11:52 +02:00
Shea Levy
9949d0255e Merge branch 'make-the-kernel-build-repeatable' of git://github.com/alexanderkjeldaas/nixpkgs 
Make the kernel build and initrd generation binary repeatable (#2128)
 2014-04-06 17:02:16 -04:00
Peter Simons
4b57acece1 haskell-http-client-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:46 +02:00
Peter Simons
acd673be4b haskell-zlib-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:46 +02:00
Peter Simons
5fcc9d2b68 haskell-network-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:45 +02:00
Peter Simons
ee7880993b haskell-attoparsec-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:45 +02:00
Peter Simons
2a0a12f333 Upgrade hashable to version 1.2.x. 
This change in the GHC 7.6.3 profile violates Haskell Platform, but it fixes
many builds that would not succeed otherwise (such as Trifecta). Overriding
hashable locally in an expression is out of question: the package is used
virtually everywhere.
 2014-04-06 21:54:45 +02:00
Peter Simons
ea916f0b32 haskell-blaze-builder-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:03 +02:00
Peter Simons
5f45cc48c5 haskell-intervals: update to version 0.7 2014-04-06 21:54:02 +02:00
Peter Simons
0b3100322e haskell-exceptions: update to version 0.5 2014-04-06 21:54:02 +02:00
Peter Simons
8375a09cbb haskell-zlib-conduit: update to version 1.1.0 2014-04-06 21:53:23 +02:00
Peter Simons
3b9fff330c haskell-thyme: update to version 0.3.2.0 2014-04-06 21:53:23 +02:00
Peter Simons
30177a3c8f haskell-tagstream-conduit: update to version 0.5.5.1 2014-04-06 21:53:23 +02:00
Peter Simons
7f143d5646 haskell-stm-conduit: update to version 2.4.0 2014-04-06 21:53:23 +02:00
Peter Simons
fe1584ef18 haskell-snap-loader-dynamic: update to version 0.10.0.1 2014-04-06 21:53:23 +02:00
Peter Simons
ca00f844ae haskell-scotty-hastache: update to version 0.2.1 2014-04-06 21:53:23 +02:00
Peter Simons
a9290ec05f haskell-resourcet: update to version 1.1.0.1 2014-04-06 21:53:22 +02:00
Peter Simons
5ef1beb6d2 haskell-process-conduit: update to version 1.1.0.0 2014-04-06 21:53:22 +02:00
Peter Simons
52eaa92c9f haskell-pool-conduit: update to version 0.1.2.3 2014-04-06 21:53:22 +02:00
Peter Simons
c94833a157 haskell-pipes-safe: update to version 2.1.0 2014-04-06 21:53:22 +02:00
Peter Simons
78fc4f1083 haskell-network-conduit: update to version 1.1.0 2014-04-06 21:53:22 +02:00
Peter Simons
6bef23dd15 haskell-network-conduit-tls: update to version 1.1.0 2014-04-06 21:53:22 +02:00
Peter Simons
d5f85b022a haskell-mime-mail: update to version 0.4.5.1 2014-04-06 21:53:22 +02:00
Peter Simons
dbd66791a5 haskell-http-types: update to version 0.8.4 2014-04-06 21:53:21 +02:00
Peter Simons
7c5538a586 haskell-http-reverse-proxy: update to version 0.3.1.5 2014-04-06 21:53:21 +02:00
Peter Simons
837c45dc0a haskell-http-conduit: update to version 2.1.0 2014-04-06 21:53:21 +02:00
Peter Simons
e97158dca2 haskell-http-client: update to version 0.3.0.2 2014-04-06 21:53:21 +02:00
Peter Simons
ac9a4fc812 haskell-http-client-multipart: update to version 0.3.0.0 2014-04-06 21:53:20 +02:00
Peter Simons
77a6ba8e0b haskell-http-client-conduit: update to version 0.3.0 2014-04-06 21:53:19 +02:00
Peter Simons
a0d08de0c6 haskell-ghc-mtl: update to version 1.2.0.0 2014-04-06 21:53:19 +02:00
Peter Simons
0fc2a8e025 haskell-esqueleto: update to version 1.3.9 2014-04-06 21:53:19 +02:00
Peter Simons
7ccdd41c27 haskell-distributive: update to version 0.4.3.1 2014-04-06 21:53:19 +02:00
Peter Simons
c94198f13e haskell-diagrams-lib: update to version 1.1.0.4 2014-04-06 21:53:18 +02:00
Peter Simons
065e44f198 haskell-conduit: update to version 1.1.0 2014-04-06 21:53:18 +02:00
Peter Simons
940ba2cf76 haskell-conduit-extra: update to version 1.1.0 2014-04-06 21:53:18 +02:00
Peter Simons
5a5fe665f8 haskell-conduit-combinators: update to version 0.2.4 2014-04-06 21:53:18 +02:00
Peter Simons
005dad6f3a haskell-classy-prelude: update to version 0.8.3.1 2014-04-06 21:53:18 +02:00
Peter Simons
3c44347262 haskell-classy-prelude-conduit: update to version 0.8.1 2014-04-06 21:53:18 +02:00
Peter Simons
2b2ddb5165 haskell-checkers: update to version 0.3.2 2014-04-06 21:53:18 +02:00
Peter Simons
b19cfe15ae haskell-blaze-builder-conduit: update to version 1.1.0 2014-04-06 21:53:18 +02:00
Peter Simons
5f8857d4f5 haskell-basic-prelude: update to version 0.3.8 2014-04-06 21:53:17 +02:00
Peter Simons
6a8decdf58 haskell-aws: update to version 0.8.6 2014-04-06 21:53:17 +02:00
Peter Simons
713bac5351 haskell-attoparsec-conduit: update to version 1.1.0 2014-04-06 21:53:17 +02:00
Peter Simons
db1a390d9d haskell-hlint: update to version 1.8.60 2014-04-06 21:53:17 +02:00
Peter Simons
bda2594998 haskell-language-ecmascript: update to version 0.16.1 2014-04-06 21:53:17 +02:00
Peter Simons
9b4cd56e99 haskell-hspec: update to version 1.9.1 2014-04-06 21:53:17 +02:00
Peter Simons
481df7e6cd haskell-hoogle: update to version 4.2.31 2014-04-06 21:53:17 +02:00
Peter Simons
b605e51010 haskell-hint: update to version 0.4.1.0 2014-04-06 21:53:17 +02:00
Peter Simons
8c022626b2 haskell-hakyll: update to version 4.5.0.1 2014-04-06 21:53:16 +02:00
Peter Simons
ee105b4a94 haskell-fb: update to version 1.0 2014-04-06 21:53:16 +02:00
Peter Simons
36ac60f757 haskell-dns: update to version 1.2.1 2014-04-06 21:53:16 +02:00
Peter Simons
9000db8b1e haskell-git-annex: update to version 5.20140402 2014-04-06 21:53:16 +02:00
Peter Simons
267a1692f3 haskell-fdo-notify: add version 0.3.1 2014-04-06 21:53:16 +02:00
Peter Simons
483e2d7d7d haskell-smtps-gmail: update to version 1.1.1 2014-04-06 21:53:16 +02:00
Peter Simons
070f071469 cosmetic: re-generate expressions with cabal2nix 2014-04-06 21:53:16 +02:00
Peter Simons
7863956686 haskell-trifecta: update to version 1.4.2 2014-04-06 21:53:15 +02:00
Austin Seipp
ef903555fd gradm: learn of all accesses for /nix/store 
This is necessary for gradm's learning mode to work, as otherwise the
/nix/store directory is marked hidden, which causes the kernel to reject
the linker loading ld-linux.so

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-06 21:51:35 +02:00
Austin Seipp
784062214c gradm: fix gradm_pam path 
We alredy rewrote /sbin/gradm, which technically matches
/sbin/gradm_pam, so this ends up working exactly as we want. Otherwise
we rewrite twice and gradm can't execute the PAM module with '-p'

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-06 21:51:26 +02:00
Vladimír Čunát
b4399324c1 cinnamon gschemas: fix wrong and pointless part 2014-04-06 21:40:55 +02:00
Vladimír Čunát
2b8002e44b cinnamon: fixup gschemas 2014-04-06 21:20:23 +02:00
Luca Bruno
43dc48845b gnome-system-log: remove duplicated preFixup attribute 2014-04-06 20:49:50 +02:00
Peter Simons
a0d3aacd87 Merge pull request #2149 from thoughtpolice/spiped 
spiped: version 1.3.1
 2014-04-06 20:48:51 +02:00
Vladimír Čunát
447509adab Merge pull request #2148 from lethalman/gnome3-packages 
add gnome3 backgrounds, dictionary, grilo, totem

also fix evaluation
 2014-04-06 20:06:57 +02:00
Austin Seipp
8d3d50191d spiped: version 1.3.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-06 11:07:35 -05:00
Shea Levy
79c9d556e0 Add sproxy-web 2014-04-06 11:10:01 -04:00
Shea Levy
331d234ef6 Add sproxy 2014-04-06 10:54:44 -04:00
Luca Bruno
56709a0ac9 gnome-disk-utility: remove duplicated preFixup attribute 2014-04-06 15:23:12 +02:00
Luca Bruno
289d554bab totem: new package 
Movie player for the GNOME desktop based on GStreamer

https://wiki.gnome.org/Apps/Videos
 2014-04-06 15:23:12 +02:00
Luca Bruno
994a1ee4ef grilo: new package 
Framework that provides access to various sources of multimedia content, using a pluggable system

https://wiki.gnome.org/action/show/Projects/Grilo
 2014-04-06 15:23:12 +02:00
Luca Bruno
eca21f1926 totem-pl-parser: new package 
Simple GObject-based library to parse and save a host of playlist formats

https://wiki.gnome.org/Apps/Videos
 2014-04-06 15:23:12 +02:00
Luca Bruno
c70c038624 gnome-dictionary: new package 
Dictionary is the GNOME application to look up definitions

https://wiki.gnome.org/Apps/Dictionary
 2014-04-06 15:23:11 +02:00
Luca Bruno
5174e6db80 gnome-backgrounds: new package 2014-04-06 15:23:11 +02:00
Domen Kožar
29bc5feb1d Merge pull request #2139 from lethalman/gnome3 
Fix gsettings schemas usage for several packages due to #1901
 2014-04-06 13:59:46 +02:00
Shea Levy
0bab5319cc Merge branch 'pastebinit' of git://github.com/lethalman/nixpkgs 
pastebinit: new package
 2014-04-06 07:16:46 -04:00
Mathijs Kwik
6249cc729e add haskell-syntactic-1.11 2014-04-06 11:47:47 +02:00
Mathijs Kwik
773ce7aa32 add haskell-tree-view-0.4 2014-04-06 11:47:46 +02:00
Mathijs Kwik
cdc4c7039d add haskell-data-hash-0.2.0.0 2014-04-06 11:47:46 +02:00
Mathijs Kwik
b36f6ce3d4 ghc-mod: upgrade to 4.0.1 2014-04-06 11:47:46 +02:00
Mathijs Kwik
7f6a2f81b9 idris: upgrade to 0.9.12 2014-04-06 11:47:46 +02:00
Mathijs Kwik
c01cc1a0e4 add haskell-cheapskate-0.1.0.1 (markdown processor) 2014-04-06 11:47:45 +02:00
Luca Bruno
1653c118bd pastebinit: new package 
A software that lets you send anything you want directly to a pastebin from the command line

https://launchpad.net/pastebinit
 2014-04-06 11:10:24 +02:00
Luca Bruno
35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901 
Also add icons to epiphany
 2014-04-06 11:02:21 +02:00
Emery Hemingway
09cdc6edf5 f2fs-tools,ncdc: set platform and add myself to maintainers 2014-04-05 21:31:40 -04:00
Shea Levy
5441b1a98b Merge branch 'teamviewer-fix-upgrades' of git://github.com/bjornfor/nixpkgs 
teamviewer: fix brokenness after updates / GC
 2014-04-05 18:55:48 -04:00
Shea Levy
d35619429a Merge branch 'cache.su' of git://github.com/wkennington/nixpkgs 
su: Make the su package a provider of only the su binary

Fixes #1877
 2014-04-05 18:49:30 -04:00
Shea Levy
add2fafffb Merge branch 'master.nmap' of git://github.com/wkennington/nixpkgs 
nmap: Build the non-graphical version by default
 2014-04-05 18:40:18 -04:00
Shea Levy
a68c12d35b git: Remove phony not-supported wrappers. 
Fixes #1751
 2014-04-05 18:39:53 -04:00
Bjørn Forsman
31ab1fd7ae teamviewer: fix brokenness after updates / GC 
Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
paths become garbage collected, teamviewer crashes upon start because of
those broken symlinks. An easy workaround to this behaviour is simply to
delete all symlinks before we start teamviewer. Teamviewer will fixup
the symlinks, just like it did the first time the user ran it.
 2014-04-06 00:23:59 +02:00
William A. Kennington III
28ab3acb58 su: Make the su package a provider of only the su binary 
Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
 2014-04-05 16:01:52 -05:00
Michael Raskin
9233723353 Temporary patch for Wireshark build 2014-04-06 00:57:35 +04:00
Shea Levy
acb13c4b50 Merge branch 'make-cpufrequtils-pure' of git://github.com/alexanderkjeldaas/nixpkgs 
Make cpufrequtils compilation pure.
 2014-04-05 16:42:30 -04:00
William A. Kennington III
47f0f34fca nmap: Build the non-graphical version by default 2014-04-05 14:58:49 -05:00
Shea Levy
12c1321fa4 Merge branch 'master' of git://github.com/urv/nixpkgs 
calibre: upgrade from 1.25.0 to 1.31.0
 2014-04-05 15:56:55 -04:00
Shea Levy
9d544e633a mailutils is broken. 
#887
 2014-04-05 15:55:16 -04:00
Shea Levy
50a0b55a01 Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs 
Update ffmpeg dependency to 0.10 in oraclejdk7
 2014-04-05 15:23:02 -04:00
Shea Levy
bd1a95ee60 Remove superfluous newline 2014-04-05 15:01:05 -04:00
Shea Levy
0fda39ee3e Merge branch 'mtpfs' of git://github.com/qknight/nixpkgs 
added mtpfs to mount MTP devices via usb using FUSE
 2014-04-05 15:00:38 -04:00
Sander van der Burg
dc614aff92 libresample: Add package 2014-04-05 20:54:47 +02:00
Shea Levy
63d91b75a1 Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs" 
It turns out this doesn't work due to setuid issues. I had been under
the impression that it was partially broken, but it is in fact totally
broken.

This reverts commit 718466074f, reversing
changes made to ea9c8d6a13.
 2014-04-05 14:43:00 -04:00
Shea Levy
718466074f Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs 
Wrap k3b with PATH to required tools
 2014-04-05 14:38:06 -04:00
Shea Levy
ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs 
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
 2014-04-05 14:23:29 -04:00
Jaka Hudoklin
413ebfb246 virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support 
- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
 2014-04-05 18:37:05 +02:00
Vladimír Čunát
85b1ede2bf glib gschemas hook: fixup #1901 
- move frome $out to $out/share
- fix quoting that prevented globbing
- indent by spaces (as it is more common in nixpkgs; 4 spaces for shell)

More work is still needed for some individual packages.
 2014-04-05 13:01:51 +02:00
Alexander Kjeldaas
4aeb10b09a Make cpufrequtils compilation pure. 2014-04-05 09:08:05 +02:00
Alexander Kjeldaas
f67015cae4 Make initrd and the kernel builds repeatable. 2014-04-05 08:41:06 +02:00
Alexander Kjeldaas
c69eb7c2c1 Remove timestamp from the kernel. 2014-04-05 08:40:55 +02:00
Domen Kožar
13bef7f403 Merge pull request #2127 from lethalman/gnome3 
Gnome3 session changes, gnome-control-center icons
 2014-04-05 00:35:06 +02:00
Luca Bruno
750d5e4a83 gnome-control-center: show icons 2014-04-05 00:32:19 +02:00
Peter Simons
6df2b09015 haskell-ghc-mod: revert update to version 4.x 
flymake-mode no longer works in the new version. This needs further
testing before we can upgrade.
 2014-04-05 00:21:12 +02:00
Peter Simons
7b7d06f91e Merge pull request #2123 from jagajaga/haskell_add_pkgs 
Haskell add pkgs
 2014-04-04 23:52:13 +02:00
Vladimír Čunát
10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840) 
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
 2014-04-04 21:33:55 +02:00
Vladimír Čunát
4ab58240a9 pidgin: adopt the orphan, as I use it daily 
CC #992.
 2014-04-04 20:29:49 +02:00
Domen Kožar
9f96b8e43d Merge pull request #2125 from lethalman/gnome-disk-utility 
Gnome disk utility, libpwquality, libdvdread
 2014-04-04 19:04:33 +02:00
Bjørn Forsman
d2ca851c04 python-autopep8: new package 
autopep8 is a tool that automatically formats Python code to conform to
the PEP 8 style guide.

https://pypi.python.org/pypi/autopep8/
 2014-04-04 16:48:10 +02:00
Luca Bruno
a86c688e66 gnome-disk-utility: new package 
A udisks graphical front-end

http://en.wikipedia.org/wiki/GNOME_Disks
 2014-04-04 16:17:57 +02:00
Luca Bruno
13f40aea33 libpwquality: factor out from gnome-control-center 2014-04-04 16:14:59 +02:00
Luca Bruno
1abd4b2264 libdvdread: update to 4.2.1 2014-04-04 16:04:26 +02:00
Arseniy Seroka
d89138f6ac vacuum-graphviz: add jailbreak 2014-04-04 17:04:32 +04:00
Arseniy Seroka
ece01ad65f vacuum-graphviz: add pkg 2014-04-04 16:35:44 +04:00
Matej Cotman
7df1ce5088 syncthing: new package and nixos module 2014-04-04 10:46:29 +02:00
Arvin Moezzi
f82b678508 calibre: upgrade from 1.25.0 to 1.31.0 2014-04-04 09:25:32 +02:00
Peter Simons
f2cb92f5d4 maxima: update to version 5.33.0 2014-04-03 20:13:35 +02:00
Oliver Charles
c4339a029e haskellPackages.twitterConduit: New expression 
I've had to patch authenticate-oauth to get this working. The patch
comes from a commit that's already in master, so future versions will
have this and it's ok if cabal2nix ends up discarding this information.
 2014-04-03 14:25:37 +01:00
Shea Levy
9a396b3840 Merge branch 'haskell-ftphs' of git://github.com/fmap/nixpkgs 
Added a derivation for Goerzen's `ftphs`
 2014-04-03 05:08:47 -04:00
Evgeny Egorochkin
5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
Evgeny Egorochkin
91dd38ab79 perlPackages.TermReadLineGnu: update from 1.20 to 1.24 2014-04-03 10:42:27 +03:00
Evgeny Egorochkin
dd01251657 perlPackages.TestWarn: update from 0.24 to 0.30 2014-04-03 10:40:05 +03:00
Evgeny Egorochkin
586d19d787 mc: update from 4.8.11 to 4.8.12 2014-04-03 10:32:28 +03:00
Evgeny Egorochkin
9b4080b7af mercurialFull: update from 2.9.1 to 2.9.2 2014-04-03 10:28:15 +03:00
Evgeny Egorochkin
9cc46ebd92 ipmiutil: update from 2.9.2 to 2.9.3 2014-04-03 10:26:55 +03:00
Evgeny Egorochkin
bf8991175a global: update from 6.2.9 to 6.2.12 2014-04-03 10:22:59 +03:00
Vladimír Čunát
685d5a02a2 mesa: disable tests again 
Still affected by https://bugs.freedesktop.org/show_bug.cgi?id=67672
 2014-04-03 09:13:54 +02:00
vi
5150da8a5c Added a derivation for Goerzen's ftphs. 2014-04-03 13:41:36 +08:00
Evgeny Egorochkin
901a2fc581 manpages: update from 3.62 to 3.63 2014-04-03 07:59:39 +03:00
Evgeny Egorochkin
3830fa8195 add git repositry and meta.branch 2014-04-03 07:55:17 +03:00
Evgeny Egorochkin
4bdf7f4bea liboauth: update from 1.0.1 to 1.0.2 2014-04-03 07:54:09 +03:00
Evgeny Egorochkin
899fd2942a units: update from 2.02 to 2.10 2014-04-03 07:46:21 +03:00
Evgeny Egorochkin
8654b6b51c perlPackages.GD: update from 2.50 to 2.53 2014-04-03 07:36:35 +03:00
Evgeny Egorochkin
bf0bc1044d youtubeDL: update from 2014.03.30.1 to 2014.04.02 2014-04-03 07:27:31 +03:00
Evgeny Egorochkin
9f957d054f hostapd: update from 2.0 to 2.1 2014-04-03 07:05:07 +03:00
Evgeny Egorochkin
7973471c7b perlPackages.IOSocketInet6: update from 2.71 to 2.72 2014-04-03 07:03:26 +03:00
Shea Levy
0c66dbaee6 Enable CC_STACKPROTECTOR_REGULAR on linux 3.14+ 2014-04-02 17:58:54 -04:00
Gergely Risko
44190ff1b9 Update ffmpeg dependency in oraclejdk7 2014-04-02 23:36:47 +02:00
ambrop7@gmail.com
0b1e408b6b vlc: Build with VDPAU support (close #2096) 2014-04-02 23:14:18 +02:00
Vladimír Čunát
7b6225c3a4 mesa: try enabling tests again 
I know this doesn't really belong into this branch, but rebuilding time
is expensive (and I forgot in x-updates).

Tests do work locally for me, but we might hit that mentioned bug again.
 2014-04-02 21:37:27 +02:00
Cillian de Róiste
0119561d99 nodePackages: add react.js and update node-packages-generated.nix 2014-04-02 21:07:30 +02:00
Vladimír Čunát
8146737127 Merge #2090: add new lockdep tool from Linux 3.14 2014-04-02 20:55:30 +02:00
Domen Kožar
e6a94d8c8e Merge pull request #2110 from lethalman/gnome-font-viewer 
gnome-font-viewer: new package
 2014-04-02 19:31:08 +02:00
Domen Kožar
cdad7e6ddf Merge pull request #2104 from lethalman/gnome-calculator 
gnome-calculator: new package
 2014-04-02 19:30:59 +02:00
Vladimír Čunát
c4371afd06 stdenv/setup.sh: make substitute* not drop EOF newline 
This should solve #1982.
 2014-04-02 19:07:59 +02:00
Vladimír Čunát
1ed628acb2 gcc-wrapper: don't fail when cpp doesn't exist 
This is fixup for 1d3917bb #1820. Gnatboot doesn't have cpp.
 2014-04-02 19:07:58 +02:00
Vladimír Čunát
23d38a3e22 gcc44: disable parallel build 
Maybe 4.4 is no longer needed? #699
 2014-04-02 19:07:58 +02:00
Vladimír Čunát
1f6a15d7de Merge #1901: add preFixupPhases to stdenv; for gsettings 
Without this stdenv change it seems difficult to fix some glib's gsettings issues,
as the folders in question may (not) be created in installPhase.
 2014-04-02 19:06:41 +02:00
Vladimír Čunát
1046b4ccab Merge #1905: perl: disable tests that involve networking 
I rebased the branch not to include newer changes from master.
 2014-04-02 19:06:10 +02:00
Vladimír Čunát
de11c288c1 gcc-wrapper: preferLocalBuild, as it does little work 
This is re-revert of e31523a369.
 2014-04-02 19:05:57 +02:00
Bjørn Forsman
25f0b7cb50 gcc-{,cross-}wrapper: add 'cpp' wrapper (close #1820) 
The gcc-wrapper doesn't wrap 'cpp'. This breaks some software (such as
Buildroot) because the 'cpp' they get come from the non-wrapped gcc
package which doesn't know about any standard include paths.

gcc-cross-wrapper is untested.
 2014-04-02 19:05:57 +02:00
Vladimír Čunát
267d0a5ab6 Merge #1633: --enable-symlinks in ncurses and e2fsprogs 2014-04-02 19:05:56 +02:00
Vladimír Čunát
457fdb3842 texinfo: move ncurses support into texinfoInteractive 
This, for example, drops the stdenv dependency on ncurses.
 2014-04-02 19:05:56 +02:00
Vladimír Čunát
11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Luca Bruno
79a4148aa2 gnome-font-viewer: new package 
Program that can preview fonts and create thumbnails for fonts
 2014-04-02 18:33:00 +02:00
Peter Simons
cf4142b015 haskell-bytestring-show: update to version 0.3.5.6 2014-04-02 18:17:02 +02:00
Peter Simons
1237886a91 haskell-cabal2nix: update to version 1.61 2014-04-02 18:17:02 +02:00
Peter Simons
41cfbc1a82 haskell-unix-bytestring: update to version 0.3.7.2 2014-04-02 18:17:02 +02:00
Peter Simons
c073ab5f92 haskell-snap-server: update to version 0.9.4.2 2014-04-02 18:17:02 +02:00
Peter Simons
ed119be3f1 haskell-shakespeare-css: update to version 1.0.7.4 2014-04-02 18:17:02 +02:00
Peter Simons
9415c34e3d haskell-ghc-mod: update to version 4.0.0 2014-04-02 18:17:02 +02:00
Peter Simons
aac6abb8db Merge pull request #2102 from nilcons/lensdatetime 
Update lens-datetime to 0.2.1
 2014-04-02 18:16:41 +02:00
Peter Simons
088f103f40 Merge pull request #2107 from nilcons/mathfunctions 
Disable check for haskell/math-functions, it fails on i686
 2014-04-02 18:14:01 +02:00
Peter Simons
d8246a41bb Merge pull request #2108 from nilcons/chart 
Jailbreak the whole haskell/Chart "ecosystem", not just Chart
 2014-04-02 18:12:58 +02:00
Peter Simons
4e875dd3ff esniper: update to version 2.29.0 2014-04-02 17:44:10 +02:00
Gergely Risko
53ce02b7c0 Jailbreak the whole haskell/Chart "ecosystem", not just Chart 2014-04-02 17:29:33 +02:00
Gergely Risko
e33d79dd54 Disable check for haskell/math-functions, it fails on i686 2014-04-02 17:07:44 +02:00
Domen Kožar
80a03f665d Merge branch 'x-updates' 2014-04-02 15:30:52 +02:00
Ricardo M. Correia
52d233af22 grsecurity: Update stable patch from 3.0-3.2.55-201403300851 -> 3.0-3.2.56-201404012135 2014-04-02 15:11:33 +02:00
Ricardo M. Correia
e8c6c60b93 linux: Update to 3.2.56 2014-04-02 15:11:32 +02:00
Shea Levy
90cf41c0d7 mariadb: Bump 2014-04-02 09:05:01 -04:00
Luca Bruno
c928d1b4bc gnome-calculator: new package 
Application that solves mathematical equations
and is suitable as a default application in a Desktop environment

https://wiki.gnome.org/action/show/Apps/Calculator
 2014-04-02 14:05:41 +02:00
Gergely Risko
dddb15668e Update lens-datetime to 0.2.1 2014-04-02 13:07:34 +02:00
Domen Kožar
f7b19ea8b3 typo 2014-04-02 12:40:59 +02:00
Luca Bruno
1b042b7b35 gnome-system-log: new package 
Graphical, menu-driven viewer that you can use to view and monitor your system logs

https://help.gnome.org/users/gnome-system-log/3.9/
 2014-04-02 12:40:59 +02:00
Ricardo M. Correia
407a6857c6 grsecurity: Update stable and test patches 
stable: 3.0-3.2.55-201403252026 -> 3.0-3.2.55-201403300851
test:   3.0-3.13.7-201403252047 -> 3.0-3.13.8-201404011912
 2014-04-02 02:16:59 +02:00
Domen Kožar
75fb34eb6d add pythonPackages.gunicorn 2014-04-01 13:44:37 +00:00
Luca Bruno
db2f743156 gnome-screenshot: new package 
Utility used in the GNOME desktop environment for taking screenshots

http://en.wikipedia.org/wiki/GNOME_Screenshot
 2014-04-01 14:48:00 +02:00
Domen Kožar
886320136e bittorrentSync: use versioned url for download 2014-04-01 13:25:48 +02:00
Vladimír Čunát
0fd5a3af0c libyaml: minor update to fix CVE-2014-2525 2014-04-01 11:30:16 +02:00
Austin Seipp
19bc051ca1 kernel: stable/longterm updates 
- longterm: 3.4.83  -> 3.4.85
 - longterm: 3.10.33 -> 3.10.35
 - longterm: 3.12.14 -> 3.12.15
 - stable:   3.13.7  -> 3.13.8

NOTE: This will break the testing grsec kernel at the moment (there's
not a 3.13.8 patch yet), but it's destined to be upgraded to 3.14 soon
anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 11:11:10 +02:00
Vladimír Čunát
44f4862041 xorg.xtrans: maintenance update 2014-04-01 10:53:34 +02:00
Austin Seipp
010688a763 btsync: 1.2.91 -> 1.3.77 
This also does some various cleanup on the build process. In particular,
patchelf was not properly setting the rpath so e.g. librt and libm did
not point into glibc inside the Nix store on my Ubuntu system. This
properly sets the library paths on installation.

Also, the download URL for BitTorrent Sync changed, which is incredibly
annoying, because the URL doesn't encode version information. So maybe
this will fail later. :(

(A final note: this also changes the package name from 'btsync-bin' to
just 'btsync', and cleans up some meta attributes.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 03:52:43 -05:00
Vladimír Čunát
6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Austin Seipp
7288f25bd1 kernel: stable/longterm updates 
- longterm: 3.4.83  -> 3.4.85
 - longterm: 3.10.33 -> 3.10.35
 - longterm: 3.12.14 -> 3.12.15
 - stable:   3.13.7  -> 3.13.8

NOTE: This will break the testing grsec kernel at the moment (there's
not a 3.18.8 patch yet), but it's destined to be upgraded to 3.14 soon
anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 03:03:00 -05:00
Austin Seipp
4202a9315a grsecurity: add myself to maintainer list 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 02:59:53 -05:00
Austin Seipp
1459896be1 kernel: add myself to maintainer list 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 02:59:20 -05:00
aszlig
51e449aabb
chromium: Fix build of beta and dev channels. 
Okay, now this time we really broke beta and dev, because python_arch no
longer is in build/common.gypi anymore.

This just adds chrome/chrome_tests.gypi to the list of files to be
changed by sed.

Also, this time I did test at least whether gyp is running fine and
interrupted after the first 1000 build targets, so all channels *should*
now build fine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-04-01 09:33:04 +02:00
Austin Seipp
bdff718c5b kernel: add lockdep expression 
Lockdep is the kernel's locking validation/debugging tool and has seen
heavy pro-active usage and development. In Linux 3.14, it's now
available directly to userspace for the same purpose. It comes with a
convenient utility to LD_PRELOAD a shared library for validation, or a
user-space API to link to directly.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 01:20:46 -05:00
Austin Seipp
9493159017 kernel: remove 3.11 series (EOL) 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-01 00:56:23 -05:00
aszlig
1ae4db3a80
chromium: Fix build of stable channel. 
Build failure on Hydra:

https://hydra.nixos.org/build/9823160

This was caused by the update of file in 5885709.

As file seems to be used for only one substition in the gyp files, we
can now drop the build dependency on file and patch out the substition
expression, as it is done before actually testing if the value has been
set by -D (gyp, y u no have lazy eval!?).

PS: Proudly untested against beta and dev channels, redeployed my own
Hydra and building on my workstation here really is ... annoying (lavg
41 on a system with nproc 8, less than 8 GB RAM and you probably will
have as much "fun" as I just had writing this commit mess...a....g

FUCK^H^H^H^H^H^H...e).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-04-01 04:01:58 +02:00
Shea Levy
304fd16d95 Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs 
concurrencykit: version 0.4.1
 2014-03-31 21:50:42 -04:00
Austin Seipp
92192847fc concurrencykit: version 0.4.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-31 20:49:50 -05:00
Shea Levy
b86d946631 Merge branch 'ccid' of git://github.com/ambrop72/nixpkgs 
ccid: Bump to 1.4.16.
 2014-03-31 21:00:15 -04:00
Shea Levy
2d4ce25b5b Add linux 3.14 2014-03-31 20:54:47 -04:00
Sander van der Burg
073eab850a slasp: Add nodejs package + update other nodejs packages 2014-04-01 00:28:23 +02:00
ambrop7@gmail.com
e1c55a346a ccid: Bump to 1.4.16. 2014-04-01 00:08:57 +02:00
Peter Simons
f06bcd84bf Merge pull request #2082 from cpages/update 
Updates for maintained packages
 2014-03-31 23:13:38 +02:00
Peter Simons
69b53c990a structured-haskell-mode: re-generate with latest cabal2nix 2014-03-31 23:10:56 +02:00
Peter Simons
a20d5da92e Merge pull request #2084 from thoughtpolice/security 
Add tools: p0f & hashcat
 2014-03-31 23:06:10 +02:00
Peter Simons
61fb503eb7 haskell-http-types: jailbreak to fix build with recent case-insensitive 2014-03-31 22:46:41 +02:00
Karn Kallio
5d68efd230 aldor: update to 1.2.0 version in development. 2014-03-31 21:41:20 +02:00
Karn Kallio
db21a0da97 pakcs: update hash for 1.11.3 release, which was updated without a version change. 2014-03-31 21:40:50 +02:00
Peter Simons
68409a0981 haskell-cake3: update to version 0.4.0.0 2014-03-31 21:39:27 +02:00
Peter Simons
80fd70f759 haskell-xss-sanitize: update to version 0.3.5.2 2014-03-31 21:39:27 +02:00
Peter Simons
1cd1c489a8 haskell-type-level-natural-number: update to version 2.0 2014-03-31 21:39:27 +02:00
Peter Simons
dd6092c5e5 haskell-stm-chans: update to version 3.0.0.2 2014-03-31 21:39:26 +02:00
Peter Simons
d46048907e haskell-smtps-gmail: update to version 1.1.0 2014-03-31 21:39:26 +02:00
Peter Simons
0560805bdf haskell-process-conduit: update to version 1.0.0.2 2014-03-31 21:39:26 +02:00
Peter Simons
e4ee9e3f8f haskell-hastache: update to version 0.6.0 2014-03-31 21:39:26 +02:00
Peter Simons
2ec626f196 haskell-digestive-functors: update to version 0.7.1.0 2014-03-31 21:39:26 +02:00
Peter Simons
d10dea86e4 haskell-bytestring-lexing: update to version 0.4.3.2 2014-03-31 21:39:26 +02:00
Peter Simons
0a150f97c8 haskell-conduit-extra: this package doesn't contain any modules, so we cannot have documentation 
Apparently, Michael Snoyman made all his code depend on an empty package
just in case it turns out that the extra dependency might come in useful
in the future. Go figure.
 2014-03-31 21:39:26 +02:00
Peter Simons
a5c678110b haskell-yesod: update to version 1.2.5.2 2014-03-31 21:39:26 +02:00
Peter Simons
6c72ef973c haskell-yesod-test: update to version 1.2.1.2 2014-03-31 21:39:26 +02:00
Peter Simons
a540080b0c haskell-yesod-static: update to version 1.2.2.4 2014-03-31 21:39:26 +02:00
Peter Simons
03d2b99537 haskell-yesod-form: update to version 1.3.8.1 2014-03-31 21:39:26 +02:00
Peter Simons
11679b331a haskell-yesod-core: update to version 1.2.9.2 2014-03-31 21:39:26 +02:00
Peter Simons
564f192d33 haskell-yesod-bin: update to version 1.2.7.4 2014-03-31 21:39:26 +02:00
Peter Simons
900abbfa21 haskell-yesod-auth: update to version 1.3.0.2 2014-03-31 21:39:26 +02:00
Peter Simons
ab6453c483 haskell-yaml: update to version 0.8.8.1 2014-03-31 21:39:26 +02:00
Peter Simons
bc9140a608 haskell-xml-conduit: update to version 1.2.0.1 2014-03-31 21:39:26 +02:00
Peter Simons
cb81cfeaa9 haskell-warp: update to version 2.1.3.3 2014-03-31 21:39:26 +02:00
Peter Simons
3e2eb89cb6 haskell-warp-tls: update to version 2.0.3.2 2014-03-31 21:39:26 +02:00
Peter Simons
12ec59aa77 haskell-wai: update to version 2.1.0.1 2014-03-31 21:39:26 +02:00
Peter Simons
d16e52b872 haskell-wai-websockets: update to version 2.1.0.1 2014-03-31 21:39:25 +02:00
Peter Simons
b217dfc617 haskell-wai-test: update to version 2.0.1.1 2014-03-31 21:39:25 +02:00
Peter Simons
f312041fc4 haskell-wai-handler-launch: update to version 2.0.1.2 2014-03-31 21:39:25 +02:00
Peter Simons
4c8d2419b5 haskell-wai-extra: update to version 2.1.1.1 2014-03-31 21:39:25 +02:00
Peter Simons
a893fa5b75 haskell-system-filepath: update to version 0.4.10 2014-03-31 21:39:25 +02:00
Peter Simons
eaa032aa92 haskell-snap-server: update to version 0.9.4.1 2014-03-31 21:39:25 +02:00
Peter Simons
df7e61047d haskell-snap-core: update to version 0.9.6.2 2014-03-31 21:39:25 +02:00
Peter Simons
3d534a268e haskell-resourcet: update to version 0.4.10.2 2014-03-31 21:39:25 +02:00
Peter Simons
429e248af7 haskell-project-template: update to version 0.1.4.1 2014-03-31 21:39:25 +02:00
Peter Simons
20395fd9d3 haskell-postgresql-simple: update to version 0.4.2.1 2014-03-31 21:39:25 +02:00
Peter Simons
9b61153ce3 haskell-pool-conduit: update to version 0.1.2.2 2014-03-31 21:39:25 +02:00
Peter Simons
48600834ca haskell-persistent: update to version 1.3.0.6 2014-03-31 21:39:25 +02:00
Peter Simons
a7828e9cc5 haskell-persistent-template: update to version 1.3.1.3 2014-03-31 21:39:25 +02:00
Peter Simons
d819420709 haskell-persistent-sqlite: update to version 1.3.0.5 2014-03-31 21:39:25 +02:00
Peter Simons
818bf53040 haskell-persistent-postgresql: update to version 1.3.0.5 2014-03-31 21:39:25 +02:00
Peter Simons
7448e13d57 haskell-mono-traversable: update to version 0.4.0.4 2014-03-31 21:39:25 +02:00
Peter Simons
1139e22b09 haskell-monad-logger: update to version 0.3.4.1 2014-03-31 21:39:25 +02:00
Peter Simons
fb4ae347f1 haskell-language-c: update to version 0.4.3 2014-03-31 21:39:25 +02:00
Peter Simons
a839273d87 haskell-http-reverse-proxy: update to version 0.3.1.4 2014-03-31 21:39:25 +02:00
Peter Simons
896df7da5a haskell-html-conduit: update to version 1.1.0.4 2014-03-31 21:39:24 +02:00
Peter Simons
5996a836a6 haskell-cryptohash-conduit: update to version 0.1.1 2014-03-31 21:39:24 +02:00
Peter Simons
b0b0d8603c haskell-classy-prelude: update to version 0.8.2 2014-03-31 21:39:24 +02:00
Peter Simons
4d8821a7c5 haskell-basic-prelude: update to version 0.3.7 2014-03-31 21:39:24 +02:00
Peter Simons
9af5b2d370 haskell-authenticate: update to version 1.3.2.8 2014-03-31 21:39:24 +02:00
Peter Simons
3bb288859b haskell-HList: update to version 0.3.4.1 2014-03-31 21:39:24 +02:00
Peter Simons
c6da40c42f haskell-haddock: add version 2.14.1 2014-03-31 21:39:24 +02:00
Peter Simons
305531cbd9 haskell-case-insensitive: add version 1.2.0.0 2014-03-31 21:39:24 +02:00
Peter Simons
98b82062b0 haskell-stm: add version 2.4.3 2014-03-31 21:39:24 +02:00
Peter Simons
372e6f7f83 haskell-conduit-extra: add version 1.0.0 2014-03-31 21:39:24 +02:00
Peter Simons
9109cff1a1 haskell-streaming-commons: add version 0.1.0.2 2014-03-31 21:39:24 +02:00
Peter Simons
4a70bdf5e4 haskell-mtl: update to version 2.1.3.1 2014-03-31 21:39:24 +02:00
Domen Kožar
c6ebbd29e5 add v4l2loopback: a kernel module to create V4L2 loopback devices 2014-03-31 20:02:53 +02:00
Austin Seipp
3ef0a880cb p0f: version 3.06b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-31 11:22:50 -05:00
Austin Seipp
cff179f829 hashcat: version 0.47 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-31 10:56:02 -05:00
Oliver Charles
8d965e3a47 haskellPackages.thDesugar: Update to 1.3.1 2014-03-31 11:55:17 +01:00
Eelco Dolstra
6167da54ea gpsd: Disable the tests 
They bind to TCP ports and fail randomly:

http://hydra.nixos.org/build/9905518
 2014-03-31 11:23:44 +02:00
Vladimir Kirillov
f733eb899a remove the unbreak-syntax-highlight hack 2014-03-31 15:52:44 +08:00
Vladimir Kirillov
46ef4f6910 import thumbor and dependencies: 
derpconf, backports_ssl_match_hostname_3_4_0_2, thumborPexif,
upgrade tornado to 3.2 (that contains security fixes)
 2014-03-31 15:41:55 +08:00
Shea Levy
46e44ae7c4 haskell-mime-mail: Update, set sendmail to be found in PATH 
See snoyberg/mime-mail#23
 2014-03-31 03:35:13 -04:00
Shea Levy
4dd4f85430 Revert "haskell-smtps-gmail: update to version 1.1.0" 
The smtps-gmail upgrade causes a build failure:

/nix/store/8h8mravvbcm09rhybxq7hi4459lkssg8-stdenv/setup: line 937: ./Setup: No such file or directory

This reverts commit a7c80c11e5.
 2014-03-31 02:51:14 -04:00
Sander van der Burg
a4684466a3 Merge pull request #2078 from chrisfarms/disnix/hydrasourceurls 
Fix disnix related sources that were referencing dead hydra tarball
 2014-03-31 00:48:20 +02:00
Peter Simons
e825c6ac38 haskell-cake3: add version 0.3.0.1 2014-03-30 23:26:21 +02:00
Peter Simons
aa86cc8a7c haskell-monadloc: add version 0.7.1 2014-03-30 23:26:11 +02:00
Chris Farmiloe
5c2ef1353c Update disnix related sources that were referencing dead hydra tarball builds 2014-03-30 21:38:49 +02:00
Carles Pagès
048a7e9d9c minecraft: update to latest launcher 
I changed the versioning scheme to the latest launcher date, which is
independent of minecraft version and is actually what the expression gets.
 2014-03-30 19:34:33 +02:00
Eelco Dolstra
0fdd641b21 Ensure that slim's theme applies to slimlock 2014-03-30 19:33:28 +02:00
Carles Pagès
5d098e8206 qpid-cpp: update to 0.26 
Also, remove a workaround that's no longer needed.
 2014-03-30 19:23:01 +02:00
Carles Pagès
b372ce598a SDL2: update to 2.0.3 2014-03-30 18:32:22 +02:00
Carles Pagès
66d8a9c725 yafc: update to 1.3.2 2014-03-30 18:32:14 +02:00
Evgeny Egorochkin
d084be9965 perlPackages.HTMLTiny: update from 1.03 to 1.05 2014-03-30 19:29:17 +03:00
Evgeny Egorochkin
c53ae9b462 spaceFM: update from 0.9.2 to 0.9.4 2014-03-30 19:27:19 +03:00
Evgeny Egorochkin
6f4a62e9e4 youtubeDL: update from 2014.03.25.1 to 2014.03.30.1 2014-03-30 19:24:21 +03:00
Eelco Dolstra
aaf01268ff Revert "slim: remove duplicate code" 
This reverts commit f7d5e83abb.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
 2014-03-30 17:06:01 +02:00
Peter Simons
c394d4079d xmonad: fix build with ghc 7.8.1 2014-03-30 16:46:02 +02:00
Joachim Schiele
b894dfffb3 added mtpfs to mount MTP devices via usb using FUSE 2014-03-30 13:00:25 +02:00
Vladimir Kirillov
bad9de86b6 buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on non-linux machines 2014-03-30 14:51:36 +08:00
Vladimir Kirillov
9186f0b5dd haskell: import persistent-mysql 1.3.0.2 2014-03-30 14:51:36 +08:00
Vladimir Kirillov
390a4b9164 haskell: import git-date 0.2.1 2014-03-30 14:51:36 +08:00
Shea Levy
7612159c06 Merge branch 'mps-fix' of git://github.com/thoughtpolice/nixpkgs 
mps: broken on Darwin unfortunately
 2014-03-29 22:46:07 -04:00
Rickard Nilsson
61ecf919e1 New package: wal-e 
A Postgres WAL-shipping disaster recovery and replication toolkit
 2014-03-30 04:34:38 +02:00
Shea Levy
fd5d6044c0 Merge branch 'printrun' of git://github.com/ambrop72/nixpkgs 
Add Printrun.
 2014-03-29 22:19:29 -04:00
Shea Levy
96c3279263 Merge branch 'nvidia-fix' of git://github.com/ambrop72/nixpkgs 
nvidia-x11: Fix build with kernel 3.13
 2014-03-29 22:17:23 -04:00
Shea Levy
0553bdd148 Merge branch 'cb1cat' of git://github.com/thoughtpolice/nixpkgs 
cb0cat is now cb1cat
 2014-03-29 22:16:14 -04:00
Shea Levy
84788e75ca Merge branch 'ssdeep' of git://github.com/thoughtpolice/nixpkgs 
ssdeep: Fix darwin build
 2014-03-29 22:15:26 -04:00