1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

76804 commits

Author SHA1 Message Date
Thomas Tuegel d5d7554639 qt55.qtbase: don't propagate mysql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel 5337a2a4b3 qt55.qtbase: don't propagate cups dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel fcf290cd1d qt55.qtbase: don't refer to .dev outputs at runtime 2016-01-31 21:15:03 -06:00
Thomas Tuegel 0055c6aa94 qt54: use multiple outputs 2016-01-31 21:14:24 -06:00
Thomas Tuegel d8a08fff90 qt54: disable documentation
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:14:24 -06:00
Thomas Tuegel 67d5a026ca qt54.qtbase: don't propagate makeWrapper dependency
I have no idea how it even got here; it's certainly not necessary!
2016-01-31 21:14:24 -06:00
Thomas Tuegel 4ed8d5d125 qt54.qtbase: don't propagate extra Mesa dependency
The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
2016-01-31 21:14:24 -06:00
Thomas Tuegel a6fd9e9be6 qt54.qtbase: don't propagate gtk dependencies
It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel b0753cec2a qt54.qtbase: don't propagate postgresql dependency
It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel 5fb4e3b338 qt54.qtbase: don't propagate mysql dependency
It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel c1f0f62a9c qt54.qtbase: don't propagate cups dependency
It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel 66d76f8b5b qt54.qtbase: don't rever to .dev outputs at runtime 2016-01-31 21:14:24 -06:00
Nikolay Amiantov 7bd9a5b104 fontconfig: reorder cache dirs 2016-01-29 16:35:59 +03:00
Nikolay Amiantov 39b5bc3b2f fontconfig service: add pre-generated fonts caches 2016-01-29 14:41:26 +03:00
Nikolay Amiantov 893af77556 makeFontsCache: init 2016-01-29 14:41:26 +03:00
zimbatm 48a5bb703d stdenv: fix set-source-date-epoch-to-latest (close #12602)
In some cases the $sourceRoot is missing. Skip the hook instead
of showing the following cryptic error:

    find: cannot search `': No such file or directory
    /nix/store/0p1afvl8jcpi6dvsq2n58i90w9c59vz1-set-source-date-epoch-to-latest.sh: line 12: [: : integer expression expected

vcunat removed the warning; the hook will just skip silently in these cases.
Perhaps someone can improve on it some time.
2016-01-29 12:03:48 +01:00
Vladimír Čunát de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Vincent Laporte 4f8f5732fc smtube: 15.11.0 -> 16.1.0 2016-01-29 10:08:29 +01:00
Vincent Laporte ef8f074604 smplayer: 15.11.0 -> 16.1.0 2016-01-29 10:08:29 +01:00
Robin Gloster edad608f56 libressl_2_3: 2.3.1 -> 2.3.2 2016-01-29 03:42:14 +00:00
Robin Gloster 46c31fa675 libressl: 2.2.5 -> 2.2.6 2016-01-29 03:42:14 +00:00
Dan Peebles 5da15c6b76 botocore/awscli: upgrade to 1.3.23/1.10.1
I'm upgrading both at once because they need to be upgraded in tandem
2016-01-28 21:26:32 -05:00
Eelco Dolstra bfebc7342e Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt 2016-01-29 02:32:05 +01:00
Arseniy Seroka 7d2eb0c4ab Merge pull request #12657 from romildo/new-eclipse-plugin-cup
eclipse-plugin-cup: init at 1.0.0.201412081321
2016-01-29 00:51:50 +03:00
Vladimír Čunát a92c2cb994 openssl_1_0_2: high-severity security update e -> f
Fixes CVE-2016-0701 and CVE-2015-3197.
2016-01-28 20:35:00 +01:00
José Romildo Malaquias a654e783c6 eclipse-plugin-cup: init at 1.0.0.201412081321 2016-01-28 17:21:29 -02:00
Charles Strahan 5583ecf361 mongodb: 3.0.7 -> 3.2.1
Fixes #12639
2016-01-28 14:15:59 -05:00
Eelco Dolstra 2ecb6b4574 openssl: 1.0.1q -> 1.0.1r
CVE-2015-3197 (low severity)
2016-01-28 18:57:23 +01:00
Thomas Tuegel 9e743fd151 qt54.qtbase: fix path typo in resolv patch 2016-01-28 11:15:58 -06:00
Thomas Tuegel 9695e139ec qt55.qtbase: fix path typo in resolv patch 2016-01-28 11:15:14 -06:00
Charles Strahan 7b8cd1dce9 watchman: 4.1.0 -> 4.3.0
* improved handling of case insensitive filenames
* improved reliability of symlink change detection on osx
2016-01-28 11:58:33 -05:00
Robin Gloster a83920c32d Merge pull request #12652 from mayflower/upstream-vagrant
vagrant: 1.8.0 -> 1.8.1
2016-01-28 17:24:31 +01:00
Sander van der Burg a1cd11aff4 titaniumenv: remove obsolete android configuration steps 2016-01-28 16:19:18 +00:00
Arseniy Seroka 6dcfd1a849 Merge pull request #12654 from mayflower/upstream-nodejs5
nodejs-5_x: 5.4.1 -> 5.5.0
2016-01-28 19:12:07 +03:00
Michael Alan Dorman a9b0bfe3bb ghc-imported-from: builds again 2016-01-28 16:47:22 +01:00
Peter Simons 81c8babb38 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 34e1e2890f
  - Hackage: 152c587fd1
  - LTS Haskell: 9b9c0dc0e3
  - Stackage Nightly: 486fdffc71
2016-01-28 16:45:46 +01:00
Pascal Wittmann 700ce710ed Merge pull request #12646 from taku0/firefox-bin-44.0
firefox-bin: 43.0.4 -> 44.0
2016-01-28 16:05:58 +01:00
Sander van der Burg b4e47d1ab8 titaniumenv: change identifier to 5.1.2.GA 2016-01-28 14:39:21 +00:00
Sander van der Burg 4dc36b1227 titaniumenv: use version 5.1.2 by default in the example 2016-01-28 14:36:51 +00:00
aszlig ab84149c99
buildEnv: Pass the right number of args to addPkg
Regression introduced by 4529ed1259.

I've missed this in #5096, not because of a messed up rebase as I have
guessed from a comment on #12635 but missed this in the first place.

The testing I did while working on the pull request weren't exhaustive
enough to cover this, because I haven't tested with packages that use
the propagatedUserEnvPkgs attribute.

In order to make the test a bit more exhaustive this time, let's test it
using:

nix-build -E 'with import ./. {}; buildEnv {
  name = "testenv";
  paths = [
    pkgs.hello pkgs.binutils pkgs.libsoup pkgs.gnome3.yelp
    pkgs.gnome3.totem
  ];
}'

And with this commit the errors no longer show up and the environment is
built correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12635
2016-01-28 14:50:44 +01:00
Sander van der Burg b205b587e7 titaniumenv: remove obsolete iosWwdrCertificate parameter 2016-01-28 13:32:21 +00:00
Vladimír Čunát c979012631 man-only packages: fixup after stdenv changes
Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
2016-01-28 13:55:37 +01:00
Vladimír Čunát 363f667e8b qt5*.qtbase: fixup output references
Hopefully I haven't missed any references in qt5*.
2016-01-28 13:31:17 +01:00
Christian Albrecht 2dbd741009 nodejs-5_x: 5.4.1 -> 5.5.0 2016-01-28 13:27:40 +01:00
Vladimír Čunát 2cc537bd06 Merge #11597: various multiple-output fixes 2016-01-28 13:05:30 +01:00
Vladimír Čunát 66365b76dd Merge #12607: mass-replace 'pkg}/lib'-style references
... in strings to point to correct outputs.
2016-01-28 12:57:30 +01:00
Vincent Laporte c67c27dc82 pycairo: add darwin to meta.platforms 2016-01-28 11:02:26 +01:00
Luca Bruno bed2cd5e32 Merge pull request #12651 from 0arthur/dockertools
dockerTools: private registry support
2016-01-28 10:22:46 +01:00
Damien Cassou 64d29d2f1b Merge pull request #12501 from DamienCassou/gpaste-3.18.3
gpaste: 3.18.2 -> 3.18.3
2016-01-28 07:53:08 +01:00
Vladimír Čunát a33fcc8731 cc-wrapper: attempt to fix on darwin
This fixes evaluation at least. I'm unable to test this myself and noone steps up;
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-174448705
however, Hydra's macs are idling so let's employ them for that.
2016-01-28 06:59:36 +01:00