Commit Graph
37780 Commits
Author SHA1 Message Date
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
https://github.com/commercialhaskell/all-cabal-hashes/commit/cc52bff6e8781efaf053d9a19dd42ec4fe8ba02a.
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
Lprndn 4cd7b284e8 fontforge-gtk: Add support for libspiro.
Add Spiro toolkit in fontforge-gtk for designing fonts.
libspiro: Init at c26afeb.
2017-02-17 16:39:50 +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