Commit Graph
100 Commits
Author SHA1 Message Date
Vladimír Čunát d9c5d584cd Merge branch 'master' into release-docs
It's been a very long time, so I think a merge will be better than
a rebase.  There was only one simple conflict.
2019-10-27 10:29:58 +01:00
Vladimír Čunát 3ce29412bd qt59.qtbase: fix with openssl-1.1.0 via ported Fedora patch 2019-07-29 21:25:14 +02:00
Vladimír Čunát beadf0b77f eiskaltdcpp: remove duplicate patches after merge 2019-07-29 21:25:12 +02:00
Vladimír Čunát b8c3f84a72 serf: build with openssl-1.0.2 again
The linkage was bad.  It built but at load-time it demanded symbols that
don't exist in 1.1.0 and thus subversion wouldn't build.
2019-07-29 21:25:12 +02:00
Vladimír Čunát 2d5ac64f89 Revert "kdeFrameworks.kdelibs4support: add patch for openssl 1.1"
This reverts commit 19f770218e053cd9542ecffef0eac604707fce96.
It's no longer applicable nor needed.
2019-07-29 21:25:12 +02:00
Vladimír Čunát 18d975aff2 gcc9: init at 9.1.0 (released today)
It's just a trivial copy of whole gcc8 stuff,
only with changed version string and hash.
2019-05-03 12:34:40 +02:00
Vladimír Čunát 5b316ed476 lua*Packages.cqueues: fix internal version number
It's a workaround for now, until we know more.  See upstream ticket.
2019-04-23 10:54:30 +02:00
Vladimír Čunát 6e9f6a63a2 knot-dns: 2.8.0 -> 2.8.1 (maintenance)
https://lists.nic.cz/pipermail/knot-dns-users/2019-April/001660.html
2019-04-09 16:15:55 +02:00
Vladimír Čunát 1ad3f34a99 nixos manual Makefile: improve purity
And be quiet when building/downloading the required tools.
2019-03-22 14:48:08 +01:00
Vladimír Čunát 4c3ec0e325 nixos docs: run the formatting tool (no content change)
As documented in the docs themselves :-)
2019-03-22 14:44:11 +01:00
Vladimír Čunát 11d204a9c4 nixos docs: improve GPU driver documentation
I'm not 100% sure about the incompatibility lines,
but I believe it's better to discourage these anyway.
If you find better information, feel free to amend...

