Commit Graph

78042 Commits

Author SHA1 Message Date
Nikolay Amiantov
23dd97ee88 Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgs 2016-03-02 18:56:24 +03:00
joachifm
2569d5b384 Merge pull request #13614 from artuuge/epson-escpr-1.6.4
epson-escpr: 1.6.3 -> 1.6.4
2016-03-02 15:48:24 +00:00
Robin Gloster
5936d6dbbb Revert "rubygems: 2.4.8 -> 2.5.2"
This reverts commit 7e8faf022f.

This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
2016-03-02 15:25:35 +00:00
joachifm
b4077af972 Merge pull request #13613 from mbakke/dnscrypt-proxy-1.6.1
dnscrypt-proxy: 1.6.0 -> 1.6.1
2016-03-02 15:18:48 +00:00
Marius Bakke
c5f177cb5d dnscrypt-proxy: 1.6.0 -> 1.6.1 2016-03-02 15:12:06 +00:00
Peter Simons
ed5eb2aed8 Fix Emacs syntax highlighting in NixOS dovecot module. 2016-03-02 16:11:49 +01:00
Alex Franchuk
69d8cb4a6b libreswan: add package and service to nixos 2016-03-02 09:44:30 -05:00
Eelco Dolstra
bd7f379a3f LWP::Protocol::https: Fix SSL cert handling
We lost this in 9f358f809d. Updated to
use /etc/ssl/certs/ca-certificates.crt if it exists and SSL_CERT_FILE
is not set.
2016-03-02 15:00:32 +01:00
Eelco Dolstra
4e906f9fb2 perl-packages.nix: Remove unnecessary variable quotations 2016-03-02 14:51:47 +01:00
artuuge
7ddd6fc1c3 epson-escpr: 1.6.3 -> 1.6.4 2016-03-02 14:49:23 +01:00
Frederik Rietdijk
1d1b0a8ab8 Merge pull request #13510 from lancelotsix/relocate_motu_client
pkgs.motuclient: move application away from pythonPackages
2016-03-02 08:02:53 -05:00
Thomas Tuegel
6a4c8b0a12 Merge pull request #13597 from ttuegel/kde-5
Plasma 5.5.5
2016-03-02 06:47:41 -06:00
Eelco Dolstra
49f23a6028 m2crypto: 0.21.1 -> 0.23.0
The previous version broke because it required SSLv2 support in OpenSSL:

ImportError: /nix/store/c0z7qlycaa2jhqjq0v9vy3j4nw4layw2-python2.7-m2crypto-0.21.1/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined symbol: SSLv2_method
2016-03-02 12:50:03 +01:00
Lluís Batlle i Rossell
a95e65b1eb gtkwave: update to 3.3.70 2016-03-02 12:42:20 +01:00
Lancelot SIX
8f4a7d6c4c pkgs.motuclient: move application away from pythonPackages 2016-03-02 09:41:02 +01:00
Michael Raskin
999bf7c9c7 Merge pull request #13611 from dgonyeo/master
uzbl: version 20120514 -> v0.9.0
2016-03-02 07:54:12 +00:00
Derek Gonyeo
f681ceb593 uzbl: version 20120514 -> v0.9.0 2016-03-01 23:15:26 -05:00
aszlig
a429444a75
nixos/release: Replace a: b: a // b by mergeAttrs
No change in functionality, it just looks nicer that way.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-02 02:18:35 +01:00
Jude Taylor
4686bc54a6 add socket.io to interactive ghcjs environments 2016-03-01 16:06:29 -08:00
Robin Gloster
995475944f qt_gstreamer1: add upstream patch to build with current gstreamer 2016-03-01 22:45:37 +00:00
Arseniy Seroka
f082170873 Merge pull request #13599 from mbakke/zathura-0.3.5
Update zathura and plugins
2016-03-02 01:44:36 +03:00
zimbatm
893ba22bad Merge pull request #12711 from Adjective-Object/fix/bspwm-session-start
bspwm: add startThroughSession & sessionScript option
2016-03-01 22:36:57 +00:00
Maxwell
e50da7ee6a bspwm: add startThroughSession & sessionScript option
Add ability to do a more traditional bspwm startup (using the bspwm-session
script provided by nixpkgs.bspwm) as an alternative to directly starting
sxhkd & bspwm

Also added the ability to specify a custom startup script, instead of
relying on the provided bspwm-session
2016-03-01 17:29:15 -05:00
aszlig
183ac3f2c4
Merge pull request #12558 (GI-shlibpaths)
So far only .la files get correctly converted to absolute paths in the
GIR file. However if there are .so files which depend on a particular
library using GI, they still get only the basename of the .so file.

This improves on the existing absolute_shlib_path.patch not only
figuring out the absolute path of .so files but also falling back on the
absolute path of $out/lib (or $lib/lib with multiple outputs) of the
current build.

