JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,646 Commits 2 Branches 0 Tags 13 GiB
34f12184cd
Commit Graph

691 Commits

Author SHA1 Message Date
Markus Mueller
55b5a94d84 desmume: fix build with gcc6 by adding debian patch 
Debian also removed the package in testing when building
with gcc7.
 2017-09-10 14:52:13 +00:00
Sander van der Burg
bf9b88f154 fs-uae: build on x86 linux only 2017-09-10 14:51:23 +00:00
Sander van der Burg
345e570921 fs-uae: 2.8.0 -> 2.8.3 2017-09-10 14:25:31 +00:00
Sander van der Burg
6e1eedd64e vice: 2.2 -> 3.1 + fix build procedure 2017-09-10 13:37:26 +00:00
Sander van der Burg
0d8e157d61 zsnes: restrict building to x86-based Linux platforms only, znses' core is written in x86 asm code 2017-09-10 12:19:11 +00:00
lassulus
f068f3f209 mupen64plus: 1.5 -> 2.5 2017-09-09 18:28:52 +02:00
Cray Elliott
c892f77e37 wineUnstable: 2.15 -> 2.16 
bump staging as well
 2017-09-08 13:29:45 -07:00
lassulus
2524e4cfd5 vbam: svn-1507 -> unstable-2017-09-04 2017-09-08 15:37:59 +02:00
Cray Elliott
f03964ff7c winetricks: 20170614 -> 20170823 2017-09-05 23:29:31 -07:00
Jörg Thalheim
c23654b2ed Merge pull request #28940 from AndersonTorres/upload-higan 
Higan: 103 -> 104
 2017-09-03 17:22:33 +01:00
AndersonTorres
957dbe4642 Higan: 103 -> 104 2017-09-03 12:58:19 -03:00
Jörg Thalheim
4b10de8182 nestopia: fix icon theme 2017-09-03 16:38:19 +01:00
Samuel Leathers
7d54467ad0 nestopia: 1.46.2 -> 1.47 2017-09-03 08:46:14 -04:00
Cray Elliott
6a1be3d4f4 dolphinEmuMaster: 20170730 -> 20170902 
many bugfixes and features implemented, included accurate NAND support
and ubershaders v2
 2017-09-02 03:57:10 -07:00
Jörg Thalheim
e1f755e44f Merge pull request #28668 from AndersonTorres/upload-mednafen 
Mednafen: 0.9.38.7 -> 0.9.47
 2017-08-29 08:13:49 +01:00
AndersonTorres
026bc4f783 Mednafen: 0.9.38.7 -> 0.9.47 
And some minor changes
 2017-08-29 00:10:20 -03:00
AndersonTorres
18df335c17 Mednafen-server: change download location 
And some minor modifications
 2017-08-29 00:05:55 -03:00
Cray Elliott
ecea06ab2e wine-mono: 4.7.0 -> 4.7.1 2017-08-28 18:02:05 -07:00
Cray Elliott
2639bcee5d wineUnstable: 2.14 -> 2.15 2017-08-24 13:52:29 -07:00
Alexander V. Nikolaev
ed0af35697 wineUnstable: 2.13 -> 2.14 
Staging updated as well
 2017-08-13 14:51:47 -07:00
Joachim F
9ed9ede922 Merge pull request #27963 from ryantm/zsnes 
zsnes: remove $STRIP from compiler options
 2017-08-13 20:56:47 +00:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
AndersonTorres
260bab6c7f higan: 102 -> 103 2017-08-07 22:51:46 -03:00
Ryan Mulligan
0b21848e77 zsnes: remove $STRIP from compiler options 
In ab70693 @viric says zsnes works better without stripping. But the
build expression kept the $STRIP in the compiler options, so if it is
set to something it will show up in there. For example:

g++  -pipe -I. -I/usr/local/include -I/usr/include -D__UNIXSDL__ -I/nix/store/04qgmdpmalgsy92zgs2z896jx073hcn2-SDL-1.2.15-dev/include/SDL -I/nix/store/04qgmdpmalgsy92zgs2z896jx073hcn2-SDL-1.2.15-dev/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  -DNCURSES -D__OPENGL__ -march=native -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr strip -D__RELEASE__ -fno-rtti -o tools/fileutil.o -c tools/fileutil.cpp

g++: error: strip: No such file or directory

This commit removes that reference to $STRIP too.
 2017-08-05 07:39:48 -07:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Cray Elliott
2a8c1a942e dolphinEmuMaster: 20170705 -> 20170730 
generally I only update this once a month or less, but the much awaited
ubershader branch landed
 2017-07-31 11:59:46 -07:00
Alexey Lebedeff
1d72b7345f dosbox-unstable: init at 2017-07-02 
As current stable version segfaults when playing HoMM2, as described at
https://www.reddit.com/r/linux_gaming/comments/4dxfei/dosbox_segmentation_fault_core_dumped/

Also some missing dependencies (compared to stable version) were added:
- SDL_sound - for mounting .cue files with compressed sound
- SDL_net - for IPX support
- libpng - for making screenshots
 2017-07-28 11:20:56 +03:00
Nikolay Amiantov
732207f456 citra: fix license field 2017-07-27 17:28:13 +03:00
Nikolay Amiantov
bc52bf2cfe citra: init at 2017-07-26 2017-07-27 17:07:45 +03:00
Cray Elliott
d82fa7f915 wineUnstable: 2.12 -> 2.13 2017-07-26 15:36:49 -07:00
Herwig Hochleitner
7d83f048e2 cdemu: 3.0.x -> 3.1.0 
fixes cdemu for kernel >= 4.11
fixes client by adding pygobject3
 2017-07-25 11:56:59 +02:00
Cray Elliott
faad06df6b wine: 2.0.1 -> 2.0.2 2017-07-20 13:52:43 -07:00
Cray Elliott
ccf7b4b57e wine-mono: 4.6.4 -> 4.7.0 2017-07-18 12:10:29 -07:00
Cray Elliott
f91c591ea2 wineUnstable, wineStaging: 2.11 -> 2.12 2017-07-13 14:44:18 -07:00
Cray Elliott
3365fdea04 wineUnstable: 2.10 -> 2.11 
2.11 was picked instead of 2.12 since staging hasn't caught up yet,
 also updates staging
 2017-07-09 21:23:05 -07:00
0xABAB
784240de3e wine: add missing dependency libcap on Linux 2017-07-09 10:40:53 +02:00
Cray Elliott
b963ba1bee dolphinEmuMaster: 20150802 -> 20170705 
removed a substitution that is no longer needed, add new
dependencies, and use fetchFromGitHub instead of fetchgit
 2017-07-08 14:24:42 -07:00
Cray Elliott
71e495e10f winetricks: 20170327 -> 20170614 2017-06-27 02:00:49 -07:00
Cray Elliott
922d706e81 wineStaging: 2.7 -> 2.10 
wineUnstable: 2.7 -> 2.10
 2017-06-20 11:23:37 -07:00
Edward Tjörnhammar
a66a9ae8e8
kodi-retroarch-advanced-launchers: ensure sound has been released 2017-06-09 20:41:02 +02:00
Edward Tjörnhammar
44a9f37ba8
libretro: add parallel-n64 core 2017-06-07 23:31:20 +02:00
Edward Tjörnhammar
beb04aabac
libretro.dolphin: init at 2017-06-04 2017-06-04 21:11:14 +02:00
Edward Tjörnhammar
f270376cd7
libretro.*: 2015-11-20 -> 2017-06-04 2017-06-04 03:27:55 +02:00
Edward Tjörnhammar
1845a2d735
retroarch: 1.3.4 -> 1.6.0 2017-06-04 03:27:55 +02:00
Nikolay Amiantov
e7530e6a5a wine: reorganize packages 
Move most of wine configurations to winePackages which is not built on Hydra.
Leave two top-level packages:

