Commit Graph

93840 Commits

Author SHA1 Message Date
Peter Simons
c031945a9f Merge pull request #19534 from LumiGuide/fix-cereal-on-ghcjs
cereal: fix build on ghcjs
2016-10-14 16:52:02 +02:00
Jörg Thalheim
15bb24f7e7 Merge pull request #19538 from 2chilled/master
zk-shell:: init at 1.0.0
2016-10-14 16:47:05 +02:00
Eelco Dolstra
811b876fab Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Tim Steinbach
24de66ce48 Merge pull request #19541 from romildo/upd.themes
vertex-theme: 20160329 -> 20161009
2016-10-14 09:28:05 -04:00
Tim Steinbach
c12b5d5e16 Merge pull request #19542 from romildo/upd.arc-theme
arc-theme: 2016-06-06 -> 2016-10-13
2016-10-14 09:27:33 -04:00
Tim Steinbach
2cfe0407b8 Merge pull request #19545 from derchrisuk/netdata
netdata: 1.0.0 -> 1.4.0
2016-10-14 09:27:13 -04:00
Tim Steinbach
24f86ac41a Merge pull request #19546 from romildo/upd.faba-icon-theme
faba-icon-theme: 2016-06-02 -> 2016-09-13
2016-10-14 09:26:52 -04:00
Tim Steinbach
03805c42a3 Merge pull request #19547 from romildo/upd.moka-icon-theme
moka-icon-theme: 2016-06-07 -> 2016-10-06
2016-10-14 09:26:41 -04:00
Tim Steinbach
9aa06ba95a Merge pull request #19548 from romildo/upd.faba-mono-icons
faba-mono-icons: fix repository name
2016-10-14 09:26:21 -04:00
Tim Steinbach
3beb90cf72 Merge pull request #19549 from romildo/upd.arc-icon-theme
arc-icon-theme: 2016-06-06 -> 2016-07-07
2016-10-14 09:25:51 -04:00
Tim Steinbach
4c41345975 Merge pull request #19539 from romildo/upd.enlightenment
enlightenment: 0.21.2 -> 0.21.3
2016-10-14 09:25:37 -04:00
romildo
2817e73568 arc-icon-theme: 2016-06-06 -> 2016-07-07 2016-10-14 07:57:29 -03:00
zimbatm
6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins
Bundler env bins
2016-10-14 11:51:23 +01:00
romildo
2f5150be7a faba-mono-icons: fix repository owner 2016-10-14 07:42:26 -03:00
Nikolay Amiantov
7619bea1fe Merge pull request #19544 from kamilchm/blueman
blueman: hicolor_icon_theme dependency
2016-10-14 14:34:50 +04:00
romildo
33acea23b4 moka-icon-theme: 2016-06-07 -> 2016-10-06 2016-10-14 07:33:23 -03:00
romildo
ebcd7f2a63 faba-icon-theme: 2016-06-02 -> 2016-09-13 2016-10-14 07:10:52 -03:00
Eelco Dolstra
942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
derchris
0acd3b3b42 netdata: 1.0.0 -> 1.4.0 2016-10-14 12:05:42 +02:00
Kamil Chmielewski
745b659481 blueman: hicolor_icon_theme dependency 2016-10-14 12:03:04 +02:00
Kamil Chmielewski
ab7538a277 clipit: hicolor_icon_theme dependency 2016-10-14 12:02:16 +02:00
romildo
6eef45e58e arc-theme: 2016-06-06 -> 2016-10-13 2016-10-14 06:59:55 -03:00
Christian Gerbrandt
49e3c7c9dc Merge pull request #1 from NixOS/master
merge upstream
2016-10-14 11:53:34 +02:00
romildo
6ed72b2c1a vertex-theme: 20160329 -> 20161009 2016-10-14 06:38:30 -03:00
romildo
7caca81cf7 enlightenment: 0.21.2 -> 0.21.3 2016-10-14 05:51:40 -03:00
Matthias Herrmann
725544fd9e zk-shell: init at 1.0.0 2016-10-14 09:24:50 +02:00
Vladimír Čunát
027efec879 Merge staging without python splitting for now
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Vladimír Čunát
e0210d7cbf tested job: fixup evaluation after 5dadc3a
I believe hardcoding system to builtins.currentSystem isn't very good,
as e.g. Hydra surely evaluates on Linux only...
2016-10-14 09:21:38 +02:00
Vladimír Čunát
3eec7ea3f0 gvfs: fix build after update in 0809aeb47f
(cherry picked from commit 56a49e6cda)
2016-10-14 09:11:28 +02:00
Vladimír Čunát
d73646d270 Revert "gtkmm: fix build error by patching missing operator"
This reverts commit 7defda8356.
It breaks the package after update 61c467937b;