The 32-bit thing is completely GPU-agnostic, so I can't see why we had
it separately for proprietary drivers and missing for the rest.
2019-03-22 14:31:17 +01:00
Vladimír Čunát 3e4d8d2fc6 knot-dns: 2.7.6 -> 2.8.0
https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.8.0
Some explanation for the patching is in this ML thread:
https://lists.nic.cz/pipermail/knot-dns-users/2019-March/001616.html
2019-03-06 19:19:13 +01:00
Vladimír Čunát f8039e1425 ipe: fix the src hash (modified upstream)
https://mailman.science.uu.nl/pipermail/ipe-announce/2019-February/000080.html
2019-03-05 15:09:49 +01:00
Vladimír Čunát 3e442fd0f9 Revert "luaPackages.cqueues: move to generated"
This reverts commit c01fe375ca.
See the reverted commit on GitHub for discussion.  /cc PR #55305.
2019-03-04 20:34:07 +01:00
Vladimír Čunát dfa45dfb86 Merge #56516: lndir: get rid of xorgproto dependency
... into staging.
2019-03-01 19:09:54 +01:00
Vladimír Čunát aed7621ef8 vimPlugins.meson: init, following pkgs.meson 2019-03-01 17:13:43 +01:00
Vladimír Čunát 35cf2c82c1 Merge #56201: add nix-env.qaCountBroken metric 2019-03-01 14:01:45 +01:00
Vladimír Čunát a593f64cd7 metrics.nix: track qaCountBroken instead of qaCountDrv
From these three values, I believe it's most meaningful to track
one of the higher ones and their difference (qaCountBroken).
It's a bit unclear which of the higher ones - I have no data on that,
so I kept the one used before the parent commit.
2019-03-01 13:59:30 +01:00
Vladimír Čunát e52396ce2c Merge #56143: luajit, lmdb, knot-resolver: cross-fixes 2019-02-26 15:24:17 +01:00
Vladimír Čunát 18fe630281 Merge #56291: cmake: fix darwin bootstrapping
... into staging-next.
2019-02-24 16:52:03 +01:00
Vladimír Čunát d4fcb9b7e5 Merge #55890: samba: 4.7.10 -> 4.7.12 (security) 2019-02-24 15:32:50 +01:00
Vladimír Čunát 0cf158006b Merge #52833: netatalk: 3.1.11 -> 3.1.12 (security) 2019-02-24 09:10:31 +01:00
Vladimír Čunát 98385ff540 knot-resolver: cross-compilation fix 2019-02-23 18:17:35 +01:00
Vladimír Čunát 3dda94df65 Merge #56223: gcc: 8.2.0 -> 8.3.0 2019-02-23 00:18:05 +01:00
Vladimír Čunát 71f4ba29a3 Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Vladimír Čunát 821c0844d4 Merge branch 'staging' into staging-next 2019-02-22 17:49:58 +01:00
Vladimír Čunát 2adf954e84 Merge #55420: buildEnv, substituteAll: disable binary cache
... into staging.
2019-02-22 13:57:01 +01:00
Vladimír Čunát 4c212f6b12 Merge #55779: only set __darwinAllowLocalNetworking on darwin
... into staging.
2019-02-22 11:27:28 +01:00
Vladimír Čunát 65c085e8a9 Merge #56010: busybox: 1.29.3 -> 1.30.1
There's a CVE fix inside, so let's not wait for long.
2019-02-22 10:25:24 +01:00
Vladimír Čunát 4ba49d3d6c Merge #55988: treewide meta.platforms: linux -> unix 2019-02-22 07:59:34 +01:00
Vladimír Čunát 52a2414aae Merge #55819: unbound: 1.8.3 -> 1.9.0 (into staging)
It would be quite a shame if 19.03 missed dnsflagday.net changes
and some other features/fixes from 1.9.0.
2019-02-22 07:38:38 +01:00
Vladimír Čunát 239b5e84a9 Merge #55613: libidn2: 2.1.0 -> 2.1.1 (into staging) 2019-02-22 07:35:24 +01:00
Vladimír Čunát 9cfe4a11cc Merge #55632: libuv: 1.24.1 -> 1.26.0 (into staging) 2019-02-22 07:33:18 +01:00
Vladimír Čunát 052e34a66f Merge #56059: cmake: 3.12.1 -> 3.13.4 (into staging) 2019-02-22 07:23:08 +01:00
Vladimír Čunát 7d47102bbc Merge #56170: Revert "file: 5.35 -> 5.36" (staging) 2019-02-22 07:02:53 +01:00
Vladimír Čunát 2ed8187107 Merge #56022: mesa and x11 updates (into staging) 2019-02-22 06:59:22 +01:00
Vladimír Čunát 19eedaf867 Merge #56103: ktouch: fix build failure 2019-02-22 06:43:59 +01:00
Vladimír Čunát 983890481b Merge branch 'staging-next'
Just a systemd security patch.
2019-02-22 06:43:10 +01:00
Vladimír Čunát 5ddfa4183a luajit: fix cross-compilation, partially
Also clean the expression a bit.
2019-02-21 12:16:04 +01:00
Vladimír Čunát 147a685948 lmdb: fix cross-compilation 2019-02-21 12:16:03 +01:00
Vladimír Čunát bcf3bdf937 Merge #56101: Revert "Remove maintainership" 2019-02-20 20:16:22 +01:00
Vladimír Čunát 61ef8f0b42 grub2: patch to work with updated binutils
This blocked some EFI stuff and consequently the channels.
I would fetchpatch, but their cgit server won't work on this commit.
2019-02-20 11:22:54 +01:00
Vladimír Čunát 32767d139f Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Vladimír Čunát 28d983fe25 openscad: enableParallelBuilding = false;
Discussion: https://github.com/NixOS/nixpkgs/commit/c68dc2212e22
2019-02-20 09:38:21 +01:00
Vladimír Čunát e20188f181 stp: fixup build by using older bison
I have no idea what's wrong.
2019-02-19 18:18:04 +01:00
Vladimír Čunát f1ed4b50fc zeroc_ice: disable problematic parallel make 2019-02-19 18:14:52 +01:00
Vladimír Čunát d0d7ac3f9e filebench: fixup build by using older bison
I have no idea what's wrong.
2019-02-19 18:06:07 +01:00
Vladimír Čunát bdd47aaf83 gcl*: fix with updated binutils
The patch was taken from Debian; they apparently don't have a src repo.
2019-02-19 18:02:29 +01:00
Vladimír Čunát 024407bf9a Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
2019-02-19 12:11:04 +01:00
Vladimír Čunát bce12effa7 syslinux: fix build with new binutils
Also fix the URL of the other patch.
2019-02-19 12:05:51 +01:00
Vladimír Čunát 555912067f Revert "syslinux: 2015-11-09 -> 2019-02-07"
This reverts commit 0b49d5dd68 #55500.
I'm sorry, I'm unable to fix the build quickly in other way than
atop the older version.  Certainly feel free to improve the approach.
2019-02-19 12:04:43 +01:00
Vladimír Čunát 4851a04deb go_1_10: fix tests after binutils update 2019-02-19 11:35:54 +01:00
Vladimír Čunát 3a078594a1 libpng: always apply the debian patches
This fixes the low-severity CVE on other platforms than aarch64.
2019-02-19 11:10:00 +01:00
Vladimír Čunát 424efc7e71 Merge branch 'staging-next' into staging 2019-02-19 11:08:32 +01:00
Vladimír Čunát 98be12ab3a libpng: apply patches from Debian
- first unbreaks ARM builds
- second fixes a low-severity CVE
These only get applied on aarch64 *for now*, to iterate staging faster.
2019-02-19 11:02:38 +01:00
Vladimír Čunát c721be4008 Merge #55845: linux-hardkernel: 4.14.87-153 -> 4.14.94-155 2019-02-19 09:16:01 +01:00
Vladimír Čunát 95e2332ed1 Merge #55981: gtk3: 3.24.4 -> 3.24.5 (into staging) 2019-02-19 08:23:01 +01:00
Vladimír Čunát 498e79941d Merge #55345: luajit_*: avoid double callPackage 2019-02-18 09:57:46 +01:00
Vladimír Čunát 94b518f855 Merge #54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2
Includes security fixes.
2019-02-17 09:45:21 +01:00
Vladimír Čunát f7f1a2f54e Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
2019-02-17 08:05:24 +01:00
Vladimír Čunát 10f37a312d nxproxy: drop the warning introduced by #55723
The tarball job fails when warnings are detected (and blocks channel).
And that's good, because `nix-env -qa` also gets these warnings.

