Commit graph

29955 commits

Author SHA1 Message Date
Bjørn Forsman
9a185a990d uncrustify: 0.61 -> 0.63 2016-05-22 20:04:44 +02:00
Arseniy Seroka
8a36b38b37 Merge pull request #15603 from dochang/editorconfig-core-c
editorconfig-core-c: 0.12.0 -> 0.12.1
2016-05-22 20:25:50 +03:00
Arseniy Seroka
8026791fbf Merge pull request #15623 from vbgl/cppo-1.3.2
cppo: 1.1.2 -> 1.3.2
2016-05-22 20:25:00 +03:00
Vincent Laporte
ce147f9a0d cppo: 1.1.2 -> 1.3.2 2016-05-22 17:22:25 +02:00
Bjørn Forsman
1cc4e03a7c wildmidi: 0.3.8 -> 0.3.9 2016-05-22 17:12:31 +02:00
Desmond O. Chang
8d419e6be7 editorconfig-core-c: 0.12.0 -> 0.12.1 2016-05-22 04:02:37 +08:00
Anthony Cowley
7b56411fef tinyxml: darwin compatibility
- Relax the baked-in assumption that g++ is used to build and link
- Use the appropriate shared library extension on darwin
2016-05-21 21:04:41 +02:00
Robert Helgesson
a37e639cec perl-maatkit: fix build 2016-05-21 17:43:26 +02:00
Anthony Cowley
e4e422aa91 pcl: visualization components in darwin
Supplies the necessary frameworks and build system tweaks to build the
vtkWithQt4 components on darwin. This follows on from PRs #14705 and #14749.
2016-05-21 17:38:28 +02:00
Joachim Fasting
a2f7ae1935 Merge pull request #15582 from romildo/upd.numix-gtk-theme
numix-gtk-theme: 2.5.1 -> 2016-05-19
2016-05-21 07:09:49 +02:00
Vladimír Čunát
5dfe6fd034 perl: fix evaluation on cygwin
... and maybe on other platforms that have `stdenv.cc.cc == null`.
No hash changes where it did evaluate previously. Discussion:
https://github.com/NixOS/nixpkgs/commit/b291f1682f#commitcomment-17558440
2016-05-20 21:37:27 +02:00
Vladimír Čunát
a6b6f6e049 Merge branch 'staging'
This is to get security fix for expat soon-ish.
Causes ~8k rebuilds; whole staging would be a stdenv rebuild.
2016-05-20 16:33:28 +02:00
José Romildo Malaquias
7a9b98b5f5 sass: init at 3.4.22 2016-05-20 10:41:06 -03:00
Joachim Fasting
de3538c63e Merge pull request #15568 from NeQuissimus/kotlin102
kotlin: 1.0.1-2 -> 1.0.2
2016-05-20 15:40:41 +02:00
Joachim Fasting
e071dab266 Merge pull request #15252 from acowley/llvm_38
llvm_38: update hashes and fix on darwin
2016-05-20 15:38:33 +02:00
Peter Simons
7b75e82785 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-11-g659087e using the following inputs:

  - Hackage: a7fe14b44c
  - LTS Haskell: e1becfd6f8
  - Stackage Nightly: fac5530021
