Commit Graph

71313 Commits

Author SHA1 Message Date
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
William A. Kennington III
a7d573f224 kernel: 3.18.22 -> 3.18.23 2015-10-30 16:08:13 -07:00
Peter Simons
9405a67858 uhc: the build is broken
src/ehc/Base/Debug.chs:22:34:
        Ambiguous occurrence `showPP'
        It could refer to either `UHC.Compiler.Base.Debug.showPP',
                                 defined at src/ehc/Base/Debug.chs:19:1
                              or `UHC.Util.Pretty.showPP',
                                 imported from `UHC.Util.Pretty' at UHC/Compiler/Base/Debug.hs:5:1-22

    src/ehc/Base/Debug.chs:28:32:
        Ambiguous occurrence `showPP'
        It could refer to either `UHC.Compiler.Base.Debug.showPP',
                                 defined at src/ehc/Base/Debug.chs:19:1
                              or `UHC.Util.Pretty.showPP',
                                 imported from `UHC.Util.Pretty' at UHC/Compiler/Base/Debug.hs:5:1-22
2015-10-30 23:16:25 +01:00
Peter Simons
e2db6af4b6 configuration-hackage2nix.yaml: update broken builds 2015-10-30 23:16:19 +01:00
Peter Simons
51ce51a60f hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-26-gcb66650 using the following inputs:

  - Nixpkgs: 62a178f86b
  - Hackage: d288879f8a
  - LTS Haskell: 4622b913dc
  - Stackage Nightly: 61e6f9dbeb
