Commit graph

35165 commits

Author SHA1 Message Date
David James 85fba54bc6
Attempt to update RocksDB to 5.1.2. 2017-02-20 21:50:30 -05:00
Frederik Rietdijk dd054e890f Merge pull request #22061 from Mic92/python3-protobuf
python-protobuf: enable python3 and enable py3 tests
2017-02-20 21:17:38 +01:00
Vincent Laporte b634622be0 compcert: 2.7.1 -> 3.0.1 2017-02-20 20:09:53 +00:00
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
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
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