3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

54630 commits

Author SHA1 Message Date
Domen Kožar 1c489ee2a8 eventlet: increase TEST_TIMEOUT 2015-01-18 19:19:40 +01:00
Michael Raskin 4a056a27b7 Make stumpwm-contrib separately available: StumpWM currently recommends installing it separately and adding to ASDF search path 2015-01-18 20:59:36 +03:00
Bjørn Forsman 3cb749f796 ardour: report correct version number
Even though we build from git tag 3.5.403, `ardour --version` reports
3.5-380-g2f6065b. Fix it.

(Another way to fix this is to clone the whole git repo, preserve the
.git/ directory and add git as buildInput so that Ardour can figure out
all this version info stuff by itself.)

(cherry picked from commit 0e3007ec88)
2015-01-18 15:25:34 +01:00
Bjørn Forsman ce41de13a6 munin: remove /usr/{bin,sbin}/ references from plugins
Instead, run things out of $PATH.

Fixes errors like these (on NixOS):
  munin-available-plugins/.mysql_slowqueries-wrapped: line 67: /usr/bin/printf: No such file or directory

(Basically, this unbreaks some plugins.)

(cherry picked from commit 412cb5a3a2)
2015-01-18 14:41:15 +01:00
Bjørn Forsman 7ad4af120a taskwarrior: enable bash completion
By adding the missing link between the (already installed) completion
script and $out/etc/bash_completion.d/.

(cherry picked from commit 02458a939a)
2015-01-18 14:15:56 +01:00
Evgeny Egorochkin 5836ed0ea6 kde4: fix silent missing kde-workspace dependencies needed for kfontinst and kfontview 2015-01-18 09:37:55 +02:00
Domen Kožar a769e87199 fix gevent/eventlet on python 2.7.9, fixes #5782
(cherry picked from commit c611f5837c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-17 14:15:32 +01:00
Eelco Dolstra 916430748c Fix a warning in initrd generation
${pkgs.busybox}/bin and ${pkgs.busybox}/sbin are now the same
directory, so don't copy both.

(cherry picked from commit 7358b8dfda)
2015-01-15 21:08:45 +01:00
Eelco Dolstra 4599bfcc3b nixos-install: Create /root with 700 permission
(cherry picked from commit b9c4569b6b)
2015-01-15 21:08:08 +01:00
Eelco Dolstra d693d4432f NixOS containers: Create /root with 700 permission
Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.

(cherry picked from commit 3ca275d7ba)
2015-01-15 21:08:07 +01:00
Eelco Dolstra bc195e2feb Paranoia
(cherry picked from commit efa8fc2b0a)

Conflicts:
	nixos/modules/virtualisation/google-compute-image.nix
2015-01-15 21:06:28 +01:00
Eelco Dolstra a71ce6abb5 Update Debian to 7.8
(cherry picked from commit 1b1e015e6e)
2015-01-15 14:52:22 +01:00
Eelco Dolstra 68378336a6 test-instrumentation.nix: Prevent calling a pager
(cherry picked from commit 24ce7ff3ea)
2015-01-15 14:52:22 +01:00
Vladimír Čunát 674d33a516 firefox: major bump 34.0.5 -> 35.0
(cherry picked from commit 1072635cf0)
2015-01-14 22:51:20 +01:00
Luca Bruno 314c5e9ac6 nixos-rebuild: use reload-or-restart for dbus. Closes #5767
Now that dbus reload has been moved before restarting units,
the reload may fail if dbus has been stopped before.
The reload-or-restart will reload dbus if it's active,
otherwise start it.
2015-01-14 17:09:29 +01:00
aszlig d9de59a46b
lighttpd: Fix building with magnet support.
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit c5354fafce)
2015-01-13 08:38:37 +01:00
Eelco Dolstra 89807d4221 Fix CentOS 6.5 URLs
(cherry picked from commit 02df7cdaa0)
2015-01-12 15:14:55 +01:00
Emery Hemingway 96a481b1d0 cjdns: bump to protocol version 13
(cherry picked from commit 5b8e1be7ba)
2015-01-12 11:33:19 +01:00
Lluís Batlle i Rossell 5da890f725 Porting the jdk hack about the 10-year timezones to icedtea
(Based on 3279579bc4)
2015-01-12 11:04:55 +01:00
Rob Vermaas 65a89fcce7 Use callPackage for nodePackages, to allow easier overriding of node-packages set. 2015-01-12 10:04:38 +01:00
Evgeny Egorochkin 48288fcc34 kde4.calligra: update from 2.8.6 to 2.8.7 2015-01-11 18:21:57 +02:00
Evgeny Egorochkin 0f301bcb1c calligra: fix dependencies, and add several new ones 2015-01-11 17:04:36 +02:00
cillianderoiste 56f0fb3ffb Merge pull request #5691 from magnetophon/faustbugfix
Faust: bugfix for 14.12
2015-01-10 17:24:05 +01:00
Bart Brouns 9c5856496d Faust: bugfix for 14.12
use patchshebangs instead of manual patching
patch .faust2* as well as faust2*
2015-01-10 16:04:51 +01:00
Domen Kožar 70a7d4bd16 openssl: 1.0.1j -> 1.0.1k 2015-01-09 20:21:41 +01:00
Evgeny Egorochkin d8cda00a10 KDE4: update 4.14.1 to 4.14.3 2015-01-09 18:51:39 +02:00
Bjørn Forsman 82578aec9c graphviz: patch vimdot to lookup 'vim' in $PATH
Without this it tries to run /usr/bin/vim. Patch is already accepted
upstream.

