Commit Graph
100 Commits
Author SHA1 Message Date
Vladimír Čunát cf8ad5efff Merge #109242: vorbis-tools: 1.4.0 -> 1.4.2 2021-02-06 14:59:52 +01:00
Vladimír Čunát 7ca350660d Merge #111495: nixosTests.installer: Increase memory for the VM 2021-02-02 14:02:58 +01:00
Vladimír Čunát 1c12fe62b6 Merge #111172: libav: libvpx >= 1.8 drops some formats
This fixes the build.
2021-01-30 09:19:42 +01:00
Vladimír Čunát a648a07c19 Merge #104742: linux bootstrap tools: fix tests on ppc64 2021-01-26 08:09:59 +01:00
Vladimír Čunát fe111fc679 nixosTests.zfs.installer: fixup test after d44c6219b8 2021-01-24 21:02:56 +01:00
Vladimír Čunát c685856f91 Merge #110051: libmaxminddb: 1.4.3 -> 1.5.0 2021-01-21 11:15:56 +01:00
Vladimír Čunát 88e9df7b8d libiscsi: work around i686-linux build problems 2021-01-21 10:33:11 +01:00
Vladimír Čunát 56ef9942f1 knot-dns: 3.0.3 -> 3.0.4
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.4
2021-01-20 21:28:10 +01:00
Vladimír Čunát 86f83d5056 Merge #109996: gperftools: fix build on darwin 2021-01-19 21:43:27 +01:00
Vladimír Čunát fb7a68de66 gperftools: use lib instead of stdenv.lib
See c06b2b3.
2021-01-19 21:40:13 +01:00
Vladimír Čunát 502357ecb9 gperftools: drop an option that seems no longer supported
> warning: unknown warning option '-Wno-aligned-allocation-unavailable';
>   did you mean '-Wno-debug-compression-unavailable'? [-Wunknown-warning-option]
2021-01-19 19:22:29 +01:00
Vladimír Čunát 9e2880e5fa nixos ISO image: revert another part of 8ca33835ba 2021-01-13 15:25:19 +01:00
Vladimír Čunát 1a16428c17 nixos ISO image: revert a part of 8ca33835ba
Thanks @ primeos.  This wasn't really needed; my mistake.
2021-01-13 14:50:40 +01:00
Vladimír Čunát 8ca33835ba nixos: fixup build of aarch64 minimal ISO (fixes #109252)
Perhaps it's not pretty nor precise; feel free to improve.
2021-01-13 14:05:45 +01:00
Vladimír Čunát 9af686703d powerdns: patch build with gcc 10 2021-01-04 19:14:09 +01:00
Vladimír Čunát 1a57d96edd efivar: fixup build on i686-linux
Fixes #108375.  (I built the ISO locally)
I believe the report is a false positive.
2021-01-04 18:00:34 +01:00
Vladimír Čunát 95f685da60 python3Packages.mypy: don't use mypyc on 32-bit platforms
Almost all i686-linux tests got blocked because of this problem:
  https://hydra.nixos.org/eval/1638038#tabs-now-fail
It regressed in PR #105462 (commit ad26cb9ee8).

Now I tested that at least some test got fixed:
  nix build -f nixos/release-combined.nix nixos.tests.knot.i686-linux
This change won't even cause any rebuild on 64-bit platforms,
and using nix booleans seems nicer anyway.
2020-12-30 11:29:09 +01:00
Vladimír Čunát 85c8f75393 Merge #107603: firefox*: 84.0 -> 84.0.1 2020-12-28 08:39:21 +01:00
Vladimír Čunát 2b131c97bb nixos/kresd: set .stopIfChanged = false
Since version 5.2.0 there's non-empty stop phase:
    ExecStopPost=/usr/bin/env rm -f "/run/knot-resolver/control/%i"
but it's perfectly OK to run that from a different version
(and typically it's no-op anyway).  Real-life example where this helps:
https://github.com/NixOS/nixpkgs/issues/49528#issuecomment-747723198
2020-12-25 09:54:04 +01:00
Vladimír Čunát 57a787c9fa Revert Merge #107275: nixos: fix "nixos-rebuild ...
... build-vm-with-bootloader" for EFI systems

This reverts commit 20257280d9, reversing
changes made to 926a1b2094.
It broke nixosTests.installer.simpleUefiSystemdBoot
and right now channel is lagging behing for two weeks.
2020-12-23 21:24:24 +01:00
Vladimír Čunát 583470209f Revert "Merge #97536: uwsgi: fix compiling and linking"
This reverts commit df4d0b03ef, reversing
changes made to b333263534.

It didn't even evaluate!
2020-12-21 22:48:19 +01:00
Vladimír Čunát ac03cfa3c5 Revert "Merge #94582: clang, cc-wrapper: Move --gcc-toolchain logic..."
This reverts commit 0f25eb3e7d, reversing
changes made to df91ae1ac0.

These toolchain changes are too problematic, so reverting for now; see
https://github.com/NixOS/nixpkgs/pull/107086#issuecomment-749196366
2020-12-21 22:27:54 +01:00
Vladimír Čunát 363175cd99 Revert "bintools-wrapper: skip dynamic linker for static binaries"
This reverts commit ccfd26ef14.

These toolchain changes are too problematic, so reverting for now; see
https://github.com/NixOS/nixpkgs/pull/107086#issuecomment-749196366
2020-12-21 22:27:48 +01:00
Vladimír Čunát bf444739ec Revert "Merge #107253: bintools-wrapper: fix inverted link32 check"
This reverts commit 241c391255, reversing
changes made to ab8c2b2b2c.

These toolchain changes are too problematic, so reverting for now; see
https://github.com/NixOS/nixpkgs/pull/107086#issuecomment-749196366
2020-12-21 22:26:50 +01:00
Vladimír Čunát d649d77c4c Merge #107041: firefox: 83 -> 84 (security) 2020-12-20 08:42:26 +01:00
Vladimír Čunát a25cfd537f libarchive: use autoconf 2.69 2020-12-17 12:53:11 +00:00
Vladimír Čunát 84bc4d25fe Merge #107007: thunderbird*: 78.5.1 -> 78.6.0 (security)
https://www.thunderbird.net/en-US/thunderbird/78.6.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2020-56/
2020-12-16 18:15:31 +01:00
Vladimír Čunát 818c3001e8 knot-dns: 3.0.2 -> 3.0.3
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.3
2020-12-15 16:58:56 +01:00
Vladimír Čunát 37dfd61f02 mesa: fix musl-specific patching
When updating to 20.2, this was apparently forgotten.
2020-12-13 11:36:18 +01:00
Vladimír Čunát e955c4315f Merge #106804: mesa: find prefixed nm when cross compiling 2020-12-13 11:06:17 +01:00
Vladimír Čunát 0e18a48042 dnsperf: 2.3.4 -> 2.4.0
https://github.com/DNS-OARC/dnsperf/releases/tag/v2.4.0
2020-12-13 10:58:08 +01:00
Vladimír Čunát ace04464b6 knot-resolver: 5.2.0 -> 5.2.1
https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.2.1
2020-12-09 11:07:28 +01:00
Vladimír Čunát 098a7b67ac glibc: 2.32 -> 2.32-10
This should fix #100799 thanks to
https://sourceware.org/bugzilla/show_bug.cgi?id=26534#c5
2020-12-08 05:19:20 +01:00
Vladimír Čunát a7a8235392 Merge #105955: doc/firefox: correct manual generation 2020-12-05 09:37:46 +01:00
Vladimír Čunát 48b3694562 Merge #104825: xorg.libX11: 1.6.12 -> 1.7.0 (security) 2020-11-29 09:55:14 +01:00
Vladimír Čunát 1787b2d7bf Merge #102518: gcc9: apply gcc PR 96796 (into staging) 2020-11-29 09:01:28 +01:00
Vladimír Čunát bb8b9f4ce1 Merge #104378: thunderbird*: 78.4.3 -> 78.5.0 2020-11-21 10:26:00 +01:00
Vladimír Čunát 9a38c3a11b knot-resolver: fix evaluation on darwin
I somehow forgot that libcap_ng is linux-only.  I'm missing ofborg's
darwin builder, but I might've tested evaluation at least...
2020-11-18 08:41:28 +01:00
Vladimír Čunát bdcd2d82ee Merge #103633: kresd service: switch .listenDoH
... to new implementation - and a couple other improvements.
2020-11-17 20:06:55 +01:00
Vladimír Čunát 335798d243 knot-resolver: fix a stupid system breaking non-systemd
I hope this will fix darwin build (no good way of testing locally).
2020-11-17 20:05:51 +01:00
Vladimír Čunát cd5c7c0ee6 knot-resolver: drop capabilities after startup
By default.  I forgot to add this a long time ago.
The difference in runtime closure is really tiny (232 KiB by du).
2020-11-17 20:04:56 +01:00
Vladimír Čunát e61ef63e4e kresd service: switch .listenDoH to new implementation
Beware: extraFeatures are not needed *for this* anymore,
but their removal may still cause a regression in some configs
(example: prefill module).
2020-11-17 20:04:56 +01:00
Vladimír Čunát 3087df3e8f knot-resolver: add support for new DoH implementation
By default.  I'm not a DoH fan, but the difference in runtime closure
is really tiny (216 KiB by du).  I somehow forgot this during update.

Some of the newly running tests were failing and got disabled.
2020-11-17 20:04:55 +01:00
Vladimír Čunát b94e7b7d89 Merge #103474: firefox, thunderbird: revert meta.timeout 2020-11-14 21:12:02 +01:00
Vladimír Čunát 2c8c462906 Merge #103597: thunderbird*: 78.4.2 -> 78.4.3 2020-11-14 21:12:01 +01:00
Vladimír Čunát 6769ad9f11 Revert "Merge #102138: thunderbird: set build timeout at eight hours"
This reverts commit ef543fb416, reversing
changes made to 0d657b9c61.
See the parent commit.
2020-11-14 21:06:48 +01:00
Vladimír Čunát 280e27327d knot-resolver: 5.1.3 -> 5.2.0
https://lists.nic.cz/pipermail/knot-resolver-users/2020/000318.html

NixOS service: we'll probably want to switch listenDoH
to the new 'doh2' kind, but let me leave that for later.
2020-11-11 15:51:54 +01:00
Vladimír Čunát 193e8bc722 knot-dns: 3.0.1 -> 3.0.2
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.2
2020-11-11 15:12:28 +01:00
Vladimír Čunát e46d2ee4f8 Merge #103295: thunderbird*: 78.4.1 -> 78.4.2 (security) 2020-11-11 12:15:49 +01:00
Vladimír Čunát f4c13d1d9d brotli.meta.maintainers: unlist myself
Years ago I thought I might use it for something, but anything like that
seems very unlikely to ever materialize, so let me focus on packages
that I consider more important.
2020-11-08 09:43:36 +01:00
Vladimír Čunát 45009cacef Merge #102196: doxygen: 1.8.19 -> 1.8.20 (in staging) 2020-11-07 21:15:21 +01:00
Vladimír Čunát eb3fd61bb6 firefox-esr: fix build by using older rust
It's probably the same issue as with thunderbird.
2020-11-07 14:54:38 +01:00
Vladimír Čunát ef543fb416 Merge #102138: thunderbird: set build timeout at eight hours 2020-11-07 13:03:45 +01:00
Vladimír Čunát 0d657b9c61 Merge #103069: thunderbird*: 78.4.0 -> 78.4.1
In `thunderbird` case the rust downgrade was needed to fix the build
regardless of the update, i.e. fixes #103071.
2020-11-07 13:01:36 +01:00
Vladimír Čunát 55ac5df242 kwin: fixup build by upstream patch 2020-11-04 21:48:35 +01:00
Vladimír Čunát 20baaf104a Revert "Disable the metrics job"
This reverts commit c54308d27c.
The machine has been back for some time.
2020-11-04 13:53:25 +01:00
Vladimír Čunát a31fd3cb7f Merge #102614: haskell.compiler.ghc8102BinaryMinimal: init 2020-11-03 19:54:09 +01:00
Vladimír Čunát dfd3ede68d Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Vladimír Čunát 0b32140b34 Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát 31839c352e Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
Vladimír Čunát 1111911593 Merge branch 'staging-next' into staging
I re-verified that the git-tree state looks good after
the trouble addressed in commit 89023c38fc
(by the same approach - comparison to a "clean rebase").
I was actually a little surprised that simple git merge
did the right thing this time.

The one thing I can't fix is that some of staging commits are now
reachable from master even though they're not really applied in there
yet, but that's just temporary effect until the next merge to master.
I certainly don't envy any archeology hitting these commit ranges
(e.g. bisections).
2020-10-26 09:19:25 +01:00
Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát 2f6b00b15e Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát 4bd836b381 Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
Vladimír Čunát c778945806 Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát 17f5305b6c Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Vladimír Čunát ed217bcc35 Merge #100446: python*Packages.apprise: fix dependencies 2020-10-25 08:39:18 +01:00
Vladimír Čunát 803ca85c20 coreutils: fix aarch64 build by upstream patch
https://hydra.nixos.org/build/128781441
We can't use fetchpatch here, unfortunately.
2020-10-25 08:07:15 +01:00
Vladimír Čunát c0a646edd0 Merge #101380: thunderbird*: 78.3.2 -> 78.4.0 2020-10-24 09:16:36 +02:00
Vladimír Čunát 90094b0468 Merge branch 'master' into staging-next
minor conflict: rust update vs. darwin fixes for it
  (not tested but seems quite OK)
2020-10-21 13:34:06 +02:00
Vladimír Čunát 65d6adcf3e Merge #100713: chromium: build on all cores 2020-10-20 20:58:16 +02:00
Vladimír Čunát 8bdf7dc4ab Merge #100886: cairo: fix build on darwin 2020-10-20 20:52:33 +02:00
Vladimír Čunát cf82eb9514 Merge #100875: curl: 7.72.0 -> 7.73.0 (into staging) 2020-10-20 12:40:07 +02:00
Vladimír Čunát 2324085f9f Merge #100385: xorg xcb updates (into staging) 2020-10-20 12:09:58 +02:00
Vladimír Čunát 744f449aa4 Merge #100376: xorg.xorgproto: 2019.1 -> 2020.1 (into staging) 2020-10-20 12:07:12 +02:00
Vladimír Čunát b4d8c62423 Merge #100378: xorg.libXvMC: 1.0.11 -> 1.0.12 (into staging) 2020-10-20 12:05:30 +02:00
Vladimír Čunát 176243b059 Merge #100808: thunderbird*: 78.3.2 -> 78.3.3 2020-10-20 07:52:52 +02:00
Vladimír Čunát a76152ac6e pkgs-lib/tests/formats: improve message on failure
Foremost, the message was discarding double quotes on one side of the
diff, which was super-confusing to me, as I thought that the format
convertor broke that when in fact only whitespace was changed.

I thought I'd cat the files, but then... switching to `diff -u` seemed
self-sufficient.  It felt sufficiently non-controversial to push
directly, but certainly feel free to improve further.
2020-10-19 21:46:08 +02:00
Vladimír Čunát 92c96b7995 pkgs-lib/tests/formats: fix whitespace after PR #100372
Naturally, TOML doesn't define the exact shape of everything.
nix build -f pkgs/top-level/release.nix pkgs-lib-tests
2020-10-19 21:19:37 +02:00
Vladimír Čunát dba6d275ae Merge: first-parent history cleanup
... by "merging" an older version of the same `staging-next` branch.
Perhaps some people don't care about this but it helps me quit a bit.

If I looked right, the b981eca0 commit has only one child (b3aed163)
which merged the last staging-next iteration into master.
2020-10-19 11:21:47 +02:00
Vladimír Čunát 2c9be93bf2 Merge #100883: expat: 2.2.8 -> 2.2.10 (into staging) 2020-10-18 13:37:51 +02:00
Vladimír Čunát 3eac52d6ca Merge #100877: coreutils: 8.31 -> 8.32 (into staging)
https://lists.gnu.org/archive/html/coreutils-announce/2020-03/msg00000.html
2020-10-18 13:33:26 +02:00
Vladimír Čunát 5aca3498a6 Merge #92704: gcc: Improve manpage symlinks 2020-10-18 11:56:39 +02:00
Vladimír Čunát 08fe24a49e Merge #99698: zeromq: 4.3.2 -> 4.3.3 (into staging) 2020-10-18 11:44:21 +02:00
Vladimír Čunát a6d8c4ff33 Merge #100058: unbound: 1.11.0 -> 1.12.0 (into staging) 2020-10-18 11:38:46 +02:00
Vladimír Čunát c3b9b39cc2 Merge #99987: openssl: 1.1.1g -> 1.1.1h (into staging) 2020-10-18 11:35:52 +02:00
Vladimír Čunát f42d36d588 Merge #99437: p11-kit: fix tests when non-root 2020-10-18 11:28:05 +02:00
Vladimír Čunát 90fd589286 Merge #98191: nvidia_x11: 2020.09 - 2020.10 2020-10-18 11:08:20 +02:00
Vladimír Čunát 04821fbe46 Merge #93333: julia: Remove version 0.7 and 1.1 2020-10-18 10:29:04 +02:00
Vladimír Čunát 81b1356944 Merge #98415: wordnet: Fix darwin build 2020-10-18 10:07:04 +02:00
Vladimír Čunát f886c4f282 Merge #97967: knot-dns: doInstallCheck = true
I thought I'd verify darwin through PR+borg, but now I'll just merge
and take action in case it breaks on darwin.
2020-10-17 01:13:46 +02:00
Vladimír Čunát b623690daf Merge #99158: xorg.libX11: 1.6.8 -> 1.6.12 (security) 2020-10-15 07:55:16 +02:00
Vladimír Čunát 230728216a thunderbird*-68: mark as insecure 2020-10-11 11:16:27 +02:00
Vladimír Čunát 2d4225bcd3 Merge #100079: thunderbird-*: 78.3.1 -> 78.3.2 2020-10-11 11:16:27 +02:00
Vladimír Čunát 338b25697c Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
Vladimír Čunát 497248a558 knot-dns: 3.0.0 -> 3.0.1
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.1
2020-10-10 11:06:35 +02:00
Vladimír Čunát 420f89ceb2 Revert "apparmor: fix and improve the service"
This reverts commit fb6d63f3fd.

I really hope this finally fixes #99236: evaluation on Hydra.
This time I really did check basically the same commit on Hydra:
https://hydra.nixos.org/eval/1618011

Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
2020-10-07 12:22:18 +02:00
Vladimír Čunát c7b3d98659 Merge #99227: luajit*: update and enableGC64 by default 2020-10-07 07:40:11 +02:00
Vladimír Čunát 0e0885d3da Re-Revert "xorg: mark fonts with proprietary licences as unfree"
This reverts commit 5d993eeb84.
The revert didn't seem to fix the problem (#99236) and the errors look
the same (tried several times).
2020-10-04 20:28:57 +02:00