I'm afraid we still don't have a good way to deprecate attributes,
exactly because the inability to distinguish these "listing actions"
from explicit usage (direct or transitive).
2019-02-16 16:50:18 +01:00
Vladimír Čunát 6dce69e475 Merge #55831: thunderbird*: 60.5.0 -> 60.5.1 2019-02-16 10:32:15 +01:00
Vladimír Čunát 1ca67d201f Merge #55852: elfutils: 0.175 -> 0.176
Fixes six security CVE issues.
2019-02-15 23:29:49 +01:00
Vladimír Čunát 14cbd06e06 linux 4.9: also apply interpreter-trunc
4.4.174 doesn't need this (possibly after a future bump).
I think this covers all the affected kernels ATM.  Builds tested.
2019-02-15 09:27:38 +01:00
Vladimír Čunát 01d8894c4d Revert "linux: 4.14.98 -> 4.14.99"
This reverts commit 0e1eb30a1d.
It broke the installer tests, e.g. https://hydra.nixos.org/build/88704861
2019-02-13 22:55:36 +01:00
Vladimír Čunát c40f211499 Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Vladimír Čunát 64edccb463 treewide: fix missing libs after libtool pruning #51767 2019-02-10 14:14:33 +01:00
Vladimír Čunát 482c0440ac Merge #55508: maintainers: update tomsmeets' e-mail 2019-02-10 11:47:58 +01:00
Vladimír Čunát 7455889641 python*Packages: yet another round of pkgs.pkgconfig 2019-02-10 11:43:00 +01:00
Vladimír Čunát d2c4b5777b sagelib: fix missing pkgs.pkgconfig
Again: eb3f0aef43 #54306
Apparently the derivation needs both pkgconfigs
(it fails when missing either).
2019-02-09 10:36:47 +01:00
Vladimír Čunát 7f9e3b8206 Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
Vladimír Čunát 6ae1cc2e62 python*Packages.pyqt4: fix dbus support
- it's the pkgconfig confusion again: eb3f0aef43 #54306
- unfortunately the build succeeded silently with
  > DBus v1 does not seem to be installed.