(cherry picked from commit e90d316f19)
2015-01-09 07:12:44 +01:00
Rob Vermaas 3279579bc4 Ugly hack until we can update openjdk. Without this openjdk fails with:
Error: time is more than 10 years from present: 1104530400000

See also:
   http://permalink.gmane.org/gmane.os.netbsd.devel.pkgsrc.user/20888
2015-01-08 22:31:15 +01:00
James Cook db24035952 unzip: Patch for CVE-2014-81{39,40,41}.
(Cherry-picked from 173f41cf0bc618f0b2c313b1915fee8d8a6d0ee2.)
2015-01-08 11:34:00 -08:00
Bjørn Forsman a431e3ad3b wireshark: update 1.12.2 -> 1.12.3 (security update)
The following vulnerabilities have been fixed.

- wnpa-sec-2015-01
  The WCCP dissector could crash. (Bug 10720, Bug 10806) CVE-2015-0559,
  CVE-2015-0560

- wnpa-sec-2015-02
  The LPP dissector could crash. (Bug 10773) CVE-2015-0561

- wnpa-sec-2015-03
  The DEC DNA Routing Protocol dissector could crash. (Bug 10724) CVE-2015-0562

- wnpa-sec-2015-04
  The SMTP dissector could crash. (Bug 10823) CVE-2015-0563

- wnpa-sec-2015-05
  Wireshark could crash while decypting TLS/SSL sessions. Discovered by Noam
  Rathaus. CVE-2015-0564

See more at https://www.wireshark.org/docs/relnotes/wireshark-1.12.3.html

(cherry picked from commit 7a1e652130)
2015-01-08 19:46:11 +01:00
Michael Raskin 1e60d1f8ba LibreOffice: install icons
(cherry picked from commit f329eb0137)
2015-01-08 18:20:29 +01:00
Michael Raskin df3d687a81 LibreOffice: 4.3.3.2->4.3.5.2
(cherry picked from commit d7bc5835c8)
2015-01-08 18:20:28 +01:00
Eelco Dolstra 066758758e Set stricter permissions on /nix/store
The nixbld group doesn't need read permission, it only needs write and
execute permission.
2015-01-08 16:57:34 +01:00
Shea Levy 037af9ffcc Revert "Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages"
Unnecessary change to the haskell packages infrastructure, will move
this to haskellng packages.

This reverts commit a9d8413737.
2015-01-08 09:40:36 -05:00
Peter Simons 8ab68f8f91 Add GHC 7.8.4 and create haskellPackages_ghc784 package set.
(cherry picked from commit 8311973759)
2015-01-08 09:29:44 -05:00
Peter Simons 7e43433012 haskell-configuration-ghc-7.9.x: improve configuration to fix some builds
(cherry picked from commit 197e7672e6)
2015-01-08 09:10:08 -05:00
Peter Simons 805870f1e6 haskell-configuration-common: cosmetic
(cherry picked from commit 0811375a69)
2015-01-08 09:09:39 -05:00
Peter Simons e500e7c5c8 Say hello to our brand-new Haskell infrastructure.
(cherry picked from commit 54baa53df1)

Trivial conflict

Conflicts:
	pkgs/top-level/all-packages.nix
2015-01-08 09:09:02 -05:00
Domen Kožar 6d99bcdd89 pypy: trivial change to trigger rebuild 2015-01-08 10:52:30 +01:00
Domen Kožar 7a5db26b8a Merge pull request #5617 from flosse/prosody-097
nixpkgs: prosody 0.9.6 -> 0.9.7
2015-01-08 01:52:43 +01:00
Eelco Dolstra 92272d48eb Doh^2 2015-01-07 19:20:10 +01:00
Eelco Dolstra 09ab06f79a Doh 2015-01-07 12:55:07 +01:00
Eelco Dolstra c839a6beab Revert "php: Update to 5.4.36"
This reverts commit e7d4d39c6e. The
build fails in a chroot because it tries to download a PEAR from the
network:

http://hydra.nixos.org/build/18517333
(cherry picked from commit 37ac9deb3d)
2015-01-07 12:54:06 +01:00
Eelco Dolstra fc9c486f7b php: Update to 5.4.36
CVE-2014-8142

(cherry picked from commit e7d4d39c6e)
2015-01-07 11:36:47 +01:00
Eelco Dolstra d39bae9c3e Disable the macvlan test
This test currently fails and blocks NixOS releases.

http://hydra.nixos.org/build/18394742
2015-01-07 11:20:46 +01:00
Markus Kohlhase 6ff4d51ab1 nixpkgs: prosody 0.9.6 -> 0.9.7 2015-01-07 09:47:19 +00:00
Shea Levy a9d8413737 Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages
Required adding a deep override mechanism to haskell packages

(cherry picked from commit 0f04707953)
2015-01-06 14:45:44 -05:00
Domen Kožar 8be9ba0dbd Merge pull request #5611 from vlstill/14.12-perl-IdleTime
perlPackages: Add X11-IdleTime.
2015-01-06 20:08:42 +01:00
Vladimir Still 708b71cdd5 perlPackages: Add X11-IdleTime. 2015-01-06 19:32:36 +01:00
Domen Kožar acb34ebdfb document options to nixos-install script
(cherry picked from commit c876f7a25d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-06 14:49:40 +01:00