1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

25307 commits

Author SHA1 Message Date
Aneesh Agrawal 54ff118477 cryptol: Make Z3 available for REPL users
The Cryptol REPL has a hard dependency on Z3, but the rest of the
library uses SBV to support multiple solvers. Ensure that Z3 is
available for `pkgs.cryptol`, which is likely to be installed via
nix-env for REPL usage, but do not change pkgs.haskellPackages.cryptol,
which is likely to be used as a dependency (in Nix expressions).
2016-09-10 17:15:51 -04:00
Tuomas Tynkkynen 0dbfb0fc48 Merge commit 'bd6e40c' from staging into master
Major changes being pulled in:

- mesa: maintenance 12.0.1 -> 12.0.2
- texlive: 2015 -> 2016
2016-09-10 23:23:44 +03:00
Shea Levy c6460fb0cb melpa: Add inherit-local, bump f.el 2016-09-10 11:25:21 -04:00
Joachim F 67061dd466 Merge pull request #18453 from chris-martin/atermjava
atermjava: remove
2016-09-10 16:16:19 +02:00
Vladimír Čunát bd6e40c27d Merge #16391: texlive: 2015 -> 2016
Mirroring isn't finalized, but we'll have to fix that on the go.
2016-09-10 12:04:25 +02:00
Frederik Rietdijk 594cf66c5c Merge pull request #18332 from offlinehacker/pkgs/pythonPackages/docker_compose/update/1.8.0
pythonPackages.docker_compose: 1.6.2 -> 1.8.0
2016-09-10 11:13:56 +02:00
Vladimír Čunát 31c719cf8e pythonPackages.qscintilla: fixup build
It's the same as fcc76325ef.
2016-09-10 01:09:14 +02:00
Vladimír Čunát f348e6ff5a gccgo-4.8: remove
I see no use to keep it. I doesn't build since April,
and noone has bothered to fixup the multiple-output problem.
2016-09-10 00:52:22 +02:00
danbst 8511ddc89a tomcat: 7.0.68 -> 7.0.70, 8.0.32 -> 8.0.37, init 8.5.5, init 9.0.0.M10 2016-09-09 18:29:12 +02:00
danbst 39ad7a9e60 tomcat: cleanup package with callPackages 2016-09-09 18:29:12 +02:00
Joachim F 81b643edbe Merge pull request #18317 from Profpatsch/mustache-docs
mustache: init mustache at 1.0.2
2016-09-09 17:16:58 +02:00
Kamil Chmielewski e4d62926d6 python27Packages.cairocffi: FIX test_scaled_font
workaround for https://github.com/Kozea/cairocffi/issues/88

(cherry picked from commit 9e18b81ded)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:16:53 +02:00
Domen Kožar 1d371218cf pythonPackages.libtmux: fix build
(cherry picked from commit ac46759f7a)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:05:29 +02:00
Domen Kožar e0b29b4541 pypeg2: 2.15.1 -> 2.15.2 (fix build)
(cherry picked from commit ace7bbb06c)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:05:27 +02:00
Peter Simons 3594e34979 darcs: switch default build to GHC 8.x 2016-09-09 13:55:39 +02:00
Peter Simons 4a1ab71f4b cryptol: switch default build to GHC 8.x 2016-09-09 13:55:39 +02:00
Tuomas Tynkkynen 65146185d4 python-systemd: Fix build 2016-09-09 06:19:37 +03:00
Tuomas Tynkkynen 06b2ff50b9 udev: Remove hacky alias
It's not clear to me what this is achieving, plus for some reason this
is causing an evaluation error in hyperterm. So let's hope it's not
really needed...
2016-09-09 06:13:14 +03:00
Chris Martin d9599e22a2 atermjava: remove 2016-09-08 21:51:10 -04:00
Tuomas Tynkkynen 290db94f04 Merge remote-tracking branch 'upstream/master' into staging 2016-09-09 02:40:47 +03:00
Eelco Dolstra 5d670ed65c gdrivefs: 0.14.3 -> 0.14.8 2016-09-08 21:16:58 +02:00
Joachim F 82d6ab1ed8 Merge pull request #18029 from rnhmjoj/vapoursynth
Vapoursynth
2016-09-08 16:28:31 +02:00
Joachim F 1b25767c99 Merge pull request #18415 from ericsagnes/pkg/pamix
pamix: init at 1.4.1
2016-09-08 16:22:24 +02:00
Bryan Gardiner df6827a824 taskjuggler: add 3.5.0, keep 2.4.3
Version 3.5.0 was present but was removed in 8085f08.  Keeping the old version
per discussion at https://github.com/NixOS/nixpkgs/pull/845.
2016-09-08 16:15:20 +02:00
Eric Sagnes b020675453 pamix: init at 1.4.1 2016-09-08 11:34:50 +09:00
Daiderd Jordan 5a55ec20e3
ledger: fix libdir 2016-09-08 00:03:53 +02:00
Profpatsch 03874369a3 mustache: init mustache-spec at 1.0.2
Add a description of the mustache template system, as manpages and
html docs.
2016-09-07 21:33:29 +02:00
Eelco Dolstra 039ac38d1e minio-client: Init at 20160821 2016-09-07 17:41:53 +02:00
Eelco Dolstra 2597562d42 minio: Init at 20160821 2016-09-07 17:41:53 +02:00
Domen Kožar 1697f9c130 xulrunner: set to firefox-unwrapped
(cherry picked from commit ef9e2154e2)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-07 16:52:05 +02:00
Domen Kožar 4c22a048d7 Revert "Revert "xulrunner: Remove""
This reverts commit 5041cae5b7.

