Commit Graph

52024 Commits

Author SHA1 Message Date
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Vladyslav Mykhailichenko
249ba3d3ed reason: 3.3.2 -> 3.3.3 2018-08-13 15:51:23 +00:00
Léo Gaspard
9b46b273f9 ocamlModules.wasm: add wasm binary 2018-08-13 15:36:44 +00:00
Tor Hedin Brønner
34baf00b72 {qt4,qt3}: Fix breakage after eeb9837beb
- qt-4: Pass the correct configureFlags, in particular `mk` should prepend `no-`
  when `cond` is false.

- qt-3: simply revert the changes
2018-08-13 16:25:37 +02:00
Boris
a5efa6650f pythonPackages.browser-cookie3: init at 0.6.4 (#44562) 2018-08-13 14:47:06 +02:00
R. RyanTM
33e70ffad4 jimtcl: 0.77 -> 0.78 (#44762)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jimtcl/versions.
2018-08-13 14:24:25 +02:00
R. RyanTM
b3ebab2c53 pony-stable: 0.1.4 -> 0.1.6 (#44715)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pony-stable/versions.
2018-08-13 14:22:31 +02:00
Bas van Dijk
9968d0f053
Merge pull request #44948 from Izorkin/servant
servant-sphinx-documentation: fix sha256sum
2018-08-13 12:39:16 +02:00
Michael Raskin
3762495967
Merge pull request #44942 from aanderse/master
openscenegraph: 3.4.0 -> 3.6.2
2018-08-13 06:44:47 +00:00
Uri Baghin
8c802d42ad bazel: fix darwin build on hydra 2018-08-13 08:32:27 +02:00
Izorkin
fdec6b1b8d servant-sphinx-documentation: fix sha256sum 2018-08-12 23:13:23 +03:00
Aaron Andersen
0624e4939d bumped openscenegraph version from 3.4 to 3.6.2 and added more options for building it 2018-08-12 14:28:08 -04:00
Jan Tojnar
f496d26247
Merge pull request #44651 from jtojnar/gobby
gobby5: fix build
2018-08-12 17:25:07 +02:00
Silvan Mosberger
cfa49751c7
Merge pull request #44618 from alyssais/triton
triton: init at 6.1.2
2018-08-12 17:08:21 +02:00
Matthew Bauer
4c1d5a8dac
Merge pull request #44899 from bhipple/fix/antlr-license
antlr: fix license
2018-08-12 09:00:26 -05:00
Sarah Brofeldt
1d7c7cca0a
Merge pull request #44929 from periklis/package-kubectx
kubectx: init at v0.5.1
2018-08-12 12:15:49 +02:00
Periklis Tsirakidis
56b756e757 kubectx: init at v0.5.1 2018-08-12 12:02:52 +02:00
Peter Simons
8121eebb9a git-annex: update sha256 hash for the new version 2018-08-12 11:35:23 +02:00
Peter Simons
3fe0751494 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.2-2-g5e5293d from Hackage revision
42f8c34fa4.
2018-08-12 11:35:24 +02:00
Robert Schütz
4af9ee49f1
Merge pull request #44889 from Enzime/update/flootty
Remove redundant flootty package and update the correct package
2018-08-12 11:03:19 +02:00
Michael Raskin
f4f93d6dd1
Merge pull request #44847 from fare-patches/master
Update Gambit and Gerbil
2018-08-12 08:34:04 +00:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Sarah Brofeldt
50674becf6
Merge pull request #44713 from vbgl/coq-coq-ext-lib-0.9.8
coqPackages.coq-ext-lib: 0.9.5 -> {0.9.7,0.9.8}
2018-08-12 09:56:17 +02:00
Matthew Bauer
c391bd3dd3 xcbuild: cleanup
fix shell shebang
2018-08-11 22:54:48 -05:00
Matthew Bauer
b5d529d52f xcbuild: cleanup 2018-08-11 22:54:48 -05:00
Matthew Bauer
0edb441a0e firefox: build on darwin
Fixes #30285
2018-08-11 22:54:48 -05:00
Michael Hoang
78961b663c flootty: 3.2.1 -> 3.2.2 2018-08-12 12:46:05 +10:00
Samuel Dionne-Riel
bb3f7d14a1
Merge pull request #44679 from r-ryantm/auto-update/sundials
sundials: 3.1.1 -> 3.1.2
2018-08-11 22:12:31 -04:00
Samuel Dionne-Riel
a3722a69be
Merge pull request #44676 from yrashk/nwjs-0.32.1
nwjs: 0.23.6 -> 0.32.1
2018-08-11 22:00:46 -04:00
Franz Pletz
b5b11e9da4
Merge pull request #44900 from volth/patch-228
libvirt: fix dlopen("libjansson.so.4")
2018-08-11 20:24:11 +00:00
Bjørn Forsman
ee1b7bf831 aspellDicts: use shortName to keep DRY
Prevents typos like the ones fixed in the parent commit.
2018-08-11 21:35:37 +02:00
Bjørn Forsman
ada797e9aa aspellDicts: fix typos in shortName
Affected dicts: nn, pt_BR, pt_PT
2018-08-11 21:35:37 +02:00
Francois-Rene Rideau
d9f419bd57 gambit, gerbil: use stdenv = gccStdenv
clang builds gambit 10x slower to produce code that is 3x slower than
when using GCC. So use GCC to build Gambit and Gerbil.
2018-08-11 14:07:15 -04:00
Francois-Rene Rideau
c75576f9e8 gerbil-unstable: 2018-05-12 -> 2018-08-11 2018-08-11 14:07:05 -04:00
Vaibhav Sagar
c7596ef742 ghc861: 8.6.1-alpha2 -> 8.6.1-beta1 (#44891) 2018-08-11 19:06:36 +01:00
Michael Raskin
a68e5e918e
Merge pull request #44825 from oxij/docheck/continues-in-a-big-way
treewide: enable working, fix fixable, disable broken tests
2018-08-11 16:34:22 +00:00
volth
d46cfd2ff0
libvirt: fix dlopen("libjansson.so.4") 2018-08-11 13:58:06 +00:00
Benjamin Hipple
34d7a370c1 antlr: fix license
See #43716
2018-08-11 13:43:56 +00:00
Timo Kaufmann
921e5ceef3
Merge pull request #44894 from markuskowa/sqlite-lic
Fix licenses (#43716)
2018-08-11 15:31:29 +02:00
Markus Kowalewski
31d2f03fb9
sqsh: add license 2018-08-11 14:33:05 +02:00
Markus Kowalewski
a647d07f4c
sqlite,sqlar: add licenses 2018-08-11 14:32:05 +02:00
Jörg Thalheim
5fc5e0642b
Merge pull request #44892 from volth/patch-228
libvirt: jansson required for qemu suppport
2018-08-11 12:56:10 +02:00
Yegor Timoshenko
501607e0ee
Merge pull request #43068 from yegortimoshenko/qdigidoc
libdigidoc, libdigidocpp, qdigidoc updates
2018-08-11 13:13:22 +03:00
Jan Malakhovski
35c9435d15 binutils: disable installcheck for different targetPlatforms 2018-08-11 09:35:40 +00:00
Jan Malakhovski
a77ee3b5a5 pixman: libpng is an optional dependency, not a member of checkInputs
Since it was used before, let's keep using it.
2018-08-11 09:35:40 +00:00
Jan Malakhovski
50176ef3fc glibmm: disable tests 2018-08-11 09:35:40 +00:00
Jan Malakhovski
0a953cc803 strace: disable tests. Spooky! 2018-08-11 09:35:39 +00:00
Jan Malakhovski
441f3b548f vigra: disable tests 2018-08-11 09:35:39 +00:00
Jan Malakhovski
37f69cad82 twolame: disable tests 2018-08-11 09:35:39 +00:00