Commit Graph
100 Commits
Author SHA1 Message Date
Vladimír Čunát ed93e8e16b libressl: work around some problem with man pages
https://github.com/NixOS/nixpkgs/commit/20ffc3cd73#commitcomment-22368612
2017-06-02 16:21:35 +02:00
Vladimír Čunát b829bdca1d Merge branch 'staging'
... to combine with the mass rebuilds that are on master already.
See discussion at https://github.com/NixOS/nixpkgs/commit/2050213c54a9
2017-06-02 09:09:28 +02:00
Vladimír Čunát 0c4b91505e nvidia_x11_legacy304: apply patches from Debian
The drivers would build but probably wouldn't work without them.
See #26250.
2017-05-31 10:48:54 +02:00
Vladimír Čunát af58f8de55 nvidia_x11_legacy304: 304.134 -> 304.135 2017-05-31 10:02:56 +02:00
Vladimír Čunát bc7b895aa5 nvidia module: allow .persistenced == null
Fixes #26250.  This is fallout from PR #22304.
It's null for 304 and 173 legacy drivers.
2017-05-30 20:58:16 +02:00
Vladimír Čunát 983657087b Merge branch 'master' into staging 2017-05-30 19:39:59 +02:00
Vladimír Čunát ea7e54be18 libuv: 1.11.0 -> 1.12.0
The changelog seems safe; I tried some reverse dependencies, too.
2017-05-30 19:32:30 +02:00
Vladimír Čunát 538aa0f808 Merge branch 'staging' (early part)
The comparison looks nice on Hydra.
2017-05-30 16:08:21 +02:00
Vladimír Čunát 02032dbda4 Merge branch 'master' into staging
More mass rebuilds from master.
2017-05-29 10:51:38 +02:00
Vladimír Čunát 1f407a46d6 mesa: feature update 17.0.6 -> 17.1.1
Main changes: https://www.mesa3d.org/relnotes/17.1.0.html
- two options got renamed
- "ilo" driver was removed upstream
- python is no longer needed for build

I tested nouveau for a bit.
2017-05-28 10:43:53 +02:00
Vladimír Čunát 76a020e676 Merge branch 'master' into staging 2017-05-27 11:11:44 +02:00
Vladimír Čunát b4bb39642e libdrm: support valgrind suppression via a lighter version
Fixes #25917.  It's all only about build-time dependency bloat and
consequent rebuild propagation.
2017-05-27 11:08:23 +02:00
Vladimír Čunát f71b83ad7e libdrm: 2.4.79 -> 2.4.81 2017-05-27 09:54:20 +02:00
Vladimír Čunát 00672dec8a Merge older staging
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
2017-05-26 15:45:43 +02:00
Vladimír Čunát bba5b1c434 plasma5 tests: fix by using older fontconfig-penultimate
enable = false; didn't help, but downgrading did.  It's a mystery to me.
Discussion: https://github.com/NixOS/nixpkgs/commit/c9f8fb4d127a
2017-05-24 14:56:43 +02:00
Vladimír Čunát b7fed33057 python-3.3: fixup evaluation after #25916 2017-05-24 14:09:14 +02:00
Vladimír Čunát 78ea189a6b Merge branch 'master' into staging
... to fix *some* of the evaluation problems.
2017-05-24 13:56:28 +02:00
Vladimír Čunát 8004e79415 Merge branch 'master' into staging 2017-05-24 03:24:06 +02:00
Vladimír Čunát 9f6b1dca58 Merge #25708: fltk: 1.3.3 -> 1.3.4 2017-05-19 23:52:14 +02:00
Vladimír Čunát dc8c798e5d Merge #25538: haxe: 3.2.1 -> 3.4.2 2017-05-19 23:44:18 +02:00
Vladimír Čunát 9195672200 Merge #25918: firefox*: bugfix updates 2017-05-19 20:57:43 +02:00
Vladimír Čunát 5aa530f2a8 Merge branch 'master' into staging
A few thousand rebuilds from master.
2017-05-19 08:57:59 +02:00
Vladimír Čunát cbdcc20e77 sile, simavr: fixup packages with RPATH problems 2017-05-18 11:39:00 +02:00
Vladimír Čunát e9aeb55f3b Merge branch 'master' into staging 2017-05-18 11:24:18 +02:00
Vladimír Čunát 71a7e221d8 treewide: fixup packages with RPATH problems 2017-05-18 09:49:15 +02:00
Vladimír Čunát 2b5b38a964 Merge #25807: gnutls: bugfix 3.5.11 -> 3.5.12 2017-05-16 18:38:54 +02:00
Vladimír Čunát 515414ed32 Merge branch 'master' into staging 2017-05-16 18:32:43 +02:00
Vladimír Čunát f5c568446a qtwebkit-*: fix #25585: bad RPATH entries 2017-05-16 18:30:58 +02:00
Vladimír Čunát 65ede052fa treewide: fixup packages with RPATH problems 2017-05-16 18:30:58 +02:00
Vladimír Čunát 2a6edacc4e firefox: disable content sandboxing - not ready yet
Details: https://github.com/NixOS/nixpkgs/issues/24295#issuecomment-300588575
2017-05-14 17:10:06 +02:00
Vladimír Čunát b0d2de45cd freetype: fix CVE-2017-{8105,8287} by upstream patches
I copied the patches, as the changelog changes would certainly conflict.
2017-05-14 15:00:44 +02:00
Vladimír Čunát fcdb4b51f8 mesa: maintenance 17.0.5 -> 17.0.6 2017-05-14 14:36:54 +02:00
Vladimír Čunát 51e0f8f759 Merge branch 'master' into staging
Some more larger rebuilds from master.
2017-05-12 12:03:37 +02:00
Vladimír Čunát 165a6548ad nvidia_x11_legacy340: fix patch URL to fix #25721
Using fixed-commit URLs and fetchpatch is just more robust.
2017-05-12 10:13:26 +02:00
Vladimír Čunát 8b01ec9a9e Merge branch 'master' into staging 2017-05-10 00:54:53 +02:00
Vladimír Čunát 254b7116e4 Merge #25574: firefox*: security updates 2017-05-07 10:59:41 +02:00
Vladimír Čunát 0a897b2a33 mesa: use older LLVM on aarch64 for now 2017-05-06 15:53:06 +02:00
Vladimír Čunát e68633cd72 Merge branch 'master' into staging
The missing maintainer entry is blocking evaluation on Hydra.
2017-05-06 13:58:45 +02:00
Vladimír Čunát 477fa42be6 maintainers: add vmchale, missing after #25514 2017-05-06 13:51:55 +02:00
Vladimír Čunát b70924bd80 Revert "Merge pull request #25275 from Ericson2314/platform-normalize"
This reverts commit 2282a5774c, reversing
changes made to 14adea9156.

The lib tests are bloking nixpkgs-unstable, and I don't like debugging
it soon enough.
2017-05-06 13:28:07 +02:00
Vladimír Čunát fa5d543770 Merge branch 'master' into staging 2017-05-06 13:24:28 +02:00
Vladimír Čunát ef5844be6c stdenv: disable audit-tmpdir on non-Linux for now
Without changing any hashes.
2017-05-06 13:19:07 +02:00
Vladimír Čunát 7830ce47cb xf86-video-nouveau: maintenance 1.0.14 -> 1.0.15 2017-05-06 12:48:15 +02:00
Vladimír Čunát 24ec5f07bc mesa: LLVM dependency 3.9 -> 4 2017-05-06 12:47:27 +02:00
Vladimír Čunát 24f0fa56a6 mesa: no more grsecurity support by default
Nixpkgs discontinued grsecurity support: #25277.
2017-05-06 11:59:48 +02:00
Vladimír Čunát 5725505967 mesa: maintenance 17.0.4 -> 17.0.5 2017-05-06 11:57:02 +02:00
Vladimír Čunát 1823113f87 xorg: misc updates 2017-05-06 11:51:24 +02:00
Vladimír Čunát 4e8aea4339 thunderbird: fix missing icons
It's just a fallback in case the user has no icon theme on path.
2017-05-04 22:54:30 +02:00
Vladimír Čunát 700d6186a3 wrapFirefox: fix #25505 gtk3 file dialogs
Crash + icons.
2017-05-04 22:10:24 +02:00
Vladimír Čunát 4ea520ce48 ocamlPackages.utop: add missing makeWrapper
... fixing the build.  No testing otherwise.
2017-05-03 15:48:21 +02:00
Vladimír Čunát 1bcd56b6e6 Merge branch 'master' into staging
There's been a very large rebuild on master, unfortunately.
pytestcov conflict: I'm not really sure what should be propagated.
2017-05-02 16:01:48 +02:00
Vladimír Čunát d7501b986a luajit: 2.1.0-beta2 -> 2.1.0-beta3
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
Vladimír Čunát 9ad1aaae53 lua5_{sec,1_sockets,expat}: convert to aliases
There's nothing better in these expressions than what we have in
lua-packages.nix
2017-05-02 14:00:44 +02:00
Vladimír Čunát f1ed43c14e Merge #24949: desmume: fix mesa+osmesa 2017-05-01 23:55:14 +02:00
Vladimír Čunát 30c0a2ca2e libplist: drop libxml2 dependency
The announcement for 2.0.0 claims it isn't needed anymore,
and it seems true.
2017-05-01 23:55:14 +02:00
Vladimír Čunát 92ee3b02e8 Merge branch 'staging'
Master is seeing a very large rebuild now, and this version of staging
seemed rather fine already (only a few thousand builds remaining now).
I really didn't want to wait a few more days because of this.
2017-05-01 18:00:21 +02:00
Vladimír Čunát ba4fd61630 Merge #25382: ffmpeg: remove darwin patch 2017-05-01 17:45:30 +02:00
Vladimír Čunát 429c3ab981 Merge #25372: thunderbird*: 52.0.1 -> 52.1.0 2017-05-01 11:30:45 +02:00
Vladimír Čunát 57174178c9 lib.makeScope: sync comment after rename in #25285 2017-04-30 15:56:29 +02:00
Vladimír Čunát 9860e77f79 Merge branch 'master' into staging 2017-04-30 14:40:39 +02:00
Vladimír Čunát eb4792a03f nixos manual: add a note about "nofail" FS option
Close #1858, as I think the points have been well resolved.
2017-04-30 14:10:30 +02:00
Vladimír Čunát e8d2b81988 Merge #25302: krita: 3.1.2.1 -> 3.1.3 2017-04-30 13:44:38 +02:00
Vladimír Čunát ac0b90f8c7 krita: fixup meta
Nix 1.12 (pre) would complain otherwise.
2017-04-30 13:42:35 +02:00
Vladimír Čunát 7ee05dff30 Merge: efl: 1.18.x -> 1.19.0 (close #25095)
I used a setupHook instead of patching expressions for individual
reverse dependencies (four were broken).
2017-04-30 11:36:36 +02:00
Vladimír Čunát 18a7f7d4a5 efl: set $HOME for reverse dependencies 2017-04-30 11:35:59 +02:00
Vladimír Čunát aa044dd105 efl: wrap the first line
It was >400 chars long!
2017-04-30 11:35:30 +02:00
Vladimír Čunát d7b21c5319 Merge #25171: libidn2: 0.16 -> 2.0.1
wget seems to work OK.
2017-04-26 09:19:43 +02:00
Vladimír Čunát d965e119f2 Merge #24749: amdgpu-pro: 16.60 -> 17.10 2017-04-24 21:53:50 +02:00
Vladimír Čunát 9f0de9522f net-snmp: fix build by using older perl for now
The single patch from upstream doesn't fix build by itself.
2017-04-24 18:01:12 +02:00
Vladimír Čunát 10af6b4dbf perl*, statsmodels: fix evaluation problems
The tarball job now builds again.
2017-04-24 17:36:28 +02:00
Vladimír Čunát 125cf35273 knot-resolver: maintenance 1.2.5 -> 1.2.6 2017-04-24 16:36:27 +02:00
Vladimír Čunát 5a3e454db3 Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Vladimír Čunát b72d4e13c7 kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
Vladimír Čunát 5cdf192827 Merge #25043: firefox-{bin,esr}: critical security 2017-04-22 11:51:02 +02:00
Vladimír Čunát be7ce1b0e9 kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00
Vladimír Čunát 5576ef9f1d libav-11: maintenance 11.8 -> 11.9
The patch doesn't apply anymore and changelog suggests it's not needed.
2017-04-18 18:58:57 +02:00
Vladimír Čunát ec55f8dcaa libssh: maintenance 0.7.4 -> 0.7.5 2017-04-18 18:47:43 +02:00
Vladimír Čunát 3efef09866 dbus: maintenance 1.10.16 -> 1.10.18 2017-04-18 18:44:22 +02:00
Vladimír Čunát 148f4996b5 harfbuzz: bugfix 1.4.4 -> 1.4.5 2017-04-18 18:41:53 +02:00
Vladimír Čunát 977aa067ae pango: maintenance 1.40.4 -> 1.40.5 2017-04-18 18:39:58 +02:00
Vladimír Čunát 09fd617383 gtk3: maintenance 3.22.11 -> 3.22.12 2017-04-18 18:38:27 +02:00
Vladimír Čunát 69c3f280a1 mesa: maintenance 17.0.3 -> 17.0.4 2017-04-18 18:35:56 +02:00
Vladimír Čunát 91ad6b3597 Revert "grub module: fix efiInstallAsRemovable description"
This reverts commit c2b56626f1.
It broke creating the manual.  I suspect the descriptions are
auto-wrapped by <para> and </para>.

We've been through this already in 3af715af90.
/cc #24978, @zraexy, @Mic92.
2017-04-18 14:26:36 +02:00
Vladimír Čunát 9fc61d0db5 simgrid: fixup sandboxed build after update #24915 2017-04-16 14:15:32 +02:00
Vladimír Čunát 98777646f9 wxGTK*: avoid the mesa attribute
Tested building all wxGTK* and execution of codeblocks.
2017-04-16 13:03:32 +02:00
Vladimír Čunát 2065eea424 mesa: reduce usage of the attribute and explain why 2017-04-16 13:03:15 +02:00
Vladimír Čunát 7644651e62 desmume: fix mesa+osmesa
It builds fine, but some better testing should be done before merging.
2017-04-16 11:21:28 +02:00
Vladimír Čunát 9ee2143912 treewide: remove unused buildEnv parameters 2017-04-16 10:29:49 +02:00
Vladimír Čunát f7a4f146c9 Merge branch 'master' into staging
This includes a fix for a bad merge.
2017-04-14 19:22:02 +02:00
Vladimír Čunát 2090aa4f65 Merge: fixup a bad merge
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:11:17 +02:00
Vladimír Čunát 4aec96b379 Merge the two "same" merges
This only takes the state from the second parent.
The purpose is that when this commit depends on the failed one,
simply merging this commit is a safe way to fix the problems.  Details:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:08:59 +02:00
Vladimír Čunát 6617c8bd87 A fixed version of commit eb750f9a7b
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 18:59:36 +02:00
Vladimír Čunát 878bbaf4e9 glib: 2.50.3 -> 2.52.1 2017-04-14 12:28:01 +02:00
Vladimír Čunát aeb0560959 Merge #24858: Smart wrapProgram 2017-04-14 12:24:33 +02:00
Vladimír Čunát 5b3f807597 Merge #24179: openssh: 7.4p1 -> 7.5p1 2017-04-14 12:16:26 +02:00
Vladimír Čunát da20d0e488 murmur service: fix typos from #24830 2017-04-14 11:05:42 +02:00
Vladimír Čunát f3ceb764e4 Merge #23374: mkDerivation: simplify non-cross builds
Don't pass buildInputs to stdenv builder in nativeBuildInputs.
2017-04-14 11:01:10 +02:00
Vladimír Čunát 1a1f2262b4 Merge #24637: gcc: include dylibs for darwin build 2017-04-14 10:53:16 +02:00
Vladimír Čunát 24444513fb Merge branch 'staging' 2017-04-14 10:32:13 +02:00
Vladimír Čunát 304d30ce3f all-tarballs: fixup evaluation (and the tarball job) 2017-04-14 10:31:31 +02:00