Commit Graph

35216 Commits

Author SHA1 Message Date
Peter Simons
8bc0ece0f1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
fbb2c029b0.
2017-02-20 15:28:45 +01:00
Peter Simons
5e3eea0cd3 LTS Haskell 8.2 2017-02-20 15:28:38 +01:00
Nikolay Amiantov
ec2c9d57b5 Merge pull request #22568 from abbradar/chromium-updates
Chromium updates
2017-02-20 15:49:04 +03:00
Robin Gloster
dcba6eae1b Merge pull request #22116 from LnL7/darwin-cmus
cmus: fix darwin
2017-02-20 13:02:30 +01:00
aszlig
c5b2714bc7
dbus: Put DTDs into $out instead of $doc
First of all, these "documents" are not really documentation, so it
really doesn't make much sense to put it into $doc.

The main point however is that the installer tests are failing since
this was introduced in ac0cdc1952.

One way to circumvent this is putting dbus.doc into
system.extraDependencies of the installer tests, but given the first
point this sounds a bit odd to me.

So I went for the second way of putting it into $out, because it's now
basically necessary to build a NixOS system.

With this the NixOS installer tests should now work again, although I
have only tested this with the installer.simple test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:38 +01:00
aszlig
fc6684054d
make-dbus-conf: Use libxslt.bin instead of .dev
The problem with using libxslt as buildInputs is that the dev output is
used for building the dbus config.

This is one of the reasons why the installer tests are failing since
ac0cdc1952, because the tests do not have
libxslt.dev in their closure and really shouldn't.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:34 +01:00
aszlig
edce2b759c
make-dbus-conf: Don't try to access network
This is the output of the builder:

building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1'
error : connection refused
error : connection refused

However, even when using --nonet we'd still get this:

I/O error : Attempt to load network entity
http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd

So in order to avoid this, we now provide an XML catalog file, mapping
the public URLs to the local DTD paths inside the store instead of using
--path (which doesn't seem to work with xsltproc).

Tested this by comparing the SHA256 (nix-hash --type sha256) of the
output path generated by:

nix-build -E '(import ./. {}).makeDBusConf {
  suidHelper = "SUIDHELPER";
  serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ];
}'

... with the SHA256 of the generated output path prior to this commit
and they have the same hash:

6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:26 +01:00
Benjamin Saunders
bfdfd6c3df vulkan-loader: fix search paths in suid processes
Fixes #22990
2017-02-20 01:39:48 +03:00
Domen Kožar
5fc89a6778
language-ecmascript: jailbreak 2017-02-19 20:30:13 +01:00
Peter Simons
7734d159d1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
cc52bff6e8.
2017-02-19 20:12:44 +01:00
Nikolay Amiantov
aefb01a945 haskellPackages.lambdabot: maintain 2017-02-19 20:12:44 +01:00
Peter Simons
7422bb0ceb Merge pull request #22995 from rvl/lentil
haskellPackages.lentil: no longer needs overrides
2017-02-19 20:06:30 +01:00
Michael Raskin
febda39df3 qca2: 2.1.1 -> 2.1.3 2017-02-19 18:38:10 +01:00
Rodney Lorrimar
1078758b12 haskellPackages.lentil: no longer needs overrides 2017-02-19 17:13:09 +00:00
vbgl
d31577cfd3 Merge pull request #22871 from FlorentBecker/default_ocaml_402
Default ocaml 402
2017-02-19 15:54:54 +01:00
Arseniy Seroka
fe5ea1ba82 Merge pull request #22742 from volhovM/feature/fix-orgmode-parse-tests
Disable orgmode-parse tests in configuration-common.nix
2017-02-19 16:16:54 +03:00
Florent Becker
9d57f1ae9a frama-c: fix compilation with ocaml 4.02+ 2017-02-19 13:05:47 +01:00
Vincent Laporte
203e3c5292 trv: fix the propagate build inputs 2017-02-19 11:38:29 +00:00
sternenseemann
a452714799 ocaml-cow: init at 2.2.0 2017-02-19 11:16:25 +00:00
Vincent Laporte
d2a4a84f00 ocamlPackages.uri: 1.9.1 -> 1.9.2
The old version is also kept, under the attribute `uri_p4`.
It is built against `sexplib` version prior to 113.33 and needed by `trv`.
2017-02-19 11:57:24 +01:00
Benno Fünfstück
785fbfac65 haskell: add nix-specific fixes for various packages in stackage"
This reverts commit fd0e0cdc76.