With this, we should no longer need to resort to setting LD_LIBRARY_PATH
for all programs that use GI libraries.

I'm merging this because after more than a month no issues came up so
far.
2016-03-01 23:21:25 +01:00
aszlig
f70ec0de69
Merge pull request #13585 (nixos-tests-splitup)
This splits a few NixOS tests (namely Chromium, VirtualBox and the
networking tests) into several subtests that are exposed via attributes.

The networking tests were already split up but they didn't expose an
attribute set of available tests but used a function attribute to
specify the resulting test instead.

A new function callSubTests in nixos/release.nix is now responsible for
gathering subtests, which is also used for the installer and boot tests.
The latter is now placed in a tests.boot.* namespace rather than
"polluting" the tests attribute set with its subtest.
2016-03-01 23:17:01 +01:00
Pascal Wittmann
afa7d84529 instead: 2.3.0 -> 2.4.0 2016-03-01 22:54:26 +01:00
joachifm
e948d69885 Merge pull request #13603 from gilligan/sauce-connect-fix
sauce-connect: fix hashes and build on linux
2016-03-01 21:54:12 +00:00
Eelco Dolstra
cc71804ab0 openssh: Fix build 2016-03-01 22:25:17 +01:00
Aneesh Agrawal
7f8d50b443 openssh: 7.1p2 -> 7.2p1 2016-03-01 22:25:16 +01:00
Pascal Wittmann
d2e15a02d7 mujs: 2015-09-29 -> 2016-02-22 2016-03-01 22:08:26 +01:00
Eelco Dolstra
b2197b84c2 Fix NixOS eval 2016-03-01 22:07:54 +01:00
Eelco Dolstra
02891a0de9 gnome: Drop installerIso from nix-env evaluation
This makes nix-env -qa depend on NixOS, which is not a good thing.

@lethalman
2016-03-01 22:05:23 +01:00
Tobias Pflug
32e751d616 sauce-connect: fix hashes and phases 2016-03-01 21:47:41 +01:00
Arseniy Seroka
00ea88220f Merge pull request #13593 from aespinosa/add-nexus-package
nexus: init at 2.12.0-01
2016-03-01 23:42:22 +03:00
Robert Helgesson
c523cec12c josm: 9329 -> 9900 2016-03-01 21:02:36 +01:00
Marius Bakke
df32c2d0c8 zathura-pdf-poppler: 0.2.5 -> 0.2.6 2016-03-01 19:52:50 +00:00
Marius Bakke
9c86acc479 zathura-pdf-mupdf: 0.2.8 -> 0.3.0 2016-03-01 19:52:40 +00:00
Marius Bakke
7ad9370f08 zathura-djvu: 0.2.4 -> 0.2.5 2016-03-01 19:52:40 +00:00
Marius Bakke
18a4ca2d05 zathura-ps: 0.2.2 -> 0.2.3 2016-03-01 19:52:40 +00:00
Eelco Dolstra
f3d94cfc23 Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
This reverts commit cad8957eab. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
Marius Bakke
cbf09c6936 zathura: 0.3.3 -> 0.3.5 2016-03-01 19:41:31 +00:00
Marius Bakke
78b80ee635 girara: 0.2.4 -> 0.2.5 2016-03-01 19:41:09 +00:00
Thomas Tuegel
78602b6806 kde5.plasma: 5.5.4 -> 5.5.5 2016-03-01 13:38:45 -06:00
aszlig
1f89aa6c7f
nixos/tests: Remove tests.boot.boot* prefixes
As @bobvanderlinden suggests in #13585:

"Looks like that cleans things up quite a bit! Just one aesthetics note,
the boot tests could now be renamed from boot.bootBiosCdrom to
boot.biosCdrom in nixos/tests/boot.nix:L33.

That makes them more consistent with the other tests."

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-01 19:02:36 +01:00
Thomas Tuegel
98d8e1a160 kde5: consolidate packages into desktops/kde-5 2016-03-01 10:36:00 -06:00
Allan Espinosa
ac687200e3 nexus: init at 2.12.0-01 2016-03-01 10:25:00 -06:00
Thomas Tuegel
bf4cafd1dd Merge pull request #13592 from Profpatsch/copyPathToStore-doc
lib/copyPathToStore: annotate docstring
2016-03-01 08:38:07 -06:00
Profpatsch
82fa1a796b lib/copyPathToStore: annotate docstring 2016-03-01 15:26:35 +01:00
Pascal Wittmann
69237f371c Merge pull request #13586 from zimbatm/bats-fixup
bats: fixes installation
2016-03-01 15:19:03 +01:00
Domen Kožar
976657a71f openspades: fix build 2016-03-01 14:31:33 +01:00