2016-05-20 14:47:06 +02:00
Vladimír Čunát
c2ee8e1033 qt56.qtbase: fix evaluation on darwin
/cc @ttuegel.
Maybe there's a better way; I didn't want to spend much time.
2016-05-20 12:48:50 +02:00
Robert Helgesson
34cf7934c3 expat: patch CVE-2015-1283 and CVE-2016-0718 (close #15561)
Note, CVE-2015-1283 is already patched in expat version 2.1.1 but, as
explained in the patch, the fix was insufficient.
2016-05-20 09:43:29 +02:00
Tim Steinbach
342dd50a1e kotlin: 1.0.1-2 -> 1.0.2 2016-05-20 02:35:00 +00:00
zimbatm
857a5229fb Merge pull request #15543 from groxxda/bump/libuv
libuv: 1.9.0 -> 1.9.1, nodejs-4.3.1 -> 4.4.4, nodejs-5.11.0 -> 5.11.1
2016-05-19 15:40:12 +01:00
Vladimír Čunát
5eea16ee90 Merge branch 'master' into staging
... to get expat mass rebuild.
Hydra nixpkgs: ?compare=1272431
2016-05-19 15:42:18 +02:00
Vladimír Čunát
da2788c3d7 Merge #15354: add tracefilegen and tracefilesim 2016-05-19 10:29:28 +02:00
Vladimír Čunát
70c66e9828 tracefilegen, tracefilesim: fixup source hashes
and also whitespace. This is probably due to #15469.
2016-05-19 10:27:57 +02:00
Roger Qiu
c02bc80d86 garcosim: Added tracefilegen and tracefilesim 2016-05-19 18:00:09 +10:00
Bjørn Forsman
b06ecd7f85 qtcreator: 3.6.0 -> 3.6.1 (bugfixes)
Changelog:
http://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-3.6.1.md?h=3.6
2016-05-18 21:03:40 +02:00
Joachim Fasting
455a4aebe0 Merge pull request #15540 from groxxda/fix/dust
dust: fix hash, use fetchFromGitHub, add meta
2016-05-18 19:01:19 +02:00
Alexander Ried
1159b1561a nodejs-6_x: use xz instead of gz 2016-05-18 18:36:54 +02:00
Alexander Ried
c97b407899 nodejs-5_x: 5.11.0 -> 5.11.1 2016-05-18 18:36:54 +02:00
Alexander Ried
c086ab7096 nodejs-4_x: 4.3.1 -> 4.4.4 2016-05-18 18:36:53 +02:00
Alexander Ried
88ffa3ae89 libuv: 1.9.0 -> 1.9.1 2016-05-18 18:36:53 +02:00
Alexander Ried
3e39cfe860 dust: add meta field 2016-05-18 17:31:12 +02:00
Alexander Ried
b5ae9ad3fb dust: use fetchFromGitHub (sha was broken) 2016-05-18 17:31:07 +02:00
James Cook
35c0d1aba8 Merge pull request #15526 from rycee/bump/expat
expat: 2.1.0 -> 2.1.1
2016-05-18 08:30:06 -07:00
Moritz Ulrich
29644950d4 rr: Only build native architecture.
rr wants to build itself with 32+64bit support on 64bit systems, but
this fails in recent NixOS versions as it can't find libstdc++.so.6 at
runtime.

This patch disables 32bit builds on 64bit. To debug 32bit binaries,
pkgsi686Linux.rr can be used.
2016-05-18 12:56:48 +02:00
Rok Garbas
0431fe6194 Merge pull request #15529 from holidaycheck/node-6.2.0
nodejs: 6.1.0 -> 6.2.0
2016-05-18 12:54:23 +02:00
Nikolay Amiantov
d3da0bd78f elm: add documentation on how to use update scripts and run them properly 2016-05-18 13:30:38 +03:00
Nikolay Amiantov
c366ab933d haskell.packages.ghc801.ghc: upstream tarball updated 2016-05-18 13:25:48 +03:00
Mathias Schreck
22b0cb9a72 nodejs: 6.1.0 -> 6.2.0 2016-05-18 10:31:21 +02:00
Robert Helgesson
6658077815 expat: 2.1.0 -> 2.1.1
Also remove CVE patch merged upstream and enable tests.
2016-05-17 21:20:48 +02:00
Bjørn Forsman
314b1fbf0c saleae-logic: 1.1.15 -> 1.2.9
Changelog:
http://support.saleae.com/hc/en-us/articles/210245593-Saleae-Logic-Beta-Software-Changelog

(Yes, the changelog title contains the word 'beta', but as of version
1.2.9 the beta branding is removed from the software as the beta branch
was merged to master.)

This software update is required for newer logic analysers (e.g. Logic
Pro 8). (The original Logic is still supported, although it's difficult
to find info about it on their website.)

v1.2.9 grew new dependencies: libxcb, zlib, pciutils, xkeyboardconfig.

The LD_PRELOAD library hack, used to divert writes from
$out/Settings/settings.xml to $HOME/.saleae-logic-settings.xml, has been
updated. The new software writes more paths
($out/{Settings,Errors,Databases,Calibration}) and uses a few extra
library calls to access those paths
(open,openat,stat,access,unlink,...). So instead of single file
redirect, the library now redirects accesses to all those directories,
mirrored in $HOME/.saleae-logic/. (Existing
$HOME/.saleae-logic-settings.xml files will be automatically migrated to
$HOME/.saleae-logic/Settings/settings.xml.)
2016-05-17 14:55:17 +02:00
Domen Kožar
00ead3178b mailcore2: remove git conflict line, still doesn't build 2016-05-17 13:07:22 +01:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Vladimír Čunát
4e6b45d0a0 Merge branch 'master' into staging
... to get the ffmpeg changes which cause nontrivial rebuilds.
2016-05-17 11:46:37 +02:00
Vladimír Čunát
604b0c86bf boost: fix build on mingw after b465dc202f
We passed bogus --libdir even in standard native builds;
apparently it wasn't a problem, but I also fixed that.
2016-05-17 10:41:06 +02:00
Franz Pletz
28e051f066
ffmpeg: add patches for libvpx 1.5
ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956
ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
2016-05-17 01:02:30 +02:00
Christian Albrecht
fd294521e6
libav: add patches for libvpx 1.5
ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956
ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
2016-05-17 01:01:55 +02:00
taku0
67cb0eaae3
libvpx: 1.4.0 -> 1.5.0
Closes #15136.
2016-05-17 01:00:13 +02:00
Franz Pletz
e98a0bc9e0 Merge pull request #15476 from matthiasbeyer/update-unmaintained
Update unmaintained packages
2016-05-16 23:45:11 +02:00
Peter Simons
385b21c92d boost/generic.nix: fix Emacs syntax highlighting (cosmetic) 2016-05-16 22:49:55 +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