3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

41073 commits

Author SHA1 Message Date
Shea Levy 7cebcb995d Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs
Update Smartcard Utils + Fix Daemon Expression
2014-03-28 23:45:00 -04:00
Shea Levy fff798b018 Revert "ccid: Update from 1.4.14 -> 1.4.15"
ccid was already updated in master

This reverts commit a7077973a5.
2014-03-28 23:43:37 -04:00
Shea Levy 701cb6b099 Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
2014-03-28 23:39:01 -04:00
Shea Levy f3e9e3dea5 Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs
icedtea7, icedtea7_web: New packages
2014-03-28 23:25:25 -04:00
Shea Levy e0341475dc Merge branch 'master' of git://github.com/fmap/nixpkgs
Add Mnemosyne 2.2.1
2014-03-28 23:09:25 -04:00
Shea Levy 269dc17329 Merge branch 'bsdiff' of git://github.com/thoughtpolice/nixpkgs
bsdiff: adopt and clean up
2014-03-28 23:08:32 -04:00
Shea Levy 8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs
Add mps 1.113.0, fix usage of Sleepycat license
2014-03-28 23:03:20 -04:00
Shea Levy 35165063a7 Merge branch 'clang-fix-fsanitize' of git://github.com/redbaron/nixpkgs
Fix -fsanitize=... options for clang
2014-03-28 21:58:56 -04:00
Shea Levy b574394d70 Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs
Updated dwb to latest revision
2014-03-28 21:42:51 -04:00
Shea Levy 23fee1cd78 Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs
shellinabox: unhardcode /bin/login, apply vt100 '-' fixup
2014-03-28 21:38:30 -04:00
Shea Levy 1927e59308 Merge branch 'texlive-bump' of git://github.com/jacobhinkle/nixpkgs
Bump texlive download versions *0215->*0314
2014-03-28 21:36:25 -04:00
Shea Levy e1a72c00ce Merge branch 'mysql-5.5.37' of git://github.com/proger/nixpkgs
mysql upgrade to 5.5.37
2014-03-28 21:13:38 -04:00
Austin Seipp 960690e931 bsdiff: adopt and clean up
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-28 18:52:37 -05:00
Jacob Hinkle 65727f92e4 Bump texlive download versions *0215->*0314 2014-03-28 15:56:56 -06:00
Eelco Dolstra c704f6bb4e VM tests: Run hwclock in the initrd
Needed for the installer tests, since otherwise mounting a filesystem
may fail as it has a last-mounted date in the future.

http://hydra.nixos.org/build/9846712
2014-03-28 16:52:08 +01:00
Eelco Dolstra 98c3caed93 nvidia-x11: Update to 331.49 2014-03-28 16:43:56 +01:00
Sander van der Burg 7c2d4be437 deepmerge: Add nodejs package 2014-03-28 15:17:17 +01:00
Sergey Mironov 0f2d7fa6f6 shellinabox: unhardcode /bin/login, apply vt100 '-' fixup 2014-03-28 14:58:10 +04:00
Pascal Wittmann df2e5fc47a Updated dwb to latest revision 2014-03-28 10:30:36 +01:00
Vladimir Kirillov 1aabffdea2 mysql upgrade to 5.5.37 2014-03-28 11:12:20 +08:00
Peter Simons 812ece044a haskell-DAV: jailbreak to fix build with recent versions of xml-conduit 2014-03-27 23:23:22 +01:00
Peter Simons feed777cf2 haskell-language-javascript: remove pre-generated lexer and parsers to fix the build with GHC 7.8.1
https://github.com/alanz/language-javascript/issues/26
2014-03-27 23:23:22 +01:00
Peter Simons 4c8ea71d64 haskell-zlib-bindings: update to version 0.1.1.5 2014-03-27 23:23:22 +01:00
Peter Simons 3c7eb54a80 haskell-yesod: update to version 1.2.5.1 2014-03-27 23:23:22 +01:00
Peter Simons 17d4b3da50 haskell-yesod-static: update to version 1.2.2.3 2014-03-27 23:23:22 +01:00
Peter Simons cbca108acd haskell-yesod-core: update to version 1.2.9.1 2014-03-27 23:23:22 +01:00
Peter Simons a69ae620dc haskell-yesod-auth: update to version 1.3.0.1 2014-03-27 23:23:21 +01:00
Peter Simons 3de1945481 haskell-xml-hamlet: update to version 0.4.0.7 2014-03-27 23:23:21 +01:00
Peter Simons cb55852ff2 haskell-xml-conduit: update to version 1.2.0 2014-03-27 23:23:21 +01:00
Peter Simons 487a6f0971 haskell-wai-app-static: update to version 2.0.1 2014-03-27 23:23:21 +01:00
Peter Simons 0af0e1f5d6 haskell-unbounded-delays: update to version 0.1.0.7 2014-03-27 23:23:21 +01:00
Peter Simons c5d967f781 haskell-text-stream-decode: update to version 0.1.0.5 2014-03-27 23:23:21 +01:00
Peter Simons a7c80c11e5 haskell-smtps-gmail: update to version 1.1.0 2014-03-27 23:23:21 +01:00
Peter Simons 94fe963dd3 haskell-recaptcha: update to version 0.1.0.2 2014-03-27 23:23:21 +01:00
Peter Simons 8470a695ed haskell-project-template: update to version 0.1.4 2014-03-27 23:23:21 +01:00
Peter Simons 14bb8fae6d haskell-profunctors: update to version 4.0.3 2014-03-27 23:23:21 +01:00
Peter Simons 3d00b619ca haskell-linear: update to version 1.10 2014-03-27 23:23:21 +01:00
Peter Simons f0e51dd0d6 haskell-language-c-quote: update to version 0.7.7 2014-03-27 23:23:21 +01:00
Peter Simons bc1bfe32e3 haskell-http-reverse-proxy: update to version 0.3.1.2 2014-03-27 23:23:21 +01:00
Peter Simons ef9d804a32 haskell-http-client: update to version 0.2.2.4 2014-03-27 23:23:21 +01:00
Peter Simons 29bb48bc28 haskell-html-conduit: update to version 1.1.0.3 2014-03-27 23:23:21 +01:00
Peter Simons b4742af957 haskell-hakyll: update to version 4.5.0.0 2014-03-27 23:23:21 +01:00
Peter Simons 9541f82ccc haskell-failure: update to version 0.2.0.2 2014-03-27 23:23:21 +01:00
Peter Simons a330950b00 haskell-cryptohash: update to version 0.11.4 2014-03-27 23:23:21 +01:00
Peter Simons 43de5f42c7 haskell-conduit-combinators: update to version 0.2.3.1 2014-03-27 23:23:21 +01:00
Peter Simons 135c27d70a haskell-authenticate: update to version 1.3.2.7 2014-03-27 23:23:20 +01:00
Peter Simons d5a5c32775 haskell-attempt: update to version 0.4.0.1 2014-03-27 23:23:20 +01:00
Peter Simons aaebdb7b1e haskell-keter: update to version 1.2.1 2014-03-27 23:23:20 +01:00
Thomas Tuegel 5554d9c688 Add zotero 4.0.19 (close #2043)
@vcunat simplied the expression a little.
2014-03-27 22:42:47 +01:00
Vladimír Čunát 9bde84a75d fix evaluation since 34301c8 2014-03-27 21:33:25 +01:00