http-streams test suite is no longer broken, but still needs to be
disabled due to cyclic dependencies (http-streams(test) -> snap ->
http-streams)
2017-02-19 11:34:21 +01:00
Daiderd Jordan
16fd03ddaa Merge pull request #22907 from wizeman/u/upd-rust
rustc: 1.15 -> 1.15.1
2017-02-19 10:51:10 +01:00
Joachim F
ac7c0208e8 Merge pull request #22982 from dtzWill/fix/creduce-wrapper
creduce: Use wrapper instead of propagatedUserEnvPkgs
2017-02-19 10:22:49 +01:00
Jörg Thalheim
0361776764
pyroute2: 0.4.12 -> 0.4.13 2017-02-19 09:58:13 +01:00
sternenseemann
44820907af ocaml-ezjsonm: 0.4.1 -> 0.4.3 2017-02-19 04:53:44 +00:00
sternenseemann
4f0feb4f5f ocaml-logs: init at 0.6.2 2017-02-19 04:36:14 +00:00
Will Dietz
798e0f50f4 creduce: Use wrapper instead of propagatedUserEnvPkgs
Friendlier when installed,
fixes execution outside of NixOS.
2017-02-18 19:49:53 -06:00
sternenseemann
d738ac4fd5 ocaml-angstrom: init at 0.3.0 2017-02-19 02:12:52 +01:00
Michele Guerini Rocco
1ae9b50a77 vapoursynth: disable OCR by default (#22943) 2017-02-19 02:11:08 +01:00
Nikolay Amiantov
7cbe538e94 pythonPackages.wrapPython: fix for paths with spaces 2017-02-19 01:43:12 +03:00
rushmorem
3f09f8fa4d czmq: v3.0.2 -> v4.0.2 2017-02-18 23:54:50 +02:00
rushmorem
467f7d3f6c zmq: v4.2.0 -> v4.2.2 2017-02-18 22:52:02 +02:00
Thomas Tuegel
fd0e0cdc76
Revert "haskell: add nix-specific fixes for various packages in stackage"
This reverts commit 17c5ca9018.

This commit causes an evaluation error due to infinite recursion, which can be
tested by running:
```
$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace > /dev/null
```
2017-02-18 12:48:05 -06:00
Nikolay Amiantov
32560d2699 haskellPackages.lambdabot: fix build 2017-02-18 19:33:22 +03:00
Nikolay Amiantov
713918a094 haskellPackages.pointfree: fix build 2017-02-18 19:33:22 +03:00
Franz Pletz
78abfe951b
php71: 7.1.1 -> 7.1.2 2017-02-18 14:50:16 +01:00
Franz Pletz
405e117d31
php70: 7.0.15 -> 7.0.16 2017-02-18 14:49:59 +01:00
Benno Fünfstück
17c5ca9018 haskell: add nix-specific fixes for various packages in stackage
With these overrides, nearly all of the stackage packages in the latest
stackage release should compile now.
2017-02-18 14:34:53 +01:00
Eric Sagnes
979d20794d buildRebar3: fix buildPhase & cleanup (#22744) 2017-02-18 14:25:24 +01:00
Frederik Rietdijk
8c3480f3b9 Merge pull request #22828 from matthiasbeyer/update-my-pkgs
Updates for some of my packages
2017-02-18 14:09:51 +01:00
obadz
ae91514b26 gapi-ocaml: 0.2.10 -> 0.3.1 2017-02-18 10:42:59 +00:00
Peter Hoeg
3729441340 Merge branch 'u/bundler' into real_master 2017-02-18 17:35:07 +08:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Vladimír Čunát
714eabc5af
guile rev-deps: fix build by adding pkgconfig
Without it packages fail to find the headers, after guile has split
them into a separate output in 218713a.
2017-02-18 08:23:07 +01:00
Peter Hoeg
cad335eb01 usb-modeswitch-data: 20160112 -> 20170205
Plus some minor cleanups.
2017-02-18 11:35:25 +08:00
Peter Hoeg
9097b9e34a usb-modeswitch: 2.2.1 -> 2.5.0
We were carrying v2.2.1 and not v2.3.0 due to the update only touching
the version and not the sha256 sum.
2017-02-18 11:35:02 +08:00
Thomas Tuegel
a8b49802db Merge pull request #22902 from ttuegel/kde5-instructions
KDE 5 packaging instructions
2017-02-17 21:09:31 -06:00
Sarah Brofeldt
d26ac6afa4 haskellPackages.xmonad-extras: jailbreak to allow xmonad 0.13 (#22927)
Fixes https://github.com/NixOS/nixpkgs/issues/22919
2017-02-18 04:07:55 +01:00
Thomas Tuegel
580bdde06c
kde5.frameworks: update instructions 2017-02-17 11:48:14 -06:00
Joachim F
fe4552420e Merge pull request #22680 from dtzWill/feature/creduce
creduce: init at 2.6.0
2017-02-17 16:58:37 +01:00
Ricardo M. Correia
8d1bd281cc rustc: 1.15 -> 1.15.1 2017-02-17 16:44:01 +01:00
Peter Hoeg
facb2c0483 bundler: 1.14.3 -> 1.14.4 2017-02-17 22:48:39 +08:00
Vincent Demeester
834de6ebaa glide: output correct version (#22896)
It currently displays `0.12.0-dev` instead of the specified
version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-17 12:08:54 +01:00
Nikolay Amiantov
8ecd5c4019 Merge pull request #22864 from abbradar/dbus-etc
Redo DBus configuration
2017-02-17 11:47:51 +03:00
Daiderd Jordan
8a5c6153d7 Merge pull request #22814 from veprbl/wxpython
wxPython30: fix on darwin
2017-02-17 08:35:39 +01:00
David Terry
90d225db76 microsoft_gsl: init at 2017-02-13 2017-02-17 02:14:12 +01:00
Dmitry Kalinkin
c2a5733654
wxPython: fix on darwin 2017-02-16 18:48:08 -05:00
Robin Gloster
101d90d18b
libzrtpcpp: remove 2017-02-17 00:14:15 +01:00
Robin Gloster
449c895f31
podofo: 0.9.4 -> 0.9.5 2017-02-17 00:14:01 +01:00
Robin Gloster
54018c8f63
xmlsec: 1.2.20 -> 1.2.23 2017-02-17 00:13:45 +01:00
Robin Gloster
e400eb36d1
nodejs: 6.9.1 -> 6.9.5 2017-02-17 00:13:34 +01:00
Robin Gloster
5063a8099b
serf: 1.3.7 -> 1.3.9 2017-02-17 00:13:32 +01:00
Robin Gloster
9593049e06
pkcs11helper: 1.11 -> 1.21 2017-02-17 00:13:18 +01:00
Robin Gloster
22bea837f4
tcltls: 1.6 -> 1.6.7 2017-02-17 00:12:12 +01:00
Robin Gloster
c3011fde96
neon: 0.30.1 -> 0.30.2 2017-02-17 00:11:29 +01:00
Robin Gloster
80d8b8c716
mongoc: 1.1.10 -> 1.5.4 2017-02-17 00:11:26 +01:00
Robin Gloster
4277978fb2
gsoap: 2.8.37 -> 2.8.42 2017-02-17 00:11:18 +01:00
Robin Gloster
71e8ef6e76
afflib: 3.7.6 -> 3.7.15 2017-02-17 00:11:14 +01:00
Vladimír Čunát
110f136dc2
python*: upstream patches to fix with glibc-2.25
https://bugs.python.org/issue29157
The 3.6 release already contains the fix (from 3.5);
the branches in-between are claimed to be unaffected.
/cc #22874.
2017-02-16 23:13:38 +01:00
Lluís Batlle i Rossell
0c42efd9d7 SDL2: fix creation of libSDL2main.a
It's required by a trigger rally update I will commit next.
And other games use that too.
2017-02-16 22:24:40 +01:00
Vladimír Čunát
5ad81ab09c
libxml2: bugfix updates from git upstream
This should solve CVE-2016-5131 and some other bugs, but not what Suse
calls CVE-2016-9597: https://bugzilla.suse.com/show_bug.cgi?id=1017497
The bugzilla discussion seems to indicate that the CVE is referenced
incorrectly and only shows reproducing when using command-line flags
that are considered "unsafe".

CVE-2016-9318 also remains unfixed, as I consider their reasoning OK:
https://lwn.net/Alerts/714411/

/cc #22826.
2017-02-16 20:18:17 +01:00
Vladimír Čunát
e962a3c95f
Merge branch 'master' into staging 2017-02-16 19:02:37 +01:00
Vladimír Čunát
55cc7700e9
Revert "Merge: glibc: 2.24 -> 2.25"
This reverts commit 1daf2e26d2, reversing
changes made to c0c50dfcb7.

It seems this is what has been causing all the reliability problems
on Hydra.  I'm currently unable to find why it happens, so I'm forced
to revert the update for now.  Discussion: #22874.
2017-02-16 18:16:06 +01:00
Frederik Rietdijk
624cd8ae9e Merge pull request #22593 from teh/master
Update scrapy & dependencies
2017-02-16 17:27:57 +01:00
Tom Hunger
69363e9611 Move scrapy to its own module and add patch to fix broken permission code.
Scrapy is usually installed via pip where copying all permissions
makes sense. In Nix the files copied are owned by root and
readonly. As a consequence scrapy can't edit the project templates so

  scrapy startproject

fails.
2017-02-16 16:21:46 +00:00
Graham Christensen
cfbddd3ae0 Merge pull request #22867 from maurer/openssl-cve-2017-3733
openssl: 1.1.0d -> 1.1.0e for High severity CVE-2017-3733
2017-02-16 09:29:29 -05:00
Matthew Maurer
0d2ba7ef2b openssl: 1.1.0d -> 1.1.0e for High severity CVE-2017-3733 2017-02-16 09:16:41 -05:00
Joachim Fasting
2d643613f3
mozart: refactoring
- Append emacs to the oz wrapper's command search path rather than the
  rpath.  Previously, emacs would end up in the closure but the oz
  shell script would not be helped by it. Now a user without emacs in
  their PATH can still get the complete Oz experience (which depends
  crucially on emacs).  To build a variant without emacs, do
  mozart.override { emacs = null; }
- Patch full path to oz executable into the oz desktop item to make the
  output less reliant on the runtime PATH
- Compress .elc files to save a little bit of space
- Make it easier to extend platform support
- Inline builder.sh
- Be more specific about patching.  oz and ozc are capable of inferring
  OZHOME themselves; thus we generate wrappers only for the binary
  executable components.

Note that gmp and boost would be removed by patchelf --shrink-path; I've
no idea whether they are used somehow, so we leave them in and forego
rpath shrinking for now.
2017-02-16 14:51:08 +01:00
Graham Christensen
52026edf98 Merge pull request #22839 from ilya-kolpakov/master
boost: 1.63.0 (not default)
2017-02-16 07:42:40 -05:00
Nikolay Amiantov
3e23ec4450 makeDBusConf: init
Use XSLT transform to modify stock dbus configuration file. This is needed
because some dbus components doesn't support <include> so we need to put our
core configuration in the main file.
2017-02-16 15:41:23 +03:00
Nikolay Amiantov
300c9a6c3d dbus: use /etc as datadir, install dtd 2017-02-16 15:41:23 +03:00
Peter Simons
3c0b1919e7 git-annex: update sha256 hash for the new version 2017-02-16 11:49:42 +01:00
Peter Simons
5e910bcbf6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
2701517fd6.
2017-02-16 11:49:11 +01:00
Peter Simons
918a5926c6 hackage2nix: drop obsolete extra packages 2017-02-16 11:48:10 +01:00
Graham Christensen
7943dc8978 Merge pull request #22843 from bendlas/update-webkitgtk
webkitgtk212x: remove
2017-02-15 21:28:35 -05:00
Jascha Geerds
900fc49013 Merge pull request #22775 from peterhoeg/u/qtox
tox clients and libraries updates
2017-02-15 23:05:14 +01:00
Vladimír Čunát
7832806e20
fontconfig: fixup fragile build after ab5fe171a
Sometimes it might fail due to timestamps suggesting some files needed
regenerating and failing to find gperf.  Now it should be OK, I hope.
2017-02-15 21:06:27 +01:00
Herwig Hochleitner
54e3fad0f4 webkitgtk212x: remove
2.12 isn't maintained anymore and superseded by the (compatible) 2.14
2017-02-15 20:29:05 +01:00
Franz Pletz
eda8ee2830 Merge pull request #22752 from LumiGuide/syslog-ng-3.9.1
syslog-ng: 3.6.2 -> 3.9.1
2017-02-15 20:12:02 +01:00
Herwig Hochleitner
2640c87fb9 webkitgtk: 2.14.4 -> 2.14.5 2017-02-15 20:10:56 +01:00
Ilya Kolpakov
6d8235210d boost: 1.63.0 (not default) 2017-02-15 18:29:39 +01:00
Peter Simons
d583e013e1 Merge pull request #22825 from areina/add-catalan-to-aspell
aspell-dict-ca: init at 2.1.5-1
2017-02-15 17:47:44 +01:00
Bas van Dijk
8a928708b4 haskell: add support for Haskell Program Coverage (HPC) to the generic builder
A function is added to enable the generation of a HPC report. For example:

  pkgs.haskell.lib.doCoverage drv

will create a HPC report of the Haskell package drv in the directory:

  $out/share/hpc

Closes https://github.com/NixOS/nixpkgs/pull/22797/files.
2017-02-15 16:17:41 +01:00
Peter Simons
1a0cddad80 Merge pull request #22834 from Profpatsch/data-pprint
haskellPackages: data-pprint jailbreak
2017-02-15 16:06:58 +01:00
Profpatsch
d6fdba7f45 haskellPackages: data-pprint jailbreak 2017-02-15 15:44:30 +01:00
Matthias Beyer
f9d7d29fa9 sqlitebrowser: 3.8.0 -> 3.9.1 2017-02-15 14:18:53 +01:00
Peter Simons
cb2499acd0 Merge pull request #22805 from LumiGuide/fix-hoogle-ghcjs
ghcWithHoogle: fix for ghcjs
2017-02-15 13:05:06 +01:00
Peter Simons
9e0867586c Merge pull request #21396 from laMudri/stdlib-v0.13
AgdaStdlib: v0.12 -> v0.13
2017-02-15 13:03:50 +01:00
Frederik Rietdijk
397e59b4c9 pythonPackages.Keras: 1.0.3 -> 1.2.2 2017-02-15 12:56:58 +01:00
Frederik Rietdijk
97c3bebd92 tensorflowCuDNN -> tensorflowWithCuda
and move expression
2017-02-15 12:32:44 +01:00