obadz
ed01e0ca4f
openssl: fix merge conflict between b6dabe3
and 6e7ca92
2016-08-28 03:53:13 +01: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
Robin Gloster
132571454c
springlobby: remove obsolete substituteInPlace
s
2016-08-27 22:08:20 +00:00
Nikolay Amiantov
df27c35e9a
navit: fix build
2016-08-28 01:04:18 +03:00
Nikolay Amiantov
5eaacbb981
xsw: fix build
2016-08-28 01:04:18 +03:00
Nikolay Amiantov
1db4cb750c
gravit: fix build
2016-08-28 01:04:18 +03:00
Nikolay Amiantov
21c8422f7e
pokerth: fix build
2016-08-28 01:04:18 +03:00
Nikolay Amiantov
9fa012dee5
SDL_ttf: don't link itself to /include
2016-08-28 01:04:18 +03:00
Robin Gloster
b37460ec63
xtreemfs: fix substituteInPlace paths
2016-08-27 21:56:45 +00:00
Robin Gloster
6f9d474db1
njam: disable format hardening
2016-08-27 21:56:33 +00:00
Robin Gloster
c30d4c732e
liquidwar: fix build after glibc upgrade
2016-08-27 21:55:58 +00:00
Robin Gloster
d80ad66701
svtplay-dl: fix path to test runner
2016-08-27 21:55:37 +00:00
Robin Gloster
3f4caa111f
scrypt: remove obsolete substituteInPlace
2016-08-27 21:55:19 +00:00
Robin Gloster
193a57fa48
noweb: remove obsolete substituteInPlace
2016-08-27 21:54:55 +00:00
Robin Gloster
29c5ccea4a
xen: remove obsolete substituteInPlace
2016-08-27 21:54:30 +00:00
Robin Gloster
9f80e55428
openmodelica: disable format hardening
2016-08-27 21:54:17 +00:00
Robin Gloster
191896e63a
qfsm: disable format hardening
2016-08-27 21:53:49 +00:00
Robin Gloster
c0e42fe741
imv: add fontconfig dependency
2016-08-27 21:53:27 +00:00
Tuomas Tynkkynen
1409bc003b
make-bootstrap-tools-cross.nix: Fix gcc build-time options for armv5tel
...
I broke this in the cleanups I did in 171c7f0
, the gcc inside the bootstrap
tarball is not getting built with the correct --with-fpu, --with-float
etc. options.
2016-08-28 00:30:48 +03:00
Robin Gloster
a2a337c562
gksu: disable format hardening
2016-08-27 21:13:03 +00:00
Joachim F
c82d9e9fae
Merge pull request #17884 from garrison/vmtouch-1.1.0
...
vmtouch: 1.0.2 -> 1.1.0
2016-08-27 21:38:48 +02:00
Thomas Tuegel
7a9e04943d
qt5: use absolute paths to plugins in CMake
...
CMake needs absolute paths to plugin shared objects in case one package
provides a plugin for a different package.
2016-08-27 12:24:54 -05:00
Gabriel Ebner
5f0db537df
Merge pull request #18037 from patjouk/update-jabref
...
jabref: 3.5 -> 3.6
2016-08-27 17:48:33 +02:00
Rok Garbas
1102352a79
Merge pull request #17906 from garbas/neovim-0.1.5-update
...
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
2016-08-27 17:44:34 +02:00
Vladimír Čunát
f86392bfbe
chromium: fixup share/share
...
Reported on https://github.com/NixOS/nixpkgs/issues/11501#issuecomment-164383204
2016-08-27 17:38:25 +02:00
Vladimír Čunát
069120110d
Merge #18013 : gnumeric: 1.12.26 -> 1.12.32
...
It seems fine on Linux, except for gtk3 theming problems but that looks
the same as before the update.
2016-08-27 17:18:05 +02:00
patjouk
b2295f70db
jabref: 3.5 -> 3.6
2016-08-27 16:28:55 +02:00
Lluís Batlle i Rossell
8d4de4fe4f
Updating mumble to 1.2.16.
2016-08-27 15:46:33 +02:00
Michael Raskin
2a210e3430
neural-style: init at 0.0pre2016.08.15
2016-08-27 15:41:58 +02:00
Michael Raskin
f3a86cf599
loadcaffe: init at 0.0pre2016.08.01
2016-08-27 15:41:58 +02:00
Michael Raskin
2e0c1c3758
torch: find libjpeg and libpng, use compatible openblas
2016-08-27 15:41:58 +02:00
Nikolay Amiantov
3f70fcd4c1
Merge pull request #11484 from oxij/nixos-toposort-filesystems
...
lib: add toposort, nixos: use toposort for fileSystems to properly support bind and move mounts
2016-08-27 14:34:55 +04:00
Peter Simons
44289f81e9
Merge pull request #18022 from mboes/ghcHEAD
...
haskell.compiler.ghcHEAD: update to latest upstream (20160826).
2016-08-27 12:34:14 +02:00
Joachim F
739261f3bc
Merge pull request #18028 from rnhmjoj/imv
...
imv: fix failing build
2016-08-27 12:23:45 +02:00
Joachim F
fca4e066bb
Merge pull request #18030 from Ralith/matrix-synapse
...
matrix-synapse: 0.17.0 -> 0.17.1
2016-08-27 12:23:38 +02:00
Joachim Fasting
ac193edd2d
runit: support building with clangStdenv
2016-08-27 11:49:26 +02:00
Ram Kromberg
ee1cc78333
Revert "wine: use gcc49 for 64-bit builds"
...
This reverts commit 24835df322
.
2016-08-27 12:27:42 +03:00
Robin Gloster
08112088c9
Merge pull request #18033 from markus1189/source-code-pro-2.030
...
source-code-pro: 2.010 -> 2.030
2016-08-27 09:26:39 +00:00
Robin Gloster
e49117c5ef
Merge pull request #18032 from erikryb/master
...
neomutt: 20160723 -> 20160827
2016-08-27 09:26:00 +00:00
Joachim F
cb2bb72de5
Merge pull request #17996 from Ptival/vscode-1.4.0
...
vscode: 1.2.1 -> 1.4.0
2016-08-27 10:51:54 +02:00
Joachim F
9003f9d9a1
Merge pull request #18017 from joachifm/tor-0_2_8_7
...
tor: 0.2.7.6 -> 0.2.8.7
2016-08-27 10:44:39 +02:00
Joachim F
cfbb43e54d
Merge pull request #18020 from joachifm/runit-refactor
...
runit: refactor, add man output
2016-08-27 10:44:27 +02:00
Markus Hauck
6879f1e57e
source-code-pro: 2.010 -> 2.030
2016-08-27 10:41:36 +02:00
Joachim Fasting
f6fc56d35a
refind: 0.9.2 -> 0.10.3, fix build
2016-08-27 10:41:01 +02:00
Erik Rybakken
5212eb3882
neomutt: 20160723 -> 20160827
2016-08-27 10:37:53 +02:00
Bjørn Forsman
daa9d5edca
perf: unbreak build since glibc 2.24 upgrade
...
glibc 2.24 deprecated readdir_r, breaking the perf build:
$ nix-build -A linuxPackages.perf
...
CC util/event.o
CC util/evlist.o
util/event.c: In function '__event__synthesize_thread':
util/event.c:448:2: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations]
while (!readdir_r(tasks, &dirent, &next) && next) {
^
In file included from /nix/store/8ic0jwg3p5vcwx52k4781n987hmv0bks-glibc-2.24-dev/include/features.h:368:0,
from /nix/store/8ic0jwg3p5vcwx52k4781n987hmv0bks-glibc-2.24-dev/include/stdint.h:25,
from /nix/store/jsazxc1b86g2ww569ziwhhvkz8z43vjd-gcc-5.4.0/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/include/stdint.h:9,
from /tmp/nix-build-perf-linux-4.4.19.drv-0/linux-4.4.19/tools/include/linux/types.h:6,
from util/event.c:1:
/nix/store/8ic0jwg3p5vcwx52k4781n987hmv0bks-glibc-2.24-dev/include/dirent.h:189:12: note: declared here
extern int __REDIRECT (readdir_r,
^
util/event.c: In function 'perf_event__synthesize_threads':
util/event.c:586:2: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations]
while (!readdir_r(proc, &dirent, &next) && next) {
Fix by adding -Wno-error=deprecated-declarations compile flag.
2016-08-27 10:21:57 +02:00
Robin Gloster
e646d2c07c
gnome3.gtk: fix build on darwin
...
The .la file does not exist on darwin.
2016-08-27 08:00:20 +00:00
Benjamin Saunders
96198d7421
matrix-synapse: 0.17.0 -> 0.17.1
2016-08-26 23:37:18 -07:00
Moritz Ulrich
8cd3e1e2ba
rustc: 1.10.0 -> 1.11.0 and beta/unstable updates.
...
Give cargo the right name.
Fix versioning.
rustBeta: -> 2016-08-17
Looks like rustUnstable.rustc needs *exactly* this version.
2016-08-27 08:24:16 +02:00
rnhmjoj
f0daeb575a
imv: fix failing build
2016-08-27 06:42:44 +02:00