Commit Graph

82112 Commits

Author SHA1 Message Date
Nikolay Amiantov
7ac1ef05fa networkmanager service: fixup 2016-04-27 13:51:43 +03:00
Nikolay Amiantov
16bdef1350 bluetooth service: fix w.r.t. multiple outputs 2016-04-27 13:48:06 +03:00
Tuomas Tynkkynen
584d884bd7 gstreamer: Fix multiple outputs split
- Explicitly moving the files breaks them, because the wrappers
  reference the files by absolute path.  Also this automatically
  moves the manpages to $dev as well.
- Need to explicitly set --exec-prefix since the pkgconfig file has
  `toolsdir=${exec_prefix}/bin`, breaking totem:

http://hydra.nixos.org/build/34980617/nixlog/1/raw

````
checking for BACKEND_TEST... yes
checking GStreamer 1.0 inspection tool... no
configure: error:
		Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'.
		It should be part of gstreamer-1_0-utils. Please install it.

builder for ‘/nix/store/npq2ihlsdniv4j3wbyparq9byjxqdi15-totem-3.18.1.drv’ failed with exit code 1
````

While at it, enable parallel build.
2016-04-27 05:01:03 +03:00
Tuomas Tynkkynen
7f63790f25 fuse-zip: Add dashed variant (and one with underscore for compat) 2016-04-27 04:19:16 +03:00
Tuomas Tynkkynen
15f68398ef libzip: Add platforms 2016-04-27 04:10:54 +03:00
Tuomas Tynkkynen
25b55e7409 gegl: Add platforms 2016-04-27 04:10:42 +03:00
Tuomas Tynkkynen
519dd711fe libzip: Move directory containing zipconf.h to $dev
http://hydra.nixos.org/build/34979863/nixlog/1/raw
2016-04-27 03:54:36 +03:00
Tuomas Tynkkynen
2c32607650 libzip: 0.11.2 -> 1.1.2 2016-04-27 03:54:31 +03:00
Vladimír Čunát
387915e99c python3*: port the fix from parent commit
I really love such copied expressions...
but this case was easy compared to usual consequences
of file-copying in long-running branches.
2016-04-26 10:52:18 +02:00
Vladimír Čunát
626e5bd4dd python3: fix build after 5ff40dded, refactor
The path list was passed in a format not suitable for gcc command-line.
Also, let's utilize that we had `with stdenv.lib;`.
/cc @abbradar.
2016-04-26 10:43:48 +02:00
Thomas Tuegel
dc062f2c8e Merge branch 'kde-5' into staging 2016-04-25 19:04:43 -05:00
Thomas Tuegel
fad200eb7c exiv2: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
6651b53bdd libinput: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
2a16c9d52b libzip: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
b06f9aa015 openjpeg: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
668f93c719 xcb-util-cursor: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
c25907d072 network-manager: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
70936ce3f8 bluez5: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
e0a2224f1e v4l-utils: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
f11c043fa2 glibmm: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
160bf21b3a librsvg: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
6a64edfa0e gstreamer-1.0: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel
a2e40003a1 kde5_latest -> kde5 2016-04-25 19:04:24 -05:00
Thomas Tuegel
522ed7ce76 nixos/kde5: phonon-backend-gstreamer is not optional 2016-04-25 19:04:24 -05:00
Thomas Tuegel
5896befee0 nixos/kde5: install kactivitymanagerd 2016-04-25 19:04:24 -05:00
Thomas Tuegel
99c06657df kde5_latest.kdeplasma-addons: add plasma-workspace input 2016-04-25 19:04:24 -05:00
Thomas Tuegel
ffc217883c kde5_latest.plasma-workspace: remove patches 2016-04-25 19:04:24 -05:00
Thomas Tuegel
62945ebaba kde5_latest.libksysguard: remove patch now included upstream 2016-04-25 19:04:24 -05:00
Thomas Tuegel
b61cf16942 kde5_latest.libkscreen: remove patches 2016-04-25 19:04:24 -05:00
Thomas Tuegel
19474a7b2a kde5_latest.knotifications: include optional libdbusmenu input 2016-04-25 19:04:24 -05:00
Thomas Tuegel
c7f0701c87 kde5_latest.plasma: 5.5.5 -> 5.6.3 2016-04-25 19:04:24 -05:00
Thomas Tuegel
3dded2e72a kde5_latest.applications: 15.12.03 -> 16.04.0 2016-04-25 19:04:24 -05:00
Thomas Tuegel
eb604134f7 kde5_latest.frameworks: 5.19 -> 5.21 2016-04-25 19:04:24 -05:00
Tuomas Tynkkynen
26f90102b8 openssl: fix indentation 2016-04-25 18:19:40 +03:00
Vladimír Čunát
c7377b0e4a zlib, bash: mass-rebuild cleanup 2016-04-25 17:12:49 +02:00
Nikolay Amiantov
a5cf243134 Merge branch 'staging' of ssh://github.com/NixOS/nixpkgs into staging 2016-04-25 18:03:35 +03:00
Nikolay Amiantov
62616ec5e2 Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:47 +03:00
Nikolay Amiantov
5e85760ff1 Merge commit 'refs/pull/14909/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:32 +03:00
Nikolay Amiantov
5f19542581 Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:23 +03:00
Nikolay Amiantov
09f02b918e Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:10 +03:00
Vladimír Čunát
f9e5eccb13 Merge #14953: fix fallout after splitting nix
I rebased this against master to avoid getting staging commits for now.
2016-04-25 16:46:19 +02:00
Tuomas Tynkkynen
1d4b21ef42 treewide: Use correct output of config.nix.package in non-string contexts 2016-04-25 16:44:38 +02:00
Tuomas Tynkkynen
60f5659dad treewide: Use correct output in ${config.nix.package}/bin 2016-04-25 16:44:37 +02:00
Tuomas Tynkkynen
bee04a37ad amazon-init.nix: Use makeBinPath
This also fixes the incorrect use of 'dev' outputs from
config.nix.package and pkgs.systemd.
2016-04-25 16:44:37 +02:00
Tuomas Tynkkynen
70f5c840af nix-daemon service: Don't have the output in the `nix.package' option
1) It unnecessarily exposes implementation details.
2) It breaks all existing configs that have e.g.
   `nix.package = pkgs.nixUnstable;`.
2016-04-25 16:44:37 +02:00
Nikolay Amiantov
559a563208 Merge pull request #14971 from rardiol/the-powder-toy
the-powder-toy: 90.2.322 -> 91.3.328
2016-04-25 18:43:48 +04:00
Vladimír Čunát
1c9234fd6c foswiki, egypt, wml: fix build 2016-04-25 16:22:52 +02:00
Vladimír Čunát
ecf75f1b4f perlPackages.EncodeJIS2K: fix build 2016-04-25 15:55:01 +02:00
Karn Kallio
b6e63fba6d phonon : fix configuration paths 2016-04-25 08:23:45 -05:00
Joachim Fasting
4df02f777b Merge pull request #14942 from artuuge/beignet
beignet: init at 1.1.2
2016-04-25 15:22:46 +02:00