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
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00: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
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
AmatCoder
15dbdc5930
mednaffe: Fix segfault on shutdown
2016-05-25 06:30:40 +00:00
Tuomas Tynkkynen
c857552da8
treewide: Make explicit that 'dev' output of libX11 is used
2016-05-19 10:04:38 +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
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Nikolay Amiantov
784a5ed2ef
wine: fix pulseaudio in staging
2016-05-01 01:52:06 +03: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
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
Ambroz Bizjak
d7eadb19fb
wine: Disable stripping to avoid breaking fakedlls.
2016-04-17 20:59:46 +02:00
Alexander V. Nikolaev
9751cd456a
wine: Fix RPATH for multiple-outputs
2016-04-17 18:51:34 +03:00
AndersonTorres
92f06ba130
higan: 096 -> 098
...
Now without some options, reflecting upstream development.
In special, no GTK building (as it was obsoleted on 096)
and no profile selecion, because it will be obsoleted
on next release.
2016-04-15 15:04:20 -03:00
joachifm
be284a5f97
Merge pull request #14577 from hrdinka/fix/pcsx2
...
pcsx2: disable advance SIMD instructions
2016-04-14 14:17:22 +02:00
Nikolay Amiantov
755e4633c7
mass-replace glib and gtk lib/*/include paths
2016-04-14 04:13:54 +03:00
Anderson Torres
4ec9453881
mgba: 0.3.1 -> git 20160325 ( #14578 )
...
I have made this release fromgit because 0.4.0 release doesn't
compile (gcc complains with an error in Window.cpp: "isnan is not
defined on this scope"). The error disappears on mgba git master.
2016-04-13 19:55:33 +01:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Nikolay Amiantov
24835df322
wine: use gcc49 for 64-bit builds
2016-04-12 20:55:28 +03:00
Nikolay Amiantov
71e7f0cad4
wine: use only native-arch native dependencies
2016-04-12 18:52:05 +03:00
Nikolay Amiantov
ff7f297ea2
wine: add more dependencies (notably, mpg123 and openal)
2016-04-12 18:44:04 +03:00
Nikolay Amiantov
b109f33d64
wine: fix outputs and pulseaudio support
2016-04-12 18:44:04 +03:00
Alexander V. Nikolaev
25d2a6a1b2
wineUnstable: 1.9.4 -> 1.9.7
...
Also update wineStaging as well
2016-04-12 18:44:04 +03:00
Christoph Hrdinka
cc1cef3abc
pcsx2: disable advance SIMD instructions
...
By setting `-DDISABLE_ADVANCE_SIMD=TRUE` pcsx2 will be compiled with predefined
SIMD flags instead of `-march=native`. This makes the resulting binary more
portable. Further this seems to be needed to make pcsx2 compile with gcc5.
2016-04-10 20:54:32 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
Nikolay Amiantov
0c6db0ca48
cc-wrapper: add option to skip flags for native optimizations
2016-03-24 20:16:17 +03:00
Sheena Artrip
ef2f2de53a
mednaffe: init at 0.8
2016-03-23 00:38:58 -04:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Raymond Gauthier
9be54a523e
retroarch: improvements
...
- Added missing freedesktop items (`*.desktop` and icon).
Note that for the moment, only added an `*.svg`
icon as was the only available. It does not give
us the best results (at least in xfce). We may decide
later on to extract the content of the `*.ico` instead
which is a bit more involved.
2016-03-13 20:05:01 -04:00
Christoph Hrdinka
c5ec5bc84a
libretro-mednafen-psx: init at 2016-03-04
2016-03-08 14:18:44 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-07 22:08:27 +01:00
Christoph Hrdinka
56705a1fa3
retrofe: fix gstreamer plugin path
2016-03-06 15:04:16 +01:00
Franz Pletz
cb3d27df93
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Edward Tjörnhammar
64f006d08c
Merge pull request #13483 from hrdinka/add/libretro-mame
...
libretro-mame: init at git-2016-02-10
2016-03-04 10:50:10 +01:00
Robin Gloster
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00
zimbatm
69ce5cb656
use the sourceforge mirrors everywhere
...
find pkgs -name "*.nix" -exec sed -r \
"s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Christoph Hrdinka
d1c35db920
retrofe: init at 0.6.169
2016-02-27 15:41:21 +01:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Christoph Hrdinka
13f0bb7a53
libretro-mame: init at git-2016-02-10
2016-02-26 14:21:43 +01:00
Christoph Hrdinka
bd5e2d723c
pcsx2: init at 1.4.0
2016-02-26 10:21:31 +01:00
Herwig Hochleitner
53b9ac0d13
wine-unstable: 1.9.3 -> 1.9.4
...
winetricks: 20160109 -> 20160219
gecko: 2.40 -> 2.44
2016-02-22 23:41:12 +01:00
Robin Gloster
5923f792e1
uae: turn off format hardening
2016-02-22 00:22:28 +00:00