2015-10-30 23:16:10 +01:00
John Wiegley
a946805aa2 emacs24Macport: update 24.5-mac-5.11 -> 24.5-mac-5.12 2015-10-30 12:09:09 -07:00
Domen Kožar
dd1882d991 nova, keystone, glance, neutron: use correct mysql lib 2015-10-30 19:48:57 +01:00
Jude Taylor
9b4ba3c5da style fix in ffmpeg expression 2015-10-30 11:40:35 -07:00
Asko Soukka
aa12640cb9 darwin: ffmpeg: add needed inputs 2015-10-30 11:40:35 -07:00
Pascal Wittmann
75aadaeef7 Merge pull request #10725 from jb55/dragon-drop
dragon-drop: init at git-2014-08-14
2015-10-30 19:28:43 +01:00
William Casarin
a2f8585c39 dragon-drop: init at git-2014-08-14 2015-10-30 11:17:22 -07:00
Arseniy Seroka
21e2d0b264 Merge pull request #10717 from richardipsum/richardipsum/cliapp
cliapp: 1.20140719 -> 1.20150305
2015-10-30 21:07:12 +03:00
Arseniy Seroka
d0a225528b Merge pull request #10722 from steveeJ/godep
godep: init at release 17
2015-10-30 21:06:34 +03:00
Shea Levy
3c14c32975 Really disable the firmware loader user helper fallback 2015-10-30 13:31:51 -04:00
Richard Ipsum
db6ba342e9 cliapp: 1.20140719 -> 1.20150305
Also fetch from git rather than from tarball
2015-10-30 16:57:50 +00:00
Arseniy Seroka
4a889ddad0 Merge pull request #10704 from steveeJ/vim-plugins
vim-plugins: add colorschemes and colorstepper
2015-10-30 18:22:52 +03:00
Stefan Junker
d8d3c1aba9 vim-plugins: add colorschemes and colorstepper 2015-10-30 16:21:37 +01:00
Stefan Junker
40eaa5fe02 godep: init at release 17 2015-10-30 16:05:43 +01:00
Eelco Dolstra
e0596c9603 Remove apparently unnecessary use of enableDebugging 2015-10-30 15:31:47 +01:00
Shea Levy
a7157fa2f0 Remove firmware loader fallback.
Systemd dropped support in 207 (would be nice if configure failed with a bad flag),
so all this does is add an annoying delay if firmware can't be found by the kernel
2015-10-30 10:29:56 -04:00
Arseniy Seroka
99744943a4 Merge pull request #10657 from rycee/bump/cd-discid
cd-discid: 0.9 -> 1.4
2015-10-30 17:25:03 +03:00
Eelco Dolstra
d9d5c98c56 Add option environment.enableDebugInfo
This makes the debug outputs of packages that have them available to
programs like gdb.
2015-10-30 15:21:16 +01:00
Eelco Dolstra
c20403631d Factor out "man" into a separate module and add "man" outputs to system.path
Fixes #10270.
2015-10-30 15:21:12 +01:00
Eelco Dolstra
58e9440b89 Add option to link additional package outputs into system.path
This is necessary to get stuff like separate manpages, info files,
debug symbols, etc.
2015-10-30 15:21:02 +01:00
Eelco Dolstra
3e732f65cb Remove gnutar man page hack
It's no longer needed since the gnutar package contains a (much more
extensive) man page.
2015-10-30 15:20:15 +01:00
Peter Simons
dd3d3110a7 emacs-magit: update to version 2.3.0 2015-10-30 14:34:21 +01:00
Peter Simons
0608615f78 emacs-dash: update to version 2.12.1 2015-10-30 14:34:21 +01:00
Peter Simons
c9e3a8facc Merge pull request #10710 from datakurre/datakurre-irkernel
r-modules: init IRkernel packages
2015-10-30 14:21:29 +01:00
Eelco Dolstra
99fe4f97c5 xz: Update to 5.2.2 2015-10-30 13:18:21 +01:00
Domen Kožar
f55ff7c10b Merge pull request #10714 from FRidh/mock
python mock: enable for python 3.5
2015-10-30 11:32:42 +01:00
Domen Kožar
0509252e28 python: don't pass disabled to derivation 2015-10-30 11:31:19 +01:00
Domen Kožar
df6a869ea7 Merge pull request #10712 from FRidh/matplotlib
python matplotlib: 1.4.3 -> 1.5.0
2015-10-30 11:27:23 +01:00
Frederik Rietdijk
9a1b642942 python mock: enable for python 3.5 2015-10-30 11:11:54 +01:00
Eelco Dolstra
db19779965 nvidia-x11: Update to 352.55 2015-10-30 11:06:36 +01:00
Frederik Rietdijk
d320d3dcbf python matplotlib: 1.4.3 -> 1.5.0 2015-10-30 10:14:38 +01:00
Domen Kožar
a862dd2ad2 atom: 1.0.4 -> 1.1.0 2015-10-30 09:51:40 +01:00
Nikolay Amiantov
00f79aab90 Merge pull request #10464 from abbradar/encrypted-swap
nixos/swap: refactor, add randomEncryption option
2015-10-30 11:49:46 +03:00
Vladimír Čunát
4e1fdadd02 mariadb: fix non-Darwin builds after 86dae701
I took care to get the same derivation as before that commit on Linux
and not to change derivation on Darwin.
2015-10-30 09:29:02 +01:00
Vladimír Čunát
abbe5f27a9 neovim: make pynvim runnable even if not in $PATH 2015-10-30 09:21:08 +01:00
Frederik Rietdijk
798c5469d9 python cycler: init at 0.9.0 2015-10-30 09:11:47 +01:00
Domen Kožar
d52a1b3ce6 Merge pull request #10701 from dtulig/master
pyelasticsearch: init at 1.4
2015-10-30 08:48:02 +01:00
Domen Kožar
ed02ed0657 nova, neutron, keystone: add pymysql 2015-10-30 08:46:56 +01:00
Vincent Laporte
a25d7d523e ocaml-csv: 1.4.1 -> 1.4.2 2015-10-30 06:03:50 +01:00
Asko Soukka
d8e3a981c5 r-modules: init IRkernel packages 2015-10-30 03:48:23 +02:00
David Tulig
56cab134a3 pyelasticsearch: add comment that tests require an elasticsearch instance 2015-10-29 20:38:14 -05:00
Thomas Tuegel
6e44f0710a Merge pull request #10697 from bendlas/update-dropbox-master
dropbox: 3.8.9 -> 3.10.9
2015-10-29 16:42:20 -05:00
Eelco Dolstra
971430f623 Move stdenv-darwin bootstrap binaries to nixos.org
These are taken from http://hydra.nixos.org/build/27002702.
2015-10-29 22:16:06 +01:00
Jude Taylor
ce4f1098ca reduce security setup hook duplication 2015-10-29 13:56:02 -07:00
Jude Taylor
949c4017b5 emacs-24-mac: propagate frameworks 2015-10-29 13:56:02 -07:00
Vincent Laporte
7cb6dbc3d0 merlin: 2.2 -> 2.3 2015-10-29 21:35:41 +01:00