wine: stable release with an "office" configuration;
wineStaging: staging release with a "full" configuration.
 2017-06-04 00:57:45 +03:00
Nikolay Amiantov
46a2da8766 wine: use gstreamer-1.0 2017-05-24 02:27:05 +03:00
Nikolay Amiantov
2d1e5e87db wine: fix libva support 2017-05-24 02:27:01 +03:00
Nikolay Amiantov
bf230536e0 wineStaging: fix patching in nix-shell 2017-05-24 02:26:57 +03:00
Nikolay Amiantov
95f321480f wine: add udev support 2017-05-24 02:26:53 +03:00
Jörg Thalheim
728b8ab483
pcsxr: use wrapGAppsHook 2017-05-11 20:34:42 +01:00
Alexander V. Nikolaev
f3c19651db winetricks: 20170316 -> 20170327 2017-05-09 01:34:09 +03:00
Alexander V. Nikolaev
1ce951e79a wineUnstable: 2.6 -> 2.7 
Update staging as well
 2017-05-09 01:33:53 +03:00
Vladimír Čunát
f1ed43c14e
Merge #24949: desmume: fix mesa+osmesa 2017-05-01 23:55:14 +02:00
Linus Heckemann
3e31f2a645 dolphin-emu: include more dependencies 
Previously, dolphin would build against vendored copies of the
libraries (shipped in source code form). This would result both
in a longer build (wxWidgets takes a while to build!) and in
bulkier binaries that wouldn't share libraries with others,
along with using fixed versions of curl and mbedtls which may
be left with unpatched security vulnerabilities.
 2017-04-30 13:20:52 +01:00
aszlig
f84b8178aa
wine-staging: Fix SHA256 hash 
In c6b3c66277, the unstable version has
been bumped to 2.6.

Unfortunately the staging source is re-using the version attribute from
the unstable source and thus has been bumped as well.

I have built wineStaging on x86_64-linux and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @FRidh
 2017-04-23 20:37:53 +02:00
Frederik Rietdijk
c6b3c66277 wineUnstable: 2.5 -> 2.6 2017-04-21 21:38:54 +02:00
Frederik Rietdijk
d16a4512d0 wine: 2.0 -> 2.0.1 2017-04-21 21:38:54 +02:00
Vladimír Čunát
7644651e62
desmume: fix mesa+osmesa 
It builds fine, but some better testing should be done before merging.
 2017-04-16 11:21:28 +02:00
Alexander V. Nikolaev
3ec56d8da2 wineUnstable: 2.4 -> 2.5 2017-04-10 18:37:28 +03:00
Robin Gloster
f0512f4ceb
wxmupen64plus: fix eval 2017-03-30 17:36:43 +02:00
Robin Gloster
5c04b32b6c
wxmupen64plus: mark as broken 2017-03-30 16:23:35 +02:00
Patrick Callahan
75f5ed2489 ppsspp: 1.1.0 -> 1.3 2017-03-24 10:40:24 -07:00
Dan Peebles
306f2c65fe zsnes: only build on Linux 
It uses callPackage_i686 which forces Linux anyway, and the current setup
just means that we end up with a weird i686-linux job under Darwin.
 2017-03-23 22:41:45 -04:00
Herwig Hochleitner
a634f0b12c wine: 2.3 -> 2.4 
winetricks: 20170207 -> 20170316
 2017-03-22 01:14:07 +01:00
Herwig Hochleitner
e9a1fc72e0 wine: 2.2 -> 2.3 2017-03-22 01:09:07 +01:00
Herwig Hochleitner
7069b8938d wine: 2.1 -> 2.2 2017-03-22 01:09:03 +01:00
Tuomas Tynkkynen
413bc03986 mess: Mark broken 
Even fixing the source urls doesn't make it build.
 2017-03-08 16:14:19 +02:00
