Commit Graph
100 Commits
Author SHA1 Message Date
Vladimír Čunát bddcd35e1d Merge #43141: lua-5.3 and lpeg updates 2018-07-21 23:05:44 +02:00
Vladimír Čunát 17a0c57e68 Merge #43741: pciutils: 3.6.0 -> 3.6.1 2018-07-21 20:51:55 +02:00
Vladimír Čunát 0262431889 Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.
2018-07-21 20:46:42 +02:00
Vladimír Čunát e161ee3df1 Merge branch 'staging' into PR 2018-07-21 20:46:03 +02:00
Vladimír Čunát 491f205332 knot-dns: libidn -> libidn2
It's only used by the `kdig` tool.
2018-07-20 15:38:15 +02:00
Vladimír Čunát e1625a8377 Merge branch 'staging-next' into staging 2018-07-17 08:55:31 +02:00
Vladimír Čunát 2bd8e98eba mesa: fix overzealous patching of *.pc
PR #42529 (722dd05) broke gbm.pc and consequently virglrenderer build.
2018-07-16 17:47:24 +02:00
Vladimír Čunát ba8cb47905 Merge #43556: ffmpeg: build fixes 2018-07-15 11:17:18 +02:00
Vladimír Čunát 03e13ab370 ffmpeg_4, ffmpeg-full: 4.0 -> 4.0.1 (security)
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/e049f7c24f:/Changelog
http://ffmpeg.org/security.html claims it fixes CVE-2018-12458..12460
2018-07-15 11:07:03 +02:00
Vladimír Čunát 10cbebe3df ffmpeg: 3.4.2 -> 3.4.3 (security)
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/89355585366:/Changelog
/cc #42882: it certainly seems to fix some security issues,
but I'm not sure about mapping to particular CVE numbers;
perhaps it will appear on http://ffmpeg.org/security.html
2018-07-15 11:07:00 +02:00
Vladimír Čunát 0f01215203 Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Vladimír Čunát 2698bb461f knot-dns: 2.6.7 -> 2.6.8 (maintenance)
https://lists.nic.cz/pipermail/knot-dns-users/2018-July/001409.html
2018-07-10 15:23:20 +02:00
Vladimír Čunát 1c5addde5f knot_resolver: support prefill module in extraFeatures 2018-07-08 09:21:42 +02:00
Vladimír Čunát bfc123803d lua*Packages.lfs: init at 1.7.0.2 2018-07-08 09:19:43 +02:00
Vladimír Čunát 6ea4c3d335 Merge #43113: firefox*: 61.0 -> 61.0.1 2018-07-07 08:58:27 +02:00
Vladimír Čunát 38bca8d36f nixos.tests.containers-imperative: increase VM memory
Apparently merging #43021 1bdb138710 did increase memory usage
in some cases.  1 GiB for a VM memory seems still low enough to me.
2018-07-06 15:57:57 +02:00
Vladimír Čunát ec199f0941 Merge #43021: nix: use boehmgc with enableLargeConfig 2018-07-06 13:46:40 +02:00
Vladimír Čunát 1bdb138710 nix: use boehmgc with enableLargeConfig = true
Fixes #43015 for me and hopefully also similar issues.

== Resource consumption ==

TL;DR: no change for small-memory cases, less CPU for large-memory cases.

I assume almost all of the large memory usage is just the expression
evaluation and managed by the GC, so I used just `nix-env -q...` to test.
Old and new lines for each command follow.  I tried to run each several
times, but the values were very stable (<1% difference on re-runs),
so only one line for each command-version pair is provided.

$ time nix-env -f . -qaP --description -A nix >/dev/null
- 0.06user 0.01system 0:00.07elapsed 101%CPU (0avgtext+0avgdata 29036maxresident)k
+ 0.06user 0.01system 0:00.07elapsed 102%CPU (0avgtext+0avgdata 29864maxresident)k

$ time nix-env -f . -qaP --description >/dev/null
- 6.45user 0.36system 0:06.82elapsed  99%CPU (0avgtext+0avgdata 1021024maxresident)k
+ 6.23user 0.33system 0:06.57elapsed 100%CPU (0avgtext+0avgdata  938408maxresident)k

$ time nix-env -f . --show-trace -qa --drv-path --system --meta --xml 2>&1 >/dev/null
- 56.35user 0.96system 0:31.03elapsed 184%CPU (0avgtext+0avgdata 3207708maxresident)k
+ 44.80user 0.91system 0:26.12elapsed 175%CPU (0avgtext+0avgdata 3192696maxresident)k

$ time ./result-nix-large/bin/nix-instantiate --dry-run --eval --strict \
    --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
- Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
- Command terminated by signal 6
- 175.18user 2.68system 1:17.42elapsed 229%CPU (0avgtext+0avgdata 8468440maxresident)k
+ 178.48user 2.78system 1:15.11elapsed 241%CPU (0avgtext+0avgdata 8460572maxresident)k
2018-07-06 13:03:45 +02:00
Vladimír Čunát 07ac57182b Merge #43012: thunderbird*: 52.8.0 -> 52.9.0 (security) 2018-07-06 08:20:34 +02:00
Vladimír Čunát 21db578818 Merge #42969: pciutils: 3.5.6 -> 3.6.0 2018-07-04 07:39:15 +02:00
Vladimír Čunát 89156ee81f pciutils: fix a comment not updated by bot 2018-07-04 07:37:40 +02:00
Vladimír Čunát ea8b0fa1cc knot-resolver: 2.3.0 -> 2.4.0
It includes security-relevant fixes.
https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v2.4.0
2018-07-03 10:53:30 +02:00
Vladimír Čunát c1ffc65d1a Merge branch 'master' into staging
This apparently fixes some broken src fetches (gnuradio, twisted).
2018-07-02 11:10:26 +02:00
Vladimír Čunát bcb416a07e dnsperf: fixup build
I'm not sure why the libcap.dev -> libcap.lib propagation
doesn't work here.
2018-06-30 09:57:58 +02:00
Vladimír Čunát f7781f5293 Merge branch 'master' into staging 2018-06-30 01:41:59 +02:00
Vladimír Čunát 2059bf9e39 Merge older staging with added firefox-related updates 2018-06-29 21:06:39 +02:00
Vladimír Čunát 2f4001f41a Merge #42729: firefox-61 and related updates (security)
(cherry picked from commit 8ad921dc94)
Fast-forwarded to get to master sooner.
2018-06-29 20:58:13 +02:00
Vladimír Čunát 8ad921dc94 Merge #42729: firefox-61 and related updates (security) 2018-06-29 20:55:43 +02:00
Vladimír Čunát a8c71037e0 installer tests: avoid udisks2
This is a temporary hack to fix channel until we resolve #42324.
2018-06-22 10:47:05 +02:00
Vladimír Čunát f769004e5b unbound: 1.7.2 -> 1.7.3
The NEWS seems safe.

My motivation: fixes resolution of some Microsoft names if using
qname-minimisation: yes
2018-06-21 13:55:32 +02:00
Vladimír Čunát 5039d6ed1f Merge branch 'master' into staging
~6k rebuilds per platform (mainly haskellPackages, I think).
2018-06-20 18:17:18 +02:00
Vladimír Čunát 3756efbdcc pythonPackages.xml2rfc: init at 2.9.8
It seems to work fine, in python2Packages and python3Packages.
If you find a problem, let me know and I'll try to fix it.
2018-06-18 14:16:55 +02:00
Vladimír Čunát 7f359a7a27 Merge #42126: lyx: fix build with Qt5.11 2018-06-17 15:59:40 +02:00
Vladimír Čunát 06b602b192 ffmpeg_2: 2.8.13 -> 2.8.14
Lots of bugfixes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/3f8a0d5ad1:/Changelog
2018-06-17 12:13:38 +02:00
Vladimír Čunát 7ccece3227 libvorbis: upstream patch for CVE-2018-10392
/cc #41748.
2018-06-17 11:43:27 +02:00
Vladimír Čunát 31530c185e Merge a subset of staging (security)
In particular, this contains Firefox-related and libgcrypt updates.
Other larger rebuilds would apparently need lots of time to catch up
on Hydra, due to nontrivial rebuilds in other branches than staging.
2018-06-15 08:48:02 +02:00
Vladimír Čunát 606ff955fb Merge #41921: texlive: Fix 'match-parens' ruby dependency 2018-06-13 15:54:16 +02:00
Vladimír Čunát 448d7d648d Merge branch 'staging'
It's only half-rebuilt on Hydra, but it brings a security fix.
2018-06-03 13:52:13 +02:00
Vladimír Čunát 52fdec3c1d bison: drop non-applying patch on Darwin
The Darwin case seems newly fixed in the tarballs now.
Beware: the affected file is *not* in bison's git repo (gitignored),
but it is in tarballs and is used during build (yummy!)
2018-06-02 11:33:22 +02:00
Vladimír Čunát b7ba5dec0d Merge #40791: fix xf86-video-amdgpu 2018-05-20 18:11:17 +02:00
Vladimír Čunát b33e666b0a Merge #40796: pciutils: build with dns query support 2018-05-20 13:25:33 +02:00
Vladimír Čunát 392e6de7d0 Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Vladimír Čunát 24f61ca48e knot-dns: 2.6.6 -> 2.6.7
https://lists.nic.cz/pipermail/knot-dns-users/2018-May/001356.html
Some of the fixed bugs could be exploited to crash knot-resolver
if running in --verbose mode.
2018-05-17 17:06:33 +02:00
Vladimír Čunát 3b6486f857 xorg.xorgserver: drop makeWrapper
It's been unused since 65da25997d.
2018-05-13 21:19:02 +02:00
Vladimír Čunát 59beaf7fa2 python: 2.7.14 -> 2.7.15 (bugfix + security)
Fixes CVE-2018-1000030, /cc #38993.