This is fixed in follow up commit.
2016-09-07 16:51:38 +02:00
Eelco Dolstra 5041cae5b7 Revert "xulrunner: Remove"
This reverts commit 8c3e9ea53e.
2016-09-07 15:17:39 +02:00
Bjørn Forsman 10b335992e Fix eval (due to xulrunner removal) 2016-09-07 15:08:13 +02:00
Eelco Dolstra 8c3e9ea53e xulrunner: Remove 2016-09-07 14:43:29 +02:00
Rahul Gopinath 3ddf76c00a mono: init at 4.6 2016-09-07 12:42:48 +02:00
Tuomas Tynkkynen c57d6821aa perlPackages.MozillaLdap: Reference correct output of openldap 2016-09-07 13:00:56 +03:00
aszlig 1187b00e58
qtkeychain: Allow building with Qt 5
So far we don't yet need the Qt 5 build for qtkeychain because the two
packages that depend on it are still using Qt 4. However, the next
upstream version of Tomahawk for example already uses Qt 5, so let's
prepare for that.

Tested building against Tomahawk Git master with qt5.qtkeychain.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-07 11:43:39 +02:00
Franz Pletz 6a11b816ff Merge pull request #17386 from vrthra/ruby
ruby: 2.2.3 -> 2.2.5 and 2.1.7 -> 2.1.10
2016-09-07 06:37:18 +02:00
Rahul Gopinath 3b9b8726bd ruby: 2.1.7 -> 2.1.10 2016-09-06 21:14:00 -07:00
Rahul Gopinath 7163bab78f ruby: 2.2.3 -> 2.2.5 2016-09-06 21:13:59 -07:00
Peter Hoeg d4eac0278c calibre: 2.64.0 -> 2.66.0 (#18311)
A few additional changes:

1. We load patches from debian for improving privacy and security
2. Now with QT 5.6 instead of 5.5
3. We strip bundled python code and use proper upstream instead
2016-09-07 04:32:06 +02:00
Joachim F b78e625445 Merge pull request #18235 from teh/master
Remove broken hyperdex package and dependencies. Closes #17995.
2016-09-07 00:18:48 +02:00
Joachim F 6949069678 Merge pull request #18119 from puffnfresh/package/hyperterm
hyperterm: init at 0.7.6
2016-09-06 23:50:00 +02:00
Dan Peebles 247c54e374 souffle: init at 1.0.0 2016-09-06 17:45:13 -04:00
Tuomas Tynkkynen 2ae5fb2723 pythonPackages.keystoneclient: Disable tests
````
run_tests.sh: interpreter directive changed from "/bin/bash" to "/nix/store/nyj6xd7s1n1w8c0xdwk5ddhi7bjcyi9x-bash-4.3-p46/bin/bash"
No virtual environment found...create one? (Y/n) builder for ‘/nix/store/qcrhq2f7llvzyc37ili94ff50z7vlgn3-python2.7-keystoneclient-1.8.1.drv’ failed with exit code 1
error: build of ‘/nix/store/qcrhq2f7llvzyc37ili94ff50z7vlgn3-python2.7-keystoneclient-1.8.1.drv’ failed
````
2016-09-06 22:01:17 +03:00
Bjørn Forsman 2bf421d197 mcelog: add utillinux as dependency
Fixes this:

  $ sudo mcelog
  ...
  unknown-error-trigger: line 21: logger: command not found
  unknown-error-trigger: line 22: logger: command not found
2016-09-06 20:30:47 +02:00
Michael Raskin d9c76736cc octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching 2016-09-06 19:57:06 +02:00
Michael Raskin 472ac50f5b octave: forbid 32-bit builds of the octaveFull version, looks like too much memory needed 2016-09-06 18:26:58 +02:00
Michael Raskin 5c686923de linphone: 3.8.5 -> 3.10.2 2016-09-06 18:21:28 +02:00
Michael Raskin 592e265caa antlr3_4: init at 3.4 2016-09-06 18:19:17 +02:00