Jörg Thalheim
c31c11ecef Merge pull request #23482 from rardiol/pcsxr 
pcsxr: remove name conflict with zlib 1.2.9
 2017-03-06 08:59:13 +01:00
Ricardo Ardissone
92d8680785 pcsxr: remove name conflict with zlib 1.2.9 2017-03-04 08:36:06 -03:00
Benno Fünfstück
1f7fe3dc07 vbam: fix location of etc in output 
Shell variables are not expanded in cmakeFlags, so the etc files ended up in
`$out/'$out'/etc` instead of the expected `$out/etc`.
 2017-03-03 12:27:49 +01:00
Christoph Hrdinka
c4eee0c4f1
retroarch.beetle-saturn: set platforms to x86_64-linux 
cc #23253.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2017-02-28 15:18:06 +01:00
Christoph Hrdinka
1aaf2be2a0
retroarch: libretro-mednafen-* -> libretro-beetle-* 
Rename all mednafen-* libretro ports to beetle-* due #23163.

Closes #23163.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2017-02-25 16:19:09 +01:00
Vladimír Čunát
9fe56e52dd
dolphinEmu*: fixup build with glibc-2.25 2017-02-21 19:03:36 +01:00
Anderson Torres
4129697445 higan: 101 -> 102 (#22942) 2017-02-19 18:27:04 +00:00
Graham Christensen
2495065351 Merge pull request #22667 from avnik/wine-update 
wineUnstable: 2.0 -> 2.1
 2017-02-12 18:54:47 -05:00
Christoph Hrdinka
a7ca114545
libretro: add mGBA core 
Closes #22618.
 2017-02-12 12:38:20 +01:00
Alexander V. Nikolaev
9ed445a0f7 wineUnstable: 2.0 -> 2.1 2017-02-12 11:23:48 +02:00
Joachim F
2488e42cc5 Merge pull request #22620 from hrdinka/add/libretro-reicast 
libretro: add reicast core
 2017-02-11 20:15:59 +01:00
Christoph Hrdinka
c4a47bdb5e
libretro: add mednafen-saturn core 2017-02-11 13:49:33 +01:00
Christoph Hrdinka
95ee742dcd
attract-mode: init at 2.2.0 2017-02-10 12:25:26 +01:00
Christoph Hrdinka
d04ee2f91c
libretro: add reicast core 2017-02-10 12:11:29 +01:00
Herwig Hochleitner
ae33b4673d wine: 1.8.6 -> 2.0 2017-02-09 16:20:49 +01:00
Herwig Hochleitner
023c3c77ee cdemu: bugfix updates 
image-analyzer: 3.0.0 -> 3.0.1
cdemu-client: 3.0.1 -> 3.0.3
cdemu-daemon: 3.0.3 -> 3.0.5
gcdemu: 3.0.1 -> 3.0.2
libmirage: 3.0.4 -> 3.0.5
vhba: 20140928 -> 20161009
 2017-02-06 05:09:12 +01:00
Cray Elliott
3acd52d917 mgba: 0.5.1 -> 0.5.2 2017-02-02 15:34:38 -08:00
Robin Gloster
0cd1f6bb51
gxemul: get rid of composableDerivation 2017-01-27 17:36:38 +01:00
Franz Pletz
9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Nikolay Amiantov
d75a3cfb29 Merge pull request #21995 from abbradar/opencl 
Fix OpenCL support
 2017-01-20 12:09:17 +03:00
Nikolay Amiantov
10bae1a207 opencl-icd: remove, point to ocl-icd 2017-01-20 03:37:51 +03:00
Robin Gloster
3405f703f2
gxemul: fix disappeared download link 2017-01-14 20:02:12 +01:00
Vladimír Čunát
d442a0ffc0
wine*: fixup build by using older flex 2017-01-06 16:25:37 +01:00
Herwig Hochleitner
cd9edbb15b wine: 1.8.4 -> 1.8.6 
wine: 2.0-rc2 -> 2.0-rc3
winetricks: 20160724 -> 20170101
 2017-01-02 13:20:19 +01:00
Alexander V. Nikolaev
76b5f2c249 wineUnstable: 1.9.23 -> 2.0-rc2 
Update staging as well
 2016-12-22 16:06:18 +02:00
Alexander V. Nikolaev
edcfa0f3fa wine-unstable: 1.9.22 -> 1.9.23 2016-11-18 13:16:02 +02:00
Alexander V. Nikolaev
d89c3acced wineUnstable: 1.9.20 -> 1.9.22 
Also update staging as well
 2016-11-04 06:04:15 +02:00
Sander van der Burg
22a4d6bd54 fs-uae: 2.4.3 -> 2.8.0 2016-10-10 20:37:11 +00:00
AndersonTorres
fd38aeafcd mgba: git-20160325 -> 0.5.1 2016-10-09 16:47:54 +02:00
Nikolay Amiantov
bc0970f1e3 zsnes: use more debian patches 
Fixes #19343
 2016-10-08 01:40:22 +03:00
Michael Raskin
92675bb6e5 wineUnstable, wineStaging: 1.9.18 -> 1.9.20 2016-10-03 13:54:18 +02:00
Aneesh Agrawal
fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags 
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
 2016-10-01 16:13:41 +02:00
Frederik Rietdijk
7d4f8d29e7 gcdemu: do not use top-level python packages 2016-09-25 23:13:41 +02:00
Herwig Hochleitner
9a10569480 wine: 1.8.3 -> 1.8.4; 1.9.16 -> 1.9.18 
- update mono and gecko versions
- update winetricks
- replace sourceforge download urls
 2016-09-13 17:33:24 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Michael Raskin
d1bf595cc5 wine: 1.8.3 -> 1.8.4; wineUnstable: 1.9.16 -> 1.9.18 2016-09-12 13:08:51 +02:00
Nikolay Amiantov
2128224620 linuxPackages.vhba: disable PIC hardening 2016-08-31 16:00:31 +03:00
Robin Gloster
1876ce8494
ataripp: add missing libSM dependency 2016-08-29 17:15:10 +00:00
obadz
3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Ram Kromberg
ee1cc78333 Revert "wine: use gcc49 for 64-bit builds" 
This reverts commit 24835df322.
 2016-08-27 12:27:42 +03:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
27bb66bd94 treewide: Make explicit that 'dev' output of gst_all_1.gst-plugins-base is used 2016-08-23 03:52:06 +03:00
Anderson Torres
d559c07bbe Higan: 100 -> 101 (#17903) 2016-08-22 18:12:03 +01:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging 
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
 2016-08-22 01:19:35 +01:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus. 
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
 2016-08-16 22:52:37 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Alexander V. Nikolaev
b81cf59bd7 wine: 1.9.14 -> 1.9.16 
Update wineUnstable and wineStaging
 2016-08-14 10:22:05 +03:00
Robin Gloster
a748f315db fakenes: disable format hardening 2016-08-04 07:48:23 +00:00
Robin Gloster
7e81a4294d dlx: disable format hardening 2016-08-04 07:48:23 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
9b5dcffe22 retroarch: Propagate meta info to wrapper 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
AndersonTorres
9b1b3aa2ff higan: 099 -> 100 2016-07-30 19:36:01 -03:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Kranium Gikos Mendoza
615d818964 ppsspp: fix qmake4Hook build 
pass PPSSPPQt.pro which was removed in 34625f6
 2016-07-17 22:42:46 +08:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00: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
William Casarin
7129ebbd5e dolphin-emu: 4.0.2 -> 5.0 2016-07-06 12:22:58 -07: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
Vladimír Čunát
3afa246038 Merge branch 'staging' 
This includes a security update of expat.
 2016-06-29 07:47:04 +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
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
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
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00: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
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00