Commit Graph

68548 Commits

Author SHA1 Message Date
Herwig Hochleitner
4b0c3ca604 dropbox: 3.10.9 -> 3.10.11 2015-11-18 09:47:56 +01:00
Peter Simons
7e5e0b3f80 Merge pull request #10941 from peti/update-haskell-packages-in-release-branch
hackage-packages.nix: update Haskell package set
2015-11-17 16:53:31 +01:00
Vladimír Čunát
43f23f771e libpng12: security update 1.2.53 -> 1.2.54
Part of fix for #11030.
Also refactor meta.

(cherry picked from commit 31aa281919)
2015-11-17 12:57:53 +01:00
Robbin C
7bf4567613 Change argument --port to --listen in nix-serve.nix
(cherry picked from commit c75d1e761a)
2015-11-16 11:48:45 +01:00
Matthew O'Gorman
facb3d50d0 xscreensaver: security update 5.33 -> 5.34 (close #10845)
Fixes a crash when hot-swapping monitors while locked.

(cherry picked from commit 7df0fefcbc)
2015-11-16 08:38:31 +01:00
Vladimír Čunát
018c272a2a libpng: security and maintenance 1.6.18 -> 1.6.19
Fixes #11030, CVE-2015-{7981,8126}.

(cherry picked from commit cc86857601)
2015-11-16 08:14:05 +01:00
Lluís Batlle i Rossell
a890f8e696 Making iodine client find ifconfig. 2015-11-16 00:07:38 +01:00
Domen Kožar
2276be4b66 Merge pull request #11021 from dasjoe/zfs-0.6.5.3
spl+zfs: cherry-pick 0.6.5.3
2015-11-15 10:41:59 +01:00
William A. Kennington III
b784505b1b spl: 0.6.5.2 -> 0.6.5.3 2015-11-14 16:19:00 +01:00
Ricardo M. Correia
dbfd6831ed spl: 0.6.5 -> 0.6.5.2 2015-11-14 16:18:43 +01:00
William A. Kennington III
3d17f9abe2 zfs: 0.6.5.2 -> 0.6.5.3 2015-11-14 16:18:21 +01:00
Ricardo M. Correia
5e5d17c4f7 zfs: 0.6.5.1 -> 0.6.5.2 2015-11-14 16:18:11 +01:00
Eelco Dolstra
4d9166084d Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-11-14 16:17:57 +01:00
Guillaume Maudoux
5f79c8dacf lighttpd: fix mod_rewrite appearing twice
(cherry picked from commit 60ba5ad479)
2015-11-14 15:53:11 +01:00
Bjørn Forsman
068a7df8e6 jenkins: 1.637 -> 1.638 (important security fixes)
I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
(cherry picked from commit 30313d5c6e)
2015-11-12 13:40:54 +01:00
Bjørn Forsman
d754c3c4ff jenkins: 1.636 -> 1.637 (security fixes)
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
(cherry picked from commit 7a1c4ab324)
2015-11-12 13:35:36 +01:00
Nikolay Amiantov
6202090f31 fhs-env: symlink /usr/lib to libs for the main architecture 2015-11-12 03:33:42 +03:00
Thomas Tuegel
45128deb40 Merge pull request #10918 from bjornfor/backport-qt55-improvements
Backport Qt 5.5 improvements to release-15.09
2015-11-10 09:37:36 -06:00
Peter Simons
d203574d06 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: 29fff27a55
  - Hackage: fccc42cccb
  - LTS Haskell: 1ae555e197
  - Stackage Nightly: ec7b421c66
2015-11-10 16:26:24 +01:00
Bjørn Forsman
59ad6a4dfe qtcreator: add qtdeclarative to QML2_IMPORT_PATH
When building with Qt 5.4 this is not a problem, but with Qt 5.5 (tested
locally), it is clear that this dependency is missing:

$ ./result/bin/qtcreator
file:///nix/store/zmpf6ydrjdydd85wh6splpywv6aj4782-qtcreator-3.4.2/share/qtcreator/welcomescreen/welcomescreen.qml:31:1:
module "QtQuick" is not installed
     import QtQuick 2.1
     ^

With Qt 5.4 something else is pulling in the qtdeclarative dependency,
it can be seen in the qtcreator wrapper script.

Note to self: "import QtQuick" != qtquickcontrols. QtQuick is
apparently located in the qtdeclarative module.

(cherry picked from commit ff4d8513b4)
2015-11-09 21:02:13 +01:00
Bjørn Forsman
c44a129bb9 qt55: fix qtmultimedia gstreamer support
Without this, configure will say:

  Checking for openal... no
  /tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
  Variable GST_VERSION is not defined.
  Checking for resourcepolicy... no

And there may be application runtime errors like

  defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.camera"

After this fix, configure will say:

  Checking for openal... no
  Checking for gstreamer... yes
  Checking for gstreamer_photography... no
  Checking for gstreamer_encodingprofiles... yes
  Checking for gstreamer_appsrc... yes
  Checking for linux_v4l... yes
  Checking for resourcepolicy... no

And the above runtime error will not appear.

This fix is similar to 449b6028 ("qt5.multimedia: fix gstreamer
support."), except with Qt 5.5 we also need to set GST_VERSION.

(cherry picked from commit 2cec70ce6c)
2015-11-09 13:32:59 +01:00
Thomas Tuegel
46217b9b01 makeQtWrapper: wrap XDG directories
(cherry picked from commit 24babaad9a)
2015-11-09 13:32:58 +01:00
Thomas Tuegel
287a4ce71f qtbase: copy qmake to temp dir
Fixes #10273.

(cherry picked from commit dcd70c54aa)
2015-11-09 13:32:58 +01:00
Thomas Tuegel
0fd7664a41 qtbase: propagate runtime dependencies
This is done so that makeQtWrapper works correctly.

(cherry picked from commit 361b1165ef)
2015-11-09 13:32:58 +01:00
Thomas Tuegel
aa7b051c41 kdoctools: set XDG_DATA_DIRS in setupHook
(cherry picked from commit 9fa17aa293)

Resolve conflicts in kde-frameworks by removing the change (that
package/version doesn't exist in release-15.09).
2015-11-09 13:32:40 +01:00
Thomas Tuegel
22471e4979 makeQtWrapper: always wrap impurely
(cherry picked from commit 5a2c45427b)

Resolve plasma-5.4/plasma-workspace conflict by dropping the change
(doesn't exist in release-15.09 branch).
2015-11-09 13:31:18 +01:00
Thomas Tuegel
f0c0b7a942 qt55: set QML import paths from NIX_PROFILES
(cherry picked from commit fb375f1a2e)
2015-11-09 13:15:43 +01:00
Thomas Tuegel
e1046843ce qt55: set Qt Quick import paths from NIX_PROFILES
(cherry picked from commit b1f904f69a)
2015-11-09 13:15:35 +01:00
Thomas Tuegel
5371ddd5ea qt55: set library paths from NIX_PROFILES
(cherry picked from commit a3855ef9ae)
2015-11-09 13:15:20 +01:00
Thomas Tuegel
88ab75fe39 separate makeQtWrapper from qtbase setup-hook
(cherry picked from commit d57e50d840)

I resolved some trivial conflicts: drop changes to packages that have
been switched to qt55 in master, but not in release-15.09.
2015-11-09 13:13:11 +01:00
Thomas Tuegel
6736fbe506 qtmultimedia: build with gstreamer-1.0
Fixes #10289.

(cherry picked from commit 89d31daa8f)
2015-11-09 13:11:38 +01:00
Thomas Tuegel
c805a0c36f qt55.qtbase: add makeQtWrapper
(cherry picked from commit a122ca8ba3)
2015-11-09 13:11:28 +01:00
Thomas Tuegel
3aed93ee4d qtbase: remove redundant directory checks
addToSearchPath already checks if the directory exists before adding it
to the path; it's not necessary to check it again.

(cherry picked from commit ebb9c07168)
2015-11-09 13:11:13 +01:00
Thomas Tuegel
22da1ba93f qtbase: include current package in runtime paths
The runtime paths QT_PLUGIN_PATH, QML_IMPORT_PATH, QML2_IMPORT_PATH, and
XDG_DATA_DIRS did not include the appropriate paths from the current
package being built because addToSearchPath does not add directories
which don't exist.

(cherry picked from commit b44923561b)
2015-11-09 13:10:55 +01:00
Bjørn Forsman
5d550918e5 qt55: apply mkspecs-libgl.patch from qt54
(cherry picked from commit 3dec100104)
2015-11-09 13:10:32 +01:00
Thomas Tuegel
1944d28961 qt5Full: only include derivations
(cherry picked from commit e5b124e492)
2015-11-09 13:08:01 +01:00
Peter Simons
ef7a81396b lambdabot: mark build as broken
custom-config.patch not longer applies to recent versions
2015-11-08 18:28:08 +01:00
Raymond Gauthier
57816df113 mousepad: fix the Using the 'memory' GSettings backend issue.
Close #10867.
It means that settings couldn't be saved. The issue appeared
since upgrade to nixos 15.09 and fall as part of #4415.

Tested on nixos.
 -  No longer has a stderr when running the application.
 -  Settings are effectively saved.

(cherry picked from commit 34eb56e16b)
2015-11-07 18:42:28 +01:00
William A. Kennington III
b77502cea2 linux-4.3: Fix build failure.
The package has been cherry-picked into the 15.09 release at 9bae8f6,
unfortunately without the fixes that were introduced by the upgrades in
linux-testing.

As it is now the current "_latest" in 15.09, we really don't want the
build to fail.

This is a partial cherry-pick from 9fbbbd5 because that commit was
updating linux-testing as well.

Tested with the latestKernel.login VM test.

Signed-off-by: William A. Kennington III <william@wkennington.com>
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-06 20:32:48 +01:00
taku0
f6b3ca11ab oraclejdk: 8u60 -> 8u65, 8u66
(cherry picked from commit 3f51f4c463)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-11-06 16:21:50 +01:00
aszlig
9125e02a3b mariadb: 10.0.21 -> 10.0.22
Fixes the following security vulnerabilities:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4802
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4807
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4815
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4826
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4830
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4836
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4858
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4861
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4870
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4913
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4792

Release notes can be found here:

https://mariadb.com/kb/en/mariadb/mariadb-10022-release-notes/

Detailled changelog:

https://mariadb.com/kb/en/mariadb/mariadb-10022-changelog/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 9846e69ae2)
2015-11-06 16:13:30 +01:00
William A. Kennington III
f7ec9e9dff nss: 3.20 -> 3.20.1
(cherry picked from commit e8cbf833ef)
2015-11-05 18:29:23 -08:00
William A. Kennington III
4327130d12 nspr: 4.10.9 -> 4.10.10
(cherry picked from commit d80f4c49b0)
2015-11-05 18:29:13 -08:00
William A. Kennington III
2f6e7c15e2 firefox: Updates
- 41.0.2 -> 42.0
  - 38.3.0 -> 38.4.0

(cherry picked from commit 588a950df9)
2015-11-05 07:19:02 -08:00
Vladimír Čunát
ab42fb6249 goPackages: include buildFromGithub to fix #10805
(cherry picked from commit fa7d863af0)
2015-11-05 16:08:42 +01:00
Nikolay Amiantov
16c0f4c14b nixos/tlp: workaround early build trigger 2015-11-05 16:25:39 +03:00
Bjørn Forsman
050bdc3534 nixos: add services.jenkins.jobBuilder option
This option allows to define (declarative) Jenkins jobs, using Jenkins
Job Builder (JJB) as backend.

Example:

  services.jenkins = {
    enable = true;
    jobBuilder = {
      enable = true;
      yamlJobs = ''
        - job:
            name: jenkins-job-test
            builders:
              - shell: echo 'Hello world!'
      '';
    };
  };

Jobs can be defined using YAML, JSON and Nix.

Note that it really is declarative configuration; if you remove a
previously defined job, the module will remove the jobdir under
$JENKINS_HOME.

Jobs managed through the Jenkins WebUI (or by other means) are not
touched by this module.

Changes v1 -> v2:
* add nixJobs
* let jsonJobs take a list of strings (allows merge)
* 4 space indent in shell code

(cherry picked from commit 27f41d8c0a)
2015-11-05 09:05:28 +01:00
Brian McKenna
e0b5ed849d chromium: include WideVine patch to get NetFlix
Close #10444, fixes #8749.
For some reason it's more involved than just setting gyp configuration,
we also have to set some definitions in widevine_cdm_version.h according
to the comments left in the file. Arch Linux does this already and so we
should probably just use the patch they created while getting Netflix to
work:

https://code.google.com/p/chromium/issues/detail?id=429452#c16
(cherry picked from commit 492ccdd52d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-11-05 09:01:58 +01:00
Pascal Wittmann
86bea14262 audiofile: fix CVE-2015-7747
closes #10678

(cherry picked from commit 6aea1c55c0 by
falsifian)
2015-11-04 18:56:51 -08:00
Lluís Batlle i Rossell
5e432c047e Updating homebank to 5.0.6.
The old 5.0.0 is not available anymore.

I use the gtk33 hook to get proper icons, but still some icons are
broken (open, save, ...)
2015-11-04 22:22:23 +01:00