(cherry picked from commit 72e0135752)
2016-10-14 09:11:18 +02:00
Jörg Thalheim
fe518a733f Merge pull request #19533 from siddharthist/r-modules/readme-nix-shell
r-modules: add more nix-shell documentation
2016-10-14 09:09:19 +02:00
Daniel Peebles
9615afa04b Merge pull request #19517 from dipinhora/darwin-yosemite-support
Re-enable support for OS X 10.10 for darwin.
2016-10-13 22:46:33 -04:00
Dan Peebles
5dadc3a30c darwin.make-bootstrap-tools: fix for new stdenv setup 2016-10-13 22:32:19 -04:00
Graham Christensen
09e4b78b48 Merge pull request #19507 from grahamc/mb
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVEs (and other fixing from the subsequent breakage.)
2016-10-13 20:37:36 -04:00
Franz Pletz
8435c1637b
gimpPlugins.gap: disable format hardening 2016-10-13 20:33:16 -04:00
Franz Pletz
bb7d270d85
pythonmagick: 0.9.12 -> 0.9.14 2016-10-13 20:33:16 -04:00
Franz Pletz
957a5bdcf3
phpPackages.imagick: 3.4.0RC4 -> 3.4.3RC1
Drops imagick31 as the current version also supports PHP 5.x.
2016-10-13 20:33:16 -04:00
Graham Christensen
241cd0e5db
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVE-2016-7799, CVE-2016-7906 2016-10-13 20:33:10 -04:00
Graham Christensen
fcd4b7ea58 Merge pull request #19510 from grahamc/nodejs
Nodejs: Upgrades for security patches
2016-10-13 20:26:47 -04:00
Graham Christensen
91c49433c9
nodejs-5_x: Remove, no longer supported 2016-10-13 20:04:24 -04:00
Graham Christensen
66f2a01222
nodejs-6_x: 6.7.0 -> 6.8.0 2016-10-13 20:04:24 -04:00
Graham Christensen
f9df1b5de0
nodejs: 4.4.6 -> 4.6.0 2016-10-13 20:04:23 -04:00
Bas van Dijk
79f6e39b93 cereal: fix build on ghcjs 2016-10-14 00:35:01 +02:00
Langston Barrett
2b300c9bef r-modules: add more environment documentation
Use nix-shell with a `default.nix` rather than using
config.nix
2016-10-13 22:18:16 +00:00
Franz Pletz
4771ccd896
graphicsmagick: apply patches to fix security issues
Fixes CVE-2016-7996, CVE-2016-7996, CVE-2016-7800.

cc #19481
2016-10-14 00:02:30 +02:00
Franz Pletz
c766c7f095
fastd: fix meta.platforms typo 2016-10-14 00:02:30 +02:00
Franz Pletz
f30f7d0cff
powertop: add homepage, cleanup 2016-10-14 00:02:30 +02:00
Tuomas Tynkkynen
c66124e9b7 sshpass: 1.05 -> 1.06 2016-10-14 00:58:07 +03:00
Jörg Thalheim
13ff831440 Merge pull request #19524 from nshalman/shfmt-0.2.0
shfmt: 2016-06-16 -> 0.2.0
2016-10-13 22:22:34 +02:00
Daniel Peebles
9703a72f70 Merge pull request #19495 from LnL7/darwin-gdb
gdb: disable format hardening
2016-10-13 15:57:19 -04:00