Commit graph

89096 commits

Author SHA1 Message Date
Eric Sagnes
4114cf9c6c fontconfig-ultimate: fix wqy-zenhei-sharp priority 2016-08-20 03:21:05 +03:00
Eric Sagnes
e80e8b9dc9 fontconfig module: respect upstream definitions 2016-08-20 03:21:05 +03:00
Eric Sagnes
cd2948a72e fontconfig: fix etc priority 2016-08-20 03:21:05 +03:00
Vladimír Čunát
c74145467d Merge #17852: gtk3: 3.20.8 -> 3.20.9
Note: the merge also adds a few master commits,
but those should matter.
2016-08-20 01:18:04 +02:00
Vladimír Čunát
532f88cd3a glib: bugfix 2.48.1 -> 2.48.2
Suggested on #17852.
2016-08-20 01:18:03 +02:00
Nikolay Amiantov
392fb9d092 Merge pull request #17855 from womfoo/fix/openttd-music-support
openttd: music support
2016-08-20 03:09:46 +04:00
Kranium Gikos Mendoza
63a2c80bf9 openttd: out of the box midi playback 2016-08-20 06:57:02 +08:00
Kranium Gikos Mendoza
d770792197 openttd: correct openmsx dir 2016-08-20 06:21:46 +08:00
Vincent Laporte
7a6cfe944a ocaml-magick: fix darwin build 2016-08-20 00:05:35 +02:00
Nikolay Amiantov
db31282f08 Merge pull request #17749 from abbradar/python-set
wrapPythonProgram: use site.addsitedir instead of PYTHONPATH
2016-08-20 01:44:38 +04:00
Nikolay Amiantov
3c6beea1a7 gajim: use wrapPython 2016-08-20 00:43:45 +03:00
Nikolay Amiantov
826c398318 pythonPackages.scfbuild: remove workaround 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
837cf416ce wrapPythonProgram: exclude Python itself from PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
adafdb88f5 wrapPythonProgram: fix magical sed expression
* Treat #! as all other comments;
* Treat comma at the end as a multi-line marker;
* Skip lines with a space at start (they are continuing previous lines);
* Don't allow spaces in front of quotes or the first real statement.
2016-08-20 00:42:49 +03:00
Nikolay Amiantov
4ad459e3e0 wrapPythonProgram: split into several functions 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
01624e1ac2 wrapPythonProgram: use site.addsitedir instead of PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
edb9416228 Merge pull request #17819 from abbradar/printing-updates
Printing and PDF-related updates
2016-08-20 01:41:55 +04:00
Dan Peebles
b7b2019e62 proot: fix static build 2016-08-19 21:41:21 +00:00
Dan Peebles
7bf6e249eb talloc: re-add old static output
It was originally added by https://github.com/NixOS/nixpkgs/pull/5142 but removed in
863ef41025.y
2016-08-19 21:41:21 +00:00
Corbin
2d94071cc4 fetchfossil: Require rev.
Otherwise no bumps are done when upstream changes. Not sure how to ping the
repository and check without just doing the clone.
2016-08-19 13:55:10 -07:00
Daniel Peebles
57e6f19cad Merge pull request #17794 from abbradar/nostdinc
cc-wrapper: handle -nostdinc{++,}
2016-08-19 16:35:35 -04:00
Thomas Tuegel
64ba7b53f1 Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"
This reverts commit da68127737, reversing
changes made to 2ba494b728.

These changes are reverted because they cause an incompatibility which
they should not.
2016-08-19 15:09:41 -05:00
obadz
4574f22841 chromium: remove one layer of wrapper by using ed 2016-08-19 19:18:23 +01:00
Ram Kromberg
c60f1e9af5 gtk3: 3.20.8 -> 3.20.9 2016-08-19 21:08:25 +03:00
Jezen Thomas
6154fecdbd
Declare dependencies for yesod-auth-oauth2 2016-08-19 19:51:33 +02:00
obadz
b0e11652f4 dotnetPackages.GitVersionTree: init at 2013-10-01 2016-08-19 18:28:03 +01:00
obadz
3f783e7fd1 nano: 2.6.2 -> 2.6.3
Add patch to make Darwin happy & fix #17835
2016-08-19 18:17:25 +01:00
Frederik Rietdijk
6c7fb93233 Merge pull request #17845 from peterhoeg/spotify
spotify: 1.0.34.146 -> 1.0.36.120
2016-08-19 18:06:19 +02:00
Nikolay Amiantov
2abe917f18 kmod: 22 -> 23, add /lib/modules to module directories 2016-08-19 17:57:08 +03:00
Nikolay Amiantov
821e5c95b4 networkmanager098: fix binary paths 2016-08-19 17:57:04 +03:00
Nikolay Amiantov
1b8806098a networkmanager: point to kmod's modprobe 2016-08-19 17:56:59 +03:00
Nikolay Amiantov
6b41f1132c nixos treewide: don't set MODULE_DIR 2016-08-19 17:56:54 +03:00
Nikolay Amiantov
5ff6e98486 modprobe service: drop kmod wrapper 2016-08-19 17:56:49 +03:00
Nikolay Amiantov
ff22705793 treewide: replace several /sbin paths by /bin 2016-08-19 17:56:45 +03:00
Nikolay Amiantov
30c9aa2698 kmod: add patch to allow searching for modules in several directories 2016-08-19 17:56:39 +03:00
Vladimír Čunát
6d75fd1476 gnutls*: drop the parallel-build hack
... as it didn't work, apparently: 024cb9ee
2016-08-19 16:37:11 +02:00
Vladimír Čunát
c69e2d5763 gnutls35: maintenance 3.5.1 -> 3.5.3 2016-08-19 16:36:52 +02:00
Vladimír Čunát
1441366fdd gnutls33: maintenance 3.3.18 -> 3.3.24 2016-08-19 16:36:10 +02:00
Corbin
7880bc0c21 fetchfossil: Cleanup some copy-and-paste. 2016-08-19 07:34:58 -07:00
obadz
1047ed49d9 Merge branch 'master' into staging
Conflicts: pkgs/os-specific/linux/kmod/default.nix cc @abbradar
2016-08-19 15:28:58 +01:00
obadz
3e03db11b7 glibc: fixup, that should have been $bin not $out 2016-08-19 15:23:56 +01:00
obadz
a7bfa77787 glibc: remove sln from bin, not sbin 2016-08-19 15:20:46 +01:00
Vladimír Čunát
cd07a6b4dd gnutls: security 3.4.13 -> 3.4.14
http://gnutls.org/security.html#GNUTLS-SA-2016-2
(no CVE seems assigned ATM)
2016-08-19 16:08:52 +02:00
obadz
9744c7768d glibc: 2.23 -> 2.24
- Removed patches that were merged upstream
- Removed --localdir from configureFlags as according to
  https://sourceware.org/bugzilla/show_bug.cgi?id=14259
  it was unused before
2016-08-19 15:05:41 +01:00
Benno Fünfstück
51b165c7d2 nixos/shadow: setuid wrappers for new{uid,gid}map
These utils are not related to user management, so they should be
available even if immutable users are enabled.
2016-08-19 14:59:33 +02:00
obadz
80dbdba6dd weechat: add python & perl to PATH so that extensions can run 2016-08-19 13:48:35 +01:00
Rok Garbas
ec918dac16 Merge pull request #17836 from vbgl/topkg_0.7.8
ocaml-uucd: 2.0.0 → 4.0.0
2016-08-19 13:48:33 +02:00
Ram Kromberg
db862d8271 unar: init at 1.10.1 (#17830) 2016-08-19 13:44:19 +02:00
Miguel Madrid
1b69ef935e shotwell: 0.23.4 -> 0.23.5 (#17827) 2016-08-19 13:33:06 +02:00
Miguel Madrid
20c0fe4900 gthumb: init at 3.4.3 (#17826) 2016-08-19 13:32:27 +02:00