The ncurses patch no longer applied, and it appears the problems have
been resolved upstream https://bugs.python.org/issue25720
https://github.com/python/cpython/commit/6ba0b583d67
2018-05-09 16:40:35 +02:00
Vladimír Čunát 89bed5b604 Merge #40007: mariadb: Fix mariadb_config include path 2018-05-05 18:48:04 +02:00
Vladimír Čunát 0c17b75210 Merge #39111: parity*: minor updates 2018-05-01 21:16:11 +02:00
Vladimír Čunát 88695c6e94 Revert "release-combined: don't include tests.chromium"
This reverts commit 1d06254998.
We now get a build and maybe have a workaround #39570; /cc #39476.
2018-04-27 02:42:12 +02:00
Vladimír Čunát 46ce1047b6 knot-dns: remove .out/lib/*.la
They're really useless here AFAIK. _Currently_ this doesn't
reduce the (transitive) closure at all, but perhaps in future...
2018-04-24 17:03:48 +02:00
Vladimír Čunát 7ea3c9e864 Merge #39383: maintainers-list.nix: change e-mail 2018-04-23 22:39:07 +02:00
Vladimír Čunát 2becf90c93 knot-resolver: 2.2.0 -> 2.3.0 (security)
Contains fixes for CVE-2018-1110.
2018-04-23 13:26:57 +02:00
Vladimír Čunát 17c4b83d05 Merge #31320: docs and glibc: explicit comments on outputs 2018-04-22 11:55:23 +02:00
Vladimír Čunát db071c4d1d Merge #38702: Mark packages as broken (ZHF) 2018-04-17 13:36:20 +02:00
Vladimír Čunát 39da015578 Merge #38846: knot-dns: 2.6.5 -> 2.6.6 2018-04-12 21:23:51 +02:00
Vladimír Čunát a308118d64 README: 17.09 -> 18.03 2018-04-04 09:48:35 +02:00
Vladimír Čunát 0bee079d97 18.03 release notes: final edits 2018-04-04 08:41:14 +02:00
Vladimír Čunát 75e4d3f2f0 nixos.tests.containers-imperative: fix impurity failure
I can't claim to fully understand this, but the change seems safe,
and it fixes the test on my machine.
2018-04-02 11:40:46 +02:00
Vladimír Čunát 333245e852 Merge #38133: dwb: remove abandoned package
cf. https://wiki.archlinux.org/index.php/dwb
2018-04-02 10:03:08 +02:00
Vladimír Čunát a48f50641c lmdb: patch-out hardcoded compiler 2018-04-01 11:09:48 +02:00
Vladimír Čunát 366ae3dfe0 knot-resolver: fix /bin/sh impurity
Manifestation in this case: ./scripts/embed-lua.sh: line 4: alias: not found
2018-04-01 10:53:18 +02:00
Vladimír Čunát 514e3e8a07 cups: fix patch download without a rebuild
One needs to specify git commit to make the fetch always work.
Close #38113.
2018-03-30 21:35:09 +02:00
Vladimír Čunát cb196f490e dhcpcd: fix /bin/sh impurity
The usual error during configuration:
syntax error: you disabled math support for $((arith)) syntax
2018-03-30 18:18:19 +02:00
Vladimír Čunát 902b3a161c Merge #37702: telepathy-gabble: fix source URL 2018-03-24 15:08:58 +01:00
Vladimír Čunát 7110d4a63b Merge #37262: snabb: 2016.04 -> 2018.01.2 2018-03-24 15:02:37 +01:00
Vladimír Čunát 6dbb6a380b poppler: fix evaluation, probably after merges 2018-03-24 14:56:15 +01:00
Vladimír Čunát 38d6699a93 Merge #37731: procps-ng: update project location 2018-03-24 14:50:49 +01:00
Vladimír Čunát 56fb68dcef Merge #37724:thunderbird*: 52.6.0 -> 52.7.0 (security) 2018-03-24 10:58:08 +01:00
Vladimír Čunát 940fab424a Merge #37335: wideland: fix build and .desktop 2018-03-18 23:46:22 +01:00
Vladimír Čunát 6550590521 projectlibre: meta fixes 2018-03-18 21:58:13 +01:00
Vladimír Čunát 214016c118 Merge #37264: archiveopteryx: fix build w/gcc7 2018-03-18 11:01:41 +01:00
Vladimír Čunát bbe8c1e593 tremor: rename according to our docs
https://nixos.org/nixpkgs/manual/#sec-package-naming
I forgot to include this commit in the parent merge.
2018-03-18 10:31:15 +01:00
Vladimír Čunát 65cf335715 Merge #37267: libvorbis, tremor: CVE-2018-5146 updates + SDL build impurity. 2018-03-18 10:23:17 +01:00
Vladimír Čunát 488ef9a7a0 SDL: avoid cryptic error from /bin/sh impurity 2018-03-18 10:17:57 +01:00
Vladimír Čunát c3aadd5b4e Merge #37059: liferea: 1.12.1 -> 1.12.2 (bugfix) 2018-03-17 13:54:46 +01:00
Vladimír Čunát 03cf538ef2 18.09: Jackrabbit -> Jellyfish
See eb0fa09232 and github discussion on that.
My misgiving about the t-shirts was refuted.
I don't think this flip may negatively affect anyone.
2018-03-16 12:26:03 +01:00
Vladimír Čunát ae9a49a77d grub2: pkgconfig to fix finding freetype 2018-03-16 03:16:46 +03:00
Vladimír Čunát 883b26b98f Merge #36788: nextcloud-client: restrict to linux 2018-03-14 15:50:38 +01:00
Vladimír Čunát 527ff9c5fd Merge #36936: libsemanage: fixup build with gcc7 2018-03-14 15:44:38 +01:00
Vladimír Čunát eb0fa09232 18.09: let's call it "Jackrabbit"
I was mainly considering Jellyfish and Jaguar (and Jackrabbit).
Originally I was inclined for Jellyfish, but then I thought of the
release T-shirts someone makes and it didn't seem suitable...
Jaguar would keep the name referring to a car as well, but as a
not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
2018-03-14 15:13:34 +01:00
Vladimír Čunát 8eca63588d Merge #36764: bip: fixup build with gcc7 2018-03-12 20:34:19 +01:00
Vladimír Čunát 1d968d180a Merge #36686: darling-dmg: fix build with gcc7 2018-03-12 20:29:16 +01:00
Vladimír Čunát 8a74c75e22 Merge #36626: libgroove: fix build 2018-03-12 20:18:13 +01:00
Vladimír Čunát b0b1de897f Merge #36807: fcgiwrap: avoid failure on warning 2018-03-12 20:10:25 +01:00
Vladimír Čunát 922d55aae8 Merge #36680: apvlv: fix build with gcc7 2018-03-09 20:53:46 +01:00
Vladimír Čunát 0ce2f04a04 Merge #36663: hexcurse: fix build with gcc7 2018-03-09 20:51:30 +01:00
Vladimír Čunát b441512ced Merge #36644: caffe2: fix compilation on gcc7 2018-03-09 20:48:58 +01:00
Vladimír Čunát 897cecfb13 Merge #36645: mps: fix build with gcc7 2018-03-09 20:37:33 +01:00
Vladimír Čunát d2d07a0bce Merge #36518: xtreemfs: build with boost165 2018-03-09 10:54:47 +01:00
Vladimír Čunát ffe2c4be02 Merge #36555: libreswan: fix build with gcc7 2018-03-09 10:50:32 +01:00
Vladimír Čunát eab479a5f0 nixos release: more evaluation fixes
... if missing x86 in supportedSystems
2018-03-07 17:29:02 +01:00
Vladimír Čunát e59b91bc9a nixos/release: fix evaluation if missing x86
... in supportedSystems
2018-03-07 16:06:30 +01:00
Vladimír Čunát 7e968a47cd 18.03 -> 18.09
I don't have a name ready :-(  so I have to fill it later.
2018-03-05 19:47:39 +01:00
Vladimír Čunát 71f899c2c3 Merge #34461: mesa -> libGL* rename
This will just bit rot otherwise.  Almost nothing gets rebuilt.
2018-03-05 14:59:40 +01:00
Vladimír Čunát 04c31a5de1 libGL rename: fallout after a week on master
and a few nitpicks.
2018-03-05 14:53:38 +01:00
Vladimír Čunát 565bd805e6 Merge branch 'master' 2018-03-05 14:53:27 +01:00
Vladimír Čunát a373fe8322 makeInitrd: explain why we don't use closureInfo
/cc #36268.
2018-03-05 13:04:55 +01:00
Vladimír Čunát 498374a8bd Merge #35554: nixos/opengl: unhide and document 2018-03-04 17:33:01 +01:00
Vladimír Čunát 2069a2a002 Merge #35454: nixos/pump.io: remove 2018-03-04 10:49:25 +01:00
Vladimír Čunát a2b8d8fbe2 nixos/pump.io: also comment-out the uid 2018-03-04 10:48:29 +01:00
Vladimír Čunát d586f5d97e Merge branch 'nix-2.0' 2018-03-03 18:10:45 +01:00