Shea Levy
1aa5589eef
Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
...
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406
Conflicts due to minor upgrade in the mean time
Conflicts:
nixos/modules/virtualisation/virtualbox-guest.nix
pkgs/applications/virtualization/virtualbox/default.nix
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2014-03-29 00:23:54 -04:00
Shea Levy
63f97fe9db
Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
...
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy
a0a135d5ef
Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs
...
z3: version 4.3.1
2014-03-28 23:54:43 -04:00
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
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
Zhang Yichao
10511b4712
add julia 0.2.1 release
2014-03-28 18:39:26 +08: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
Vladimír Čunát
abda7ec36f
liferea: maintenance update
2014-03-27 21:33:25 +01:00
Georges Dubus
b13a33550a
silver-searcher: update to 0.21.0
2014-03-27 17:57:02 +01:00
Ricardo M. Correia
a541350cb3
libvirt: Assume maintainership
2014-03-27 14:39:05 +01:00
Ricardo M. Correia
3078cf3e75
libvirt: Add git repository to meta attributes
2014-03-27 14:39:05 +01:00
Ricardo M. Correia
56adfd34fc
libvirt: Add support for macvtap and VEPA
2014-03-27 14:39:04 +01:00
Peter Simons
61efc76a63
haskell-c2hs: jailbreak to fix build with recent versions of 'shelly'
...
Also, disable the test suite because of <https://github.com/haskell/c2hs/issues/67 >.
2014-03-27 13:13:14 +01:00
Peter Simons
93c973f45f
haskell-temporary: jailbreak to fix build with recent versions of 'exceptions'
2014-03-27 13:13:14 +01:00
Peter Simons
e5725d35c1
haskell-bmp: require a recent version of 'binary'
2014-03-27 13:13:14 +01:00
Peter Simons
088a652eb4
haskell-ghc-events: jailbreak to fix build with GHC 7.8.1
2014-03-27 13:13:08 +01:00
Peter Simons
4a4439fd14
haskell-filestore: jailbreak to fix build with GHC 7.8.1
2014-03-27 13:12:54 +01:00
Peter Simons
a46352aad1
haskell-bmp: use version 1.2.5.2 on all platforms
2014-03-27 13:12:54 +01:00
Peter Simons
ae2cb475c9
haskell-cpphs: update to version 1.18.4
2014-03-27 13:12:54 +01:00
Peter Simons
b692096f9d
haskell-timeplot: update to version 1.0.24
2014-03-27 13:12:54 +01:00
Peter Simons
b27ddc3d05
haskell-HaRe: update to version 0.7.2.0
2014-03-27 13:12:54 +01:00
Peter Simons
0312c15071
haskell-zlib-bindings: update to version 0.1.1.4
2014-03-27 13:12:54 +01:00
Peter Simons
29187bc16a
haskell-wxdirect: update to version 0.90.1.1
2014-03-27 13:12:54 +01:00
Peter Simons
c53463dcee
haskell-wxcore: update to version 0.90.1.1
2014-03-27 13:12:53 +01:00
Peter Simons
bbcf732015
haskell-wxc: update to version 0.90.1.1
2014-03-27 13:12:53 +01:00
Peter Simons
d1fc054b02
haskell-warp: update to version 2.1.3
2014-03-27 13:12:53 +01:00
Peter Simons
4246511556
haskell-wai-middleware-static: update to version 0.5.0.0
2014-03-27 13:12:53 +01:00
Peter Simons
c8b03742d5
haskell-stm-conduit: update to version 2.3.0
2014-03-27 13:12:53 +01:00
Peter Simons
a566d81b41
haskell-shelly: update to version 1.5.2
2014-03-27 13:12:53 +01:00
Peter Simons
94f0403692
haskell-shakespeare-css: update to version 1.0.7.3
2014-03-27 13:12:53 +01:00
Peter Simons
0f0755da8c
haskell-semigroupoids: update to version 4.0.1
2014-03-27 13:12:53 +01:00
Peter Simons
1aa1cee4f4
haskell-lens: update to version 4.1.2
2014-03-27 13:12:53 +01:00
Peter Simons
db09633e7b
haskell-intervals: update to version 0.4.2
2014-03-27 13:12:53 +01:00
Peter Simons
8282fb8327
haskell-hybrid-vectors: update to version 0.1.2
2014-03-27 13:12:53 +01:00
Peter Simons
b1cbcea6d2
haskell-hsimport: update to version 0.3
2014-03-27 13:12:53 +01:00
Peter Simons
e61c57686b
haskell-hoogle: update to version 4.2.30
2014-03-27 13:12:53 +01:00
Peter Simons
a1060da394
haskell-ghcjs-dom: update to version 0.0.7
2014-03-27 13:12:53 +01:00
Peter Simons
45625d48a1
haskell-generic-deriving: update to version 1.6.3
2014-03-27 13:12:52 +01:00
Peter Simons
11dc7a8e2c
haskell-free: update to version 4.6.1
2014-03-27 13:12:52 +01:00
Peter Simons
76cf6b026a
haskell-doctest: update to version 0.9.11
2014-03-27 13:12:52 +01:00
Peter Simons
0a6e61033a
haskell-dlist: update to version 0.7.0.1
2014-03-27 13:12:52 +01:00
Peter Simons
81f596a32b
haskell-distributive: update to version 0.4.1
2014-03-27 13:12:52 +01:00
Peter Simons
e3309447a9
haskell-data-lens-template: update to version 2.1.8
2014-03-27 13:12:52 +01:00
Peter Simons
426f03d965
haskell-conduit: update to version 1.0.17.1
2014-03-27 13:12:52 +01:00
Peter Simons
5b726ef6ba
haskell-comonad: update to version 4.0.1
2014-03-27 13:12:52 +01:00
Peter Simons
dcc028ba74
haskell-c2hs: update to version 0.16.6
2014-03-27 13:12:52 +01:00
Peter Simons
c72248808c
haskell-adjunctions: update to version 4.0.3
2014-03-27 13:12:52 +01:00
Peter Simons
5569741808
haskell-JuicyPixels: update to version 3.1.5
2014-03-27 13:12:52 +01:00
Peter Simons
0f86e37b6c
haskell-Elm: update to version 0.12
2014-03-27 13:12:52 +01:00
Peter Simons
27ebc33d65
haskell-elm-server: update to version 0.11
2014-03-27 13:12:52 +01:00
Peter Simons
7f9558896f
haskell-tls: update to version 1.2.6
2014-03-27 13:12:51 +01:00
Peter Simons
da7fe3fe8a
haskell-QuickCheck: update to version 2.7.3
2014-03-27 13:12:51 +01:00
Peter Simons
3551e2ee06
haskell-quickcheck-instances: re-generate with cabal2nix
2014-03-27 13:12:51 +01:00
Ricardo M. Correia
342fc9c207
go: Add myself as maintainer to receive Hydra notifications
2014-03-27 12:37:18 +01:00