about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-15
|\
| * Merge #253854: staging-next 2023-09-07Vladimír Čunát2023-09-14
| |\
| | * Merge master into staging-nextgithub-actions[bot]2023-09-14
| | |\
| | * \ Merge master into staging-nextgithub-actions[bot]2023-09-13
| | |\ \
| | * \ \ Merge master into staging-nextgithub-actions[bot]2023-09-13
| | |\ \ \
| | * | | | python3Packages.rapidfuzz: fetch from git tag againVladimír Čunát2023-09-13
| | | | | | | | | | | | | | | | | | | | | | | | Upstream added the tag now.
| | * | | | python3Packages.rapidfuzz: 3.2.0 -> 3.3.0Vladimír Čunát2023-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to build after .cython update from PR #252051 https://hydra.nixos.org/build/234484085/nixlog/2/tail
| | * | | | Merge branch 'master' into staging-nextJan Tojnar2023-09-13
| | |\ \ \ \
| | * | | | | ncrack: fixup build after zlib updateVladimír Čunát2023-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://hydra.nixos.org/build/234658054/nixlog/2/tail
| | * | | | | Merge master into staging-nextgithub-actions[bot]2023-09-12
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2023-09-12
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #254775 from delroth/CVE-2023-4863Martin Weinelt2023-09-12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | libwebp: cherry-pick suspected upstream fix for CVE-2023-4863
| | | * | | | | | | libwebp: cherry-pick suspected upstream fix for CVE-2023-4863Pierre Bourdon2023-09-12
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CVE is critical severity and has been exploited in the wild. It was reported as being a Chromium vulnerability, but it seems to in fact impact libwebp (and thus all its downstream users). There is however no official confirmation of this yet. The upstream fix patch (webmproject/libwebp@902bc919) does not cleanly apply onto 1.3.1, so we vendor a very slightly modified version which does cleanly apply. This is my original work, so YMMV on whether you trust it or not, reviews very much welcomed :-)
| | * | | | | | | Merge master into staging-nextgithub-actions[bot]2023-09-12
| | |\ \ \ \ \ \ \
| | * | | | | | | | aardvark-dns: fix test instead of skipping itVladimír Čunát2023-09-12
| | | | | | | | | |
| | * | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-09-12
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextAnderson Torres2023-09-11
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | iproute2: fix cross regression from 620f9f11f83de7fa68b346ff80adfc9914c50ce6Artturin2023-09-12
| | | | | | | | | | | |
| | * | | | | | | | | | Merge #252900: luajit_2_*: updateVladimír Čunát2023-09-11
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...into staging-next
| | | * | | | | | | | | | luajit: add optional arg enableRegisterAllocationRandomizationLuka Blaskovic2023-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/LuaJIT/LuaJIT/issues/1062#issuecomment-1698272269
| | | * | | | | | | | | | luajit_2_0: 2.0.5-2022-09-13 -> 2.0.1693340858Luka Blaskovic2023-09-04
| | | | | | | | | | | | |
| | | * | | | | | | | | | luajit_2_1: 2.1.0-2022-10-04 -> 2.1.1693350652Luka Blaskovic2023-09-04
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-09-10
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'nixos/master' into HEADYureka2023-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #254182: merge waf changesVladimír Čunát2023-09-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...into staging-next This is a topologically earlier remerge of PR #252874
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'waf-cross' of https://github.com/atorres1985-contrib/nixpkgs ↵Yureka2023-09-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into HEAD
| | | | * | | | | | | | | | | | | | | | | doc/hooks/waf.section.md: updateAnderson Torres2023-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reword and reorganize sections
| | | | * | | | | | | | | | | | | | | | | waf: prefix all setup-hook variables with `waf`Anderson Torres2023-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardizing the behaviour of commit a79a8f29bc509b2d51158846c9562e64e1239b4c.
| | | | * | | | | | | | | | | | | | | | | treewide: convert configureFlags to wafConfigureFlags when appropriateAnderson Torres2023-09-06
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | waf: use wafConfigureFlags instead of configureFlags in setup-hook.shAnderson Torres2023-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As shown in https://github.com/NixOS/nixpkgs/commit/a79a8f29bc509b2d51158846c9562e64e1239b4c, tha variable can be overriden by other functions, especially those related to cross or static compilation.
| | | | * | | | | | | | | | | | | | | | | treewide: waf.hook -> wafHookAnderson Torres2023-09-06
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | wafHook: resurrect aliasAnderson Torres2023-09-06
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-09-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-09-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2023-09-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'staging' into staging-nextVladimír Čunát2023-09-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #249924: util-linux: 2.39.1 -> 2.39.2Vladimír Čunát2023-09-07
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...into staging
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | util-linux: 2.39.1 -> 2.39.2Sergei Trofimovich2023-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it added trivial updater. Changes: https://github.com/util-linux/util-linux/compare/v2.39.1...v2.39.2
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge #251415: libinput: 1.23.0 -> 1.24.0Vladimír Čunát2023-09-07
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...into staging
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | libinput: 1.23.0 -> 1.24.0Bjørn Forsman2023-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge #250504: gzip: 1.12 -> 1.13Vladimír Čunát2023-09-07
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...into staging
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-10 02:35:07 +0000