mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
93459 commits 204 branches 125 tags 10 GiB
Commit graph

1869 commits

Author SHA1 Message Date
José Romildo Malaquias f4d845b479 adapta-gtk-theme: 3.21.2 -> 3.21.3.68 2016-07-15 10:50:42 -03:00
José Romildo Malaquias 99a02d7f5d blackbird: 2016-04-10 -> 2016-07-04 2016-07-15 09:12:23 -03:00
J Phani Mahesh bbd0a47950 vim-plugin:YouCompleteMe: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 17:26:19 +05:30
Rok Garbas 963327aacb vimPlugins: updating plugin and adding floobits plugin 2016-07-11 22:49:16 +02:00
Alexander V. Nikolaev dc5293d80b wine: 1.9.13 -> 1.9.14 (#16862) 
* Update wineUnstable: 1.9.13 -> 1.9.14
* Update staging: 1.9.13 -> 1.9.14
* Add myself as co-maintainer, because I am do regular updates.
 2016-07-11 17:57:16 +02:00
Eelco Dolstra 05bdc0c89f Remove unnecessary references to gcc5 
These cause an unnecessary rebuild of gcc.
 2016-07-11 10:46:34 +02:00
Matthias Beyer 7f4d52e27e Build libjack2 for supercollider with same GCC 
Also remove trailing whitespace
 2016-07-07 16:07:47 +02:00
William Casarin 7129ebbd5e dolphin-emu: 4.0.2 -> 5.0 2016-07-06 12:22:58 -07:00
Tuomas Tynkkynen 4085f4de5f Merge branch 'pr-newest-uboot' into master 2016-07-04 15:17:46 +03:00
Tuomas Tynkkynen 18572e2359 U-Boot: Drop Versatile build 
I had broken this at some point and the patch conflicts quite often.
Hopefully soon the Raspberry Pi 2 emulation in QEMU can be used instead.
 2016-07-04 01:52:58 +03:00
Tuomas Tynkkynen 4108e0324e U-Boot: Build for the Raspberry Pi 2 & 3 2016-07-04 01:52:58 +03:00
Tuomas Tynkkynen 428b51dd2f U-Boot: 2016.01 -> 2016.05 
Amongst many minor things, the USB keyboard becomes operative on the
Raspberry Pi. Yay!
 2016-07-04 01:52:19 +03:00
Tuomas Tynkkynen 1268f0753f U-Boot: Build for the Beaglebone Black 2016-07-03 20:48:07 +03:00
José Romildo Malaquias c4ce1eece0 zuki-themes: init at 2016-07-01 2016-07-02 09:24:55 -03:00
Nikolay Amiantov 9159d50baf Merge pull request #16533 from avnik/wine-update 
wine: 1.9.11 -> 1.9.13
 2016-07-01 16:07:11 +04:00
Alexander V. Nikolaev 962e365444 wineStable: 1.8.2 -> 1.8.3 2016-07-01 14:30:54 +03:00
pngwjpgh 17e8032adb samsung-UnifiedLinuxDriver: fix multi-output cups (#16421) 2016-07-01 00:29:56 +02:00
Vladimír Čunát 3afa246038 Merge branch 'staging' 
This includes a security update of expat.
 2016-06-29 07:47:04 +02:00
Vladimír Čunát b8614a6c63 Merge #16328: gtk themes: clean up inconsistent naming 2016-06-28 21:48:45 +02:00
Alexander V. Nikolaev 8f53cfbd59 wine: 1.9.11 -> 1.9.13 2016-06-27 01:09:56 +03:00
AndersonTorres 6c252964fc higan: v098 -> v099 2016-06-25 12:20:32 -03:00
Nikolay Amiantov 8399068b80 winetricks: 20160219 -> 20160622 2016-06-24 00:58:35 +03:00
Nikolay Amiantov 5ee7f081e3 wine: fix gstreamer support 2016-06-24 00:58:35 +03:00
Nikolay Amiantov 9e8592d6b9 wine: set default features in all-packages 
I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.
 2016-06-23 14:01:09 +03:00
Nikolay Amiantov 5bff6fef55 wine: restore old features 2016-06-23 13:28:55 +03:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge 
... from staging to master, reverted temporarily in aa9a04883e.
 2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc 
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
 2016-06-23 09:25:10 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1279790
 2016-06-19 12:33:04 +02:00
Vladimír Čunát 97c484a10f treewide: fix #include errors after gcc-5.4 
They were mostly missing <cmath> or <math.h>.
 2016-06-19 10:18:30 +02:00
Severen Redwood e83687fe8e
Clean up the inconsistent naming of themes 2016-06-19 01:48:55 +12:00
Arseniy Seroka d5b28fb554 Merge pull request #16301 from LnL7/vimplugins-deoplete-jedi 
vimPlugins: added deoplete-jedi
 2016-06-18 16:03:19 +03:00
Joachim Fasting 89913798b1 Merge pull request #16302 from brainrape/update_urbit 
urbit: 2015.09.26 -> 2016-06-02
 2016-06-18 14:52:32 +02:00
Severen Redwood 915edac0ce
adapta-gtk-theme: Init at 3.21.2 2016-06-18 23:33:29 +12:00
Márton Boros 08f41462d7 urbit: 2015.09.26 -> 2016-06-02 
Updated to latest revision in urbit git master, fixes build error caused by missing sources.
Updated description and website.
Fixed date/version format to ISO 8061.
 2016-06-18 08:36:10 +02:00
Daiderd Jordan a20b8c114b vimPlugins: added deoplete-jedi 2016-06-17 08:16:39 +02:00
Joachim Fasting 5faefd4c04 Merge pull request #15826 from yawnt/postscript-lexmark 
postscript-lexmark: add package
 2016-06-16 15:29:03 +02:00
Moritz Ulrich e72282be84 Merge pull request #16052 from dvc94ch/rust-cross 
Rust and cargo improvements
 2016-06-16 09:42:23 +02:00
Benno Fünfstück 41d523a8bc gnome-breeze: init 2016-06-16 00:02:53 +02:00
David Craven 54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
Arseniy Seroka 06027595fc
vimPlugins: update 2016-06-15 2016-06-15 00:03:59 +03:00
Joachim Fasting f04291abe5 Merge pull request #16138 from romildo/upd.arc 
arc-gtk-theme-git: 2016-06-02 -> 2016-06-06
 2016-06-14 15:04:18 +02:00
Joachim Fasting 3d54210566 Merge pull request #15739 from matthewbauer/retroarch-disable-nvidia 
Remove nvidia-cg-toolkit as input for retroarch.
 2016-06-13 16:46:58 +02:00
José Romildo Malaquias ce50ba74dc numix-gtk-theme: 2016-05-25 -> 2016-06-12 
Closes #16188.
 2016-06-13 10:03:30 +02:00
José Romildo Malaquias 0bd6b9ce98 paper-gtk-theme: 2016-05-25 -> 2016-05-27 
Closes #16194.
 2016-06-13 09:57:25 +02:00
Matthew Bauer e37bb985a3 retroarch: 2015-11-20 -> 1.3.4 
also: remove nvidia-cg-toolkit as input for retroarch.
see #15707

darwin is also building but you have to trick it into
thinking it's a desktop app for the GUI to load

platforms is set to "platforms.all".
 2016-06-12 22:13:06 -05:00
Erik Rybakken d49e0ff79f vimPlugins: add localvimrc 2016-06-11 23:13:15 +02:00
José Romildo Malaquias 9ddc8a1a5a arc-gtk-theme-git: 2016-06-02 -> 2016-06-06 2016-06-10 21:35:32 -03:00
Michael Raskin da021cdda1 xscreensaver: an option to install all the hacks, including retired ones and DNA logo 2016-06-10 17:51:39 +02:00
Nikolay Amiantov 21f5510a54 Merge pull request #15367 from bendlas/update-wine 
wine-unstable: 1.9.7 -> 1.9.11; add optional dependencies; opencl-icd: init; refactor flags
 2016-06-10 16:47:31 +04:00
Michael Raskin 46d3001fa7 xscreensaver: use gle 2016-06-10 14:51:48 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rushmore Mushambi 83c40ada7e Merge pull request #16017 from kamilchm/rework-go 
Rework goPackages
 2016-06-09 17:09:13 +02:00
Nikolay Amiantov 2f1b355747 Merge pull request #15983 from ryantm/zsnes 
zsnes: add desktop item
 2016-06-09 17:34:09 +04:00
Ryan Mulligan b54fa1e351 zsnes: add desktop item 
add desktop item so zsnes can be used without the terminal
add icons
 2016-06-09 06:22:13 -07:00
Kamil Chmielewski 6909d0e456 vimPlugins: FIX fzf outside goPackages 2016-06-09 11:21:30 +02:00
Brandon Kase 440004a017 vimPlugins: add purescript plugins 2016-06-04 17:25:08 -07:00
José Romildo Malaquias 3f80f0149f arc-gtk-theme: 2016-05-14 -> 2016-06-02 2016-06-03 20:03:40 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Moritz Ulrich a1b0ca639c gnuk: Fix hashes. 
Fixes #15827.
 2016-06-03 12:16:54 +02:00
José Romildo Malaquias f67c878241 mate-icon-theme: move to pkgs/desktops/mate/ 2016-05-31 15:08:51 -03:00
José Romildo Malaquias e428c0346f mate-themes: move to pkgs/desktops/mate/ 2016-05-31 15:06:43 -03:00
Joachim Fasting 6aede2abad Merge pull request #15788 from romildo/upd.mate-icon-theme 
mate-icon-theme: 1.6.3 -> 1.14.1
 2016-05-30 22:36:11 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
yawnt fe1f3b70bc postscript-lexmark: add package 2016-05-30 11:42:10 +02:00
Herwig Hochleitner 8c0f03ae9d wine: 1.9.10 -> 1.9.11 2016-05-30 04:05:55 +02:00
Herwig Hochleitner 1c215828d5 wine: make features configurable 2016-05-29 10:45:16 +02:00
Herwig Hochleitner 98d720d72c wine: 1.8.1 -> 1.8.2 2016-05-29 10:45:12 +02:00
Herwig Hochleitner edb5a8c632 wine: 1.9.9 -> 1.9.10 2016-05-29 10:45:08 +02:00
Herwig Hochleitner 0f3ff1401d wine-staging: move libtxc_dxtn to buildInputs 
this adds it to RPATH, via LDFLAGS (see base.nix)
 2016-05-29 10:44:42 +02:00
Herwig Hochleitner 4416644eb3 wine-unstable: 1.9.7 -> 1.9.9 2016-05-29 10:44:42 +02:00
Herwig Hochleitner 33c6a9d1e7 wine: add optional dependencies 2016-05-29 10:44:42 +02:00
Joachim Fasting ea5039e448 Merge pull request #15712 from rardiol/pcsxr94b 
pcsxr: init at 1.9.94
 2016-05-28 23:33:09 +02:00
Joachim Fasting 69091bae84 Merge pull request #15741 from romildo/fix.themes 
Numix and Paper themes: fix installation dir and update revision
 2016-05-28 22:30:55 +02:00
José Romildo Malaquias 2e0c97de6e mate-icon-theme: 1.6.3 -> 1.14.1 2016-05-28 14:43:21 -03:00
José Romildo Malaquias ae08abb8b3 mate-themes: 1.6.3 -> 3.18.1 2016-05-28 13:28:47 -03:00
José Romildo Malaquias ad6496f768 numix-gtk-theme: 2016-05-19 -> 2016-05-25 2016-05-27 00:03:15 -03:00
José Romildo Malaquias 923a63ad5d paper-gtk-theme: 2016-05-18 -> 2016-05-25 2016-05-26 23:56:42 -03:00
José Romildo Malaquias ecce3999b2 paper-gtk-theme: fix installation directory 2016-05-26 23:56:42 -03:00
José Romildo Malaquias f83cbcb51e numix-gtk-theme: fix installation directory 2016-05-26 22:01:45 -03:00
Ricardo Ardissone 38429f74b2 pcsxr: init at 1.9.94 2016-05-26 15:54:24 -03:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Arseniy Seroka ff87996847 Merge pull request #15688 from AmatCoder/AmatCoder-mednaffe 
mednaffe: Fix segfault on shutdown
 2016-05-25 23:32:34 +03:00
Michael Raskin e23d64b94c xscreensaver: 5.34 -> 5.35 2016-05-25 15:26:06 +02:00
AmatCoder 15dbdc5930 mednaffe: Fix segfault on shutdown 2016-05-25 06:30:40 +00:00
Rok Garbas 54f5872f06 vimPlugins: updating plugins 2016-05-24 15:37:08 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
José Romildo Malaquias 7e390822d2 paper-gtk-theme: 6a5f14cfe697b0a829456a1fd560acdcddc6043f -> 2016-05-18 2016-05-22 10:39:02 -03:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604 
Also fixup references to imagemagick.
 2016-05-22 13:41:15 +02:00
José Romildo Malaquias 9752218d40 paper-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" 2016-05-22 05:58:57 -03:00
José Romildo Malaquias 603db7fa6f numix-gtk-theme: 2.5.1 -> 2016-05-19 2016-05-20 11:52:31 -03:00
José Romildo Malaquias 2d4b6129f9 numix-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" 2016-05-20 11:21:42 -03:00
Rok Garbas 810a4dd656 vimPlugins.YankRing: fixing the build 2016-05-20 10:48:03 +02:00
Rok Garbas 4b2a5edd7c vimPlugins: update also fixes hashes due to change in fetchgit #15469 2016-05-20 10:40:11 +02:00
Charles Strahan 612d4a1684
mnemonicode: fix name 2016-05-19 16:19:18 -04:00
Charles Strahan cd0d0944f9
mnemonicode: init at 2015-11-30 
mnemonicode is a set of routines which implement a method for encoding
binary data into a sequence of words which can be spoken over the phone,
for example, and converted back to data on the other side.
 2016-05-19 16:17:18 -04:00
Tuomas Tynkkynen c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen 9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát e429a4012e Merge #15360: xscreensaver: Fix xscreensaver-text 2016-05-17 09:13:59 +02:00
Rommel M. Martinez 7d06d451c3 moltengamepad-git: init at 2016-05-04 (#15462) 2016-05-17 08:09:33 +02:00
Rok Garbas 499195dfcf vimPlugins: updated existing plugins and added new ones 
- also added fzf manuall
- added following plugins to `vim-plugin-names` list:
    github:terryma/vim-expand-region
    github:rust-lang/rust.vim
    github:junegunn/fzf.vim
    github:hecal3/vim-leader-guide
    github:ctjhoa/spacevim
    github:Shougo/deoplete.nvim
 2016-05-17 02:01:10 +02:00
Rok Garbas 3c8bd93f23 base16: use patch for neovim terminal mode 2016-05-17 01:56:35 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Arseniy Seroka 82feebd53d Merge pull request #15479 from mpscholten/vim-plugin-vim-closetag 
vimPlugins: Init vim-closetag
 2016-05-15 21:27:39 +04:00
Marc Scholten f3a912a0d5
vimPlugins: Init vim-closetag 2016-05-15 17:01:51 +02:00
Joachim Fasting dffb9a28cf Merge pull request #15451 from romildo/new.blackbird 
blackbird: init at 2016-04-10
 2016-05-15 06:35:24 +02:00
Rok Garbas 3249796220 xautolock: adding patch that enables -lockaftersleep option 
and...
- added metadata
- added myself as a maintainer
 2016-05-15 05:47:35 +02:00
Rok Garbas bfe8d8ac84 base16: init at revision 9b24598c0 (no release) 
also applied few patches from not merged PRs
 2016-05-15 03:58:28 +02:00
Arseniy Seroka 969ce217f7 Merge pull request #15458 from romildo/upd.arc 
arc: 2015-10-21 -> 2016-05-14
 2016-05-15 01:01:27 +03:00
Pascal Wittmann b596fd4a42 xlockmore: 5.46 -> 5.47 2016-05-14 18:27:43 +02:00
José Romildo Malaquias e081433bee arc: 2015-10-21 -> 2016-05-14 2016-05-14 13:05:03 -03:00
José Romildo Malaquias 6f42aeb716 blackbird: init at 2016-04-10 2016-05-14 07:41:25 -03:00
Louis Taylor 3b6550c29b sailsd: 0.1.1 -> 0.2.0 (#15445) 
Sails has now been split into a few subcomponents, sailsd being the main
one. This package has been renamed to sailsd, the sailing simulation
daemon.
 2016-05-14 11:05:37 +02:00
Brandon Kase ea018f8339 racerd: init at 0.1.1 
Needed for Rust YouCompleteMe support
 2016-05-14 01:28:08 -07:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Alexey Lebedeff 288c355f01 xscreensaver: Fix xscreensaver-text helper 
xscreensaver-text invokes `appres` binary at runtime. When it's missing,
some screensavers will display Perl stacktraces.
 2016-05-10 18:31:27 +03:00
Sebastian Hagen c84d366295
ghostscript: update upstream URL 
Closes #15342
 2016-05-10 10:32:48 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
zimbatm 9c3c8f55b6 Merge pull request #15303 from laMudri/numix 
numix-gtk-theme: 2.2.3 -> 2.5.1
 2016-05-08 13:38:42 +01:00
laMudri 39b3345c12 numix-gtk-theme: 2.2.3 -> 2.5.1 2016-05-08 12:23:50 +01:00
Tobias Geerinckx-Rice 628ac272da
hplip{,WithPlugin}: 3.16.3 -> 3.16.5 2016-05-08 00:45:08 +02:00
Arseniy Seroka 559553d34a Merge pull request #15127 from bkase/haskell-vim 
vimPlugins: add missing haskell plugins
 2016-05-05 14:46:59 +03:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Brandon Kase 17d85f4e91 vimPlugins: add missing haskell plugins 
* haskell-vim
* hlint-refactor-vim
* vim-haskellConcealPlus
 2016-05-03 23:12:16 -07:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
José Romildo Malaquias 4b2caa2409 Greybird: init at 2016-03-11 2016-05-03 06:45:17 -03:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Stefan Junker 3829bcf866 vim-go: 2016-04-15 -> 2016-05-01 (#15157) 2016-05-02 11:09:04 +02:00
Nikolay Amiantov 784a5ed2ef wine: fix pulseaudio in staging 2016-05-01 01:52:06 +03:00
Tobias Geerinckx-Rice f72d3b2bbf
hplip{,WithPlugin}: 3.15.11 -> 3.16.3 2016-04-30 14:15:33 +02:00
Aristid Breitkreuz ee672f8559 Merge pull request #15085 from kamilchm/YouCompleteMe 
YouComplteMe: FIX: ycm_core.so: undefined symbol: clang_parseTranslat…
 2016-04-30 13:32:56 +02:00
Nikolay Amiantov a589b7bd5f ijs: derive from ghostscript 2016-04-30 03:12:32 +03:00
Kamil Chmielewski 0fcf707673 YouComplteMe: FIX: ycm_core.so: undefined symbol: clang_parseTranslationUnit2FullArgv 
https://github.com/Valloric/YouCompleteMe/issues/2125
 2016-04-29 19:29:20 +02:00
artuuge 03912a2761 epson-escpr: 1.6.4 -> 1.6.5 2016-04-29 12:16:30 +02:00
Nikolay Amiantov 5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Michael Raskin 3db3355c83 dosbox: pass mesa explicitly (needed for glu.h) 2016-04-25 09:12:24 +02:00
Rok Garbas 268ae334d9 Merge pull request #13575 from steveeJ/vimpreviewpandoc 
vim-plugins: init vimpreviewpandoc with python plugins and bugfixes
 2016-04-24 11:19:33 +02:00
Stefan Junker aaec8fb9f1 vim-plugins: add vimprivewpandoc and needed python modules 2016-04-23 18:48:31 +02:00
Stefan Junker 1b80f24788 vim-plugins: make Cocoa optional 2016-04-23 18:46:36 +02:00
Markus Binsteiner 83274eccf0 seafile-*: 4.4.2 -> 5.0.7 
Also updated dependencies:
ccnet: 1.4.2 -> 5.0.7
libsearpc: 1.2.2 -> 3.0.7
 2016-04-23 12:52:42 +12:00
Robert Helgesson 6ec9d21194 theme-vertex: 20150923 -> 20160329 2016-04-22 22:08:26 +02:00
Nikolay Amiantov 34625f646c ppsspp: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Théophane Hufschmitt 5059511324 hplip : add openssl as buildInput 2016-04-18 13:47:15 +02:00
Nikolay Amiantov beeb113eaf Merge pull request #14781 from ambrop72/wine-fix 
wine: Disable stripping to avoid breaking fakedlls.
 2016-04-18 04:19:57 +04:00
Luca Bruno cd8b383f62 cups: do not split doc output 
The DocumentRoot is under doc/ which is looked up in
.out. So for now let doc/ directory in .out.
Not the right fix, but the easiest fix.

cc @vcunat
 2016-04-17 21:09:34 +02:00