- pyqt5 uses correct pkgconfig due to using different callPackage
2019-02-09 10:03:49 +01:00
Vladimír Čunát 01a1cb913e luajit_*: avoid double callPackage
IIRC it causes some problems when overriding.
2019-02-06 16:27:27 +01:00
Vladimír Čunát ff101946a8 Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
Vladimír Čunát bd9f835bf6 Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Vladimír Čunát 3d979f432c python*Packages.pkgconfig: try avoiding multiple breakages
I don't feel like doing many commits like the parent one,
but feel free to improve...
2019-02-02 14:33:15 +01:00
Vladimír Čunát 05c62669b9 pythonPackages.wxPython: fixup build
I'm not sure why/when it started failing, but adding pkgconfig
shouldn't hurt anything.  I see no indication that
pythonPackages.pkgconfig was meant.
2019-02-02 13:56:38 +01:00
Vladimír Čunát 8ba79e5af9 haskellPackages.servant: fixup build after 86f646da 2019-02-02 11:56:04 +01:00
Vladimír Čunát f55f45f273 pantheon, aliases: remove remaining gst-ffmpeg
This fixes evaluation.  I'm not sure why pantheon.elementary-videos
was mixing gst 1 with old gst-ffmpeg.
/cc #48637, #50220.
2019-02-01 09:43:57 +01:00
Vladimír Čunát 8ba516664b Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9 Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Vladimír Čunát 79a7cd6c55 syslinux: fix build with new binutils
Also fix the URL of the other patch.
2019-01-29 22:18:49 +01:00
Vladimír Čunát 34a936340f Merge #54878: bison: 3.3 -> 3.3.1
This mainly fixes some build-regressions from 3.3,
so we can drop the workarounds.
2019-01-29 15:00:06 +01:00
Vladimír Čunát 7e6662a275 Merge #54438: openssl_1_1: use the same default CA path as 1.0.* 2019-01-29 13:51:55 +01:00
Vladimír Čunát 57a456112d Revert "swig3, libapparmor: switch to bison2"
This reverts commit c4720cb200.
2019-01-29 12:54:20 +01:00
Vladimír Čunát 444d073332 Revert "glibc: fix build with newer bison"
This reverts commit aa9821bbb9.
2019-01-29 12:54:04 +01:00
Vladimír Čunát efc836f607 Merge branch 'staging' into bison-3.3.1 2019-01-29 12:52:57 +01:00
Vladimír Čunát c4720cb200 swig3, libapparmor: switch to bison2
To fix build after https://github.com/NixOS/nixpkgs/pull/54635
2019-01-29 12:42:27 +01:00
Vladimír Čunát aa9821bbb9 glibc: fix build with newer bison
Fixes https://github.com/NixOS/nixpkgs/issues/54870
2019-01-29 12:42:26 +01:00
Vladimír Čunát 510a678f02 Merge #54638: gnumeric: fix wrapping 2019-01-27 12:05:27 +01:00
Vladimír Čunát eb965a4b38 Revert "hackage-packages.nix: automatic Haskell package set update"
This reverts commit c6ff4d6192.

error: while evaluating anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/.gc-of-borg-outpaths.nix:39:12, called from undefined position:
while evaluating anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/pkgs/top-level/release-lib.nix:121:6, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/lib/attrsets.nix:292:43:
while evaluating 'hydraJob' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/lib/customisation.nix:157:14, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/pkgs/top-level/release-lib.nix:121:14:
while evaluating the attribute 'drvPath' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/lib/customisation.nix:174:13:
while evaluating the attribute 'drvPath' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/lib/customisation.nix:141:13:
while evaluating the attribute 'buildInputs' of the derivation 'tonaparser-0.1.0.0' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/pkgs/stdenv/generic/make-derivation.nix:185:11:
while evaluating the attribute 'buildInputs' of the derivation 'tonatona-0.1.0.0' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci/pkgs/stdenv/generic/make-derivation.nix:185:11:
infinite recursion encountered, at undefined position
2019-01-27 11:42:40 +01:00
Vladimír Čunát a687ef9739 go_1_9: mark as insecure (see the parent commit)
Upstream only supports two latest releases.
https://github.com/golang/go/issues/29903#issuecomment-457307356
2019-01-27 11:33:57 +01:00
Vladimír Čunát d32e779ae8 go_1_10: 1.10.7 -> 1.10.8 (security)
https://groups.google.com/forum/#!topic/golang-announce/mVeX35iXuSw
https://github.com/NixOS/nixpkgs/pull/54658
2019-01-27 11:29:13 +01:00
Vladimír Čunát 185d88c515 adoptopenjdk-bin: fail in a good way when unsupported
It was breaking the tarball job:
https://hydra.nixos.org/build/87863422
2019-01-27 10:46:07 +01:00
Vladimír Čunát 2c226107cb systemd-cryptsetup-generator: fixup linkage
It got broken by 74a64a8a6 #53483.
But IMO it's *this* expression that was written in a too fragile way.
2019-01-26 14:16:56 +01:00
Vladimír Čunát 0946551612 dnsperf: 2.1.0.0 -> 2.2.0
I tested performance with resperf for a while.
2019-01-25 16:26:41 +01:00
Vladimír Čunát 666870d813 jemalloc nitpick: better semantics for stripPrefix 2019-01-23 21:01:59 +01:00
Vladimír Čunát 5237df5186 knot-dns: 2.7.5 -> 2.7.6
Maintenance update, nothing really important, probably.
https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.7.6
2019-01-23 14:04:32 +01:00
Vladimír Čunát 3fe32b675e Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Vladimír Čunát a903c60c62 Merge #54441: gtk3: 3.24.3 -> 3.24.4 (into staging) 2019-01-22 14:59:54 +01:00