Update from upstream repo nixOS/nixpkgs@master#7
Merged
eadwu merged 51 commits intoeadwu:masterfrom Jun 19, 2018
Merged
Conversation
This decreases complexity and ensures setup dependencies are properly specified with `setup-depends` as they should be. Testing will say if this is a reasonable change.
asc-key-to-qr-code-gif: init at 20180613
the full tessdata is nearly a GB, so sparing a copy each time we need to rebuild tesseract without updating tessdata is worth it.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/c-blosc/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.14.3 with grep in /nix/store/b83mqicbd21q8wm22qgp4jzm7cg90avw-c-blosc-1.14.3 - directory tree listing: https://gist.github.com/05bbb5f5c067b769556ba71848514220 - du listing: https://gist.github.com/cc182424092e94e9dd611e5300b7ac68
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/balsa/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/balsa had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/balsa-ab had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/.balsa-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/.balsa-ab-wrapped had a zero exit code or showed the expected version - 0 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 2.5.6 with grep in /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6 - directory tree listing: https://gist.github.com/8c38ffd6950508c78fde54f6f3530673 - du listing: https://gist.github.com/2156c87e8b84b7a84f6d6f4c4a7b8ebb
This uses strictDeps to get our args passed to the linker low enough to enable building inkscape. With strictDeps we need to correctly use nativeBuildInputs to avoid an issue.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xonsh/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/xon.sh had a zero exit code or showed the expected version - /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/.xonsh-wrapped passed the binary check. - /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/xonsh passed the binary check. - 2 of 3 passed binary check by having a zero exit code. - 2 of 3 passed binary check by having the new version present in output. - found 0.6.7 with grep in /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7 - directory tree listing: https://gist.github.com/1d8694bad62c300714d6658deedc7ec0 - du listing: https://gist.github.com/2d8baff97fce82b5ba4ded4746d954a0
Also fix such obsolete flags: * `use_gconf` was already known to become obsolete with Chromium 65 * `enable_hotwording` has been removed in upstream commit d693f0c7ab
range-v3: 0.3.5 -> 0.3.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zerotierone/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-idtool had a zero exit code or showed the expected version - /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-cli passed the binary check. - /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-one passed the binary check. - 2 of 3 passed binary check by having a zero exit code. - 2 of 3 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/87164b4a118f54881debe8986fa9d125 - du listing: https://gist.github.com/d1842159ba2f6272856b4451d5860bf7
dmraid: fix w/musl (missing includes, -D_GNU_SOURCE)
…eparately haskell generic-builder: Always use separate pkg db for custom setup
zerotierone: 1.2.8 -> 1.2.10
xonsh: 0.6.6 -> 0.6.7
haskell: fix with-packages-wrapper in ghcjs
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vips/versions. These checks were done: - built on NixOS - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips passed the binary check. - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsedit passed the binary check. - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsthumbnail passed the binary check. - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsheader passed the binary check. - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/light_correct had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/shrink_width had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_image_convert had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_rubber_sheet had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_crop had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsprofile had a zero exit code or showed the expected version - /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips-8.6 passed the binary check. - 5 of 11 passed binary check by having a zero exit code. - 0 of 11 passed binary check by having the new version present in output. - found 8.6.4 with grep in /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4 - directory tree listing: https://gist.github.com/3d47ce9f75e2a1d701b3089ffa679618 - du listing: https://gist.github.com/b6aa67c89ec9bb55f45e21ae98e82fdc
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uptimed/versions. These checks were done: - built on NixOS - /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1/bin/uprecords passed the binary check. - /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1/bin/uptimed passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.4.1 with grep in /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1 - directory tree listing: https://gist.github.com/e0050389ab1f978da6cea6fdba7a6c1b - du listing: https://gist.github.com/8ad3f0b88db5b50f78bfff19c91cee6b
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/redis/versions. These checks were done: - built on NixOS - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-sentinel passed the binary check. - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-server passed the binary check. - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-benchmark passed the binary check. - /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-cli passed the binary check. - Warning: no invocation of /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-check-rdb had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-check-aof had a zero exit code or showed the expected version - 4 of 6 passed binary check by having a zero exit code. - 1 of 6 passed binary check by having the new version present in output. - found 4.0.10 with grep in /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10 - directory tree listing: https://gist.github.com/a3e7b3964e29e1b8f0cfe9feca21635a - du listing: https://gist.github.com/be5306dea5e04998bf4b962ab9c0de8d
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riot-web/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.15.5 with grep in /nix/store/p5phic74phlnz8zyrfdvkq6qyacbjfdh-riot-web-0.15.5 - directory tree listing: https://gist.github.com/2dfaa31736d9687934c557f92066d007 - du listing: https://gist.github.com/f769d44c305628e76a52b8d63351b060
redis: 4.0.9 -> 4.0.10
vips: 8.6.3 -> 8.6.4
docs: minor rewording for easier reading.
chromium: Abort build on gn warnings. Fixes #42189.
snes9x-gtk: Install normally
riot-web: 0.15.4 -> 0.15.5
uptimed: 0.4.0 -> 0.4.1
tectonic: 0.1.7 -> 0.1.8
Grub: default is signed int. Fixes #42152
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pkcs11-helper/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.24 with grep in /nix/store/vi1vlsjsmz56rdrk2zyga4jbvh5cqfcd-pkcs11-helper-1.24 - directory tree listing: https://gist.github.com/fa82ab8b06f566b9c980c0d49e7a4800 - du listing: https://gist.github.com/d8cd7f6fba6e45564b5a6cb4c6048428
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/offlineimap/versions. These checks were done: - built on NixOS - /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1/bin/.offlineimap-wrapped passed the binary check. - /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1/bin/offlineimap passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 7.2.1 with grep in /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1 - directory tree listing: https://gist.github.com/db353c3cafac9aac9a95c6c5e39c8d32 - du listing: https://gist.github.com/87553df2ee20c8d6f60e17381d46f676
pkcs11helper: 1.23 -> 1.24
offlineimap: 7.2.0 -> 7.2.1
nix-pin: 0.3.1 -> 0.3.4
mgba: Add desktop file
lf: available on the other UNIX-like platforms
eadwu
pushed a commit
that referenced
this pull request
Aug 4, 2023
Pull in _FORTIFY_SOURCE=3 stack smashing fix. Without the change on
current `master` `rtorrent` crashes at start as:
*** buffer overflow detected ***: terminated
__pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44
44 pthread_kill.c: No such file or directory.
(gdb) bt
#0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44
#1 0x00007ffff7880af3 in __pthread_kill_internal (signo=6, threadid=<optimized out>) at pthread_kill.c:78
#2 0x00007ffff7831c86 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26
#3 0x00007ffff781b8ba in __GI_abort () at abort.c:79
#4 0x00007ffff781c5f5 in __libc_message (fmt=fmt@entry=0x7ffff7992540 "*** %s ***: terminated\n") at ../sysdeps/posix/libc_fatal.c:150
#5 0x00007ffff7910679 in __GI___fortify_fail (msg=msg@entry=0x7ffff79924e6 "buffer overflow detected") at fortify_fail.c:24
#6 0x00007ffff790eea4 in __GI___chk_fail () at chk_fail.c:28
#7 0x00007ffff790ea85 in ___snprintf_chk (s=<optimized out>, maxlen=<optimized out>, flag=<optimized out>, slen=<optimized out>, format=<optimized out>) at snprintf_chk.c:29
#8 0x0000000000472acf in utils::Lockfile::try_lock() ()
#9 0x000000000044b524 in core::DownloadStore::enable(bool) ()
#10 0x00000000004b1f7b in Control::initialize() ()
#11 0x000000000043000b in main ()
eadwu
pushed a commit
that referenced
this pull request
Nov 2, 2023
Without the change `zsnesn` startup crashes with:
$ gdb zsnes
*** buffer overflow detected ***: terminated
...
#7 0x08057c14 in memset (__len=2, __ch=255, __dest=<optimized out>) at
...-glibc-2.38-23-dev/include/bits/string_fortified.h:59
eadwu
pushed a commit
that referenced
this pull request
Feb 29, 2024
Without the change `unnethack` startup crashes as:
(gdb) bt
#0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44
#1 0x00007f734250c0e3 in __pthread_kill_internal (signo=6, threadid=<optimized out>) at pthread_kill.c:78
#2 0x00007f73424bce06 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26
#3 0x00007f73424a58f5 in __GI_abort () at abort.c:79
#4 0x00007f73424a67a1 in __libc_message (fmt=fmt@entry=0x7f734261e2f8 "*** %s ***: terminated\n") at ../sysdeps/posix/libc_fatal.c:150
#5 0x00007f734259b1d9 in __GI___fortify_fail (msg=msg@entry=0x7f734261e2df "buffer overflow detected") at fortify_fail.c:24
#6 0x00007f734259ab94 in __GI___chk_fail () at chk_fail.c:28
#7 0x00000000005b2ac5 in strcpy (__src=0x7ffe68838b00 "Shall I pick a character's race, role, gender and alignment for you? [YNTQ] (y)",
__dest=0x7ffe68838990 "\001") at /nix/store/B0S2LKF593R3585038WS4JD3LYLF2WDX-glibc-2.38-44-dev/include/bits/string_fortified.h:79
#8 curses_break_str (str=str@entry=0x7ffe68838b00 "Shall I pick a character's race, role, gender and alignment for you? [YNTQ] (y)", width=width@entry=163,
line_num=line_num@entry=1) at ../win/curses/cursmisc.c:275
#9 0x00000000005b3f51 in curses_character_input_dialog (prompt=prompt@entry=0x7ffe68838cf0 "Shall I pick a character's race, role, gender and alignment for you?",
choices=choices@entry=0x7ffe68838d70 "YNTQ", def=def@entry=121) at ../win/curses/cursdial.c:211
#10 0x00000000005b9ca0 in curses_choose_character () at ../win/curses/cursinit.c:556
#11 0x0000000000404eb1 in main (argc=<optimized out>, argv=<optimized out>) at ./../sys/unix/unixmain.c:309
which corresponds to `gcc` warning:
../win/curses/cursmisc.c: In function 'curses_break_str':
../win/curses/cursmisc.c:275:5: warning: '__builtin___strcpy_chk' writing one too many bytes into a region of a size that depends on 'strlen' [-Wstringop-overflow=]
275 | strcpy(substr, str);
| ^
I did not find a single small upstream change that fixes it. Let's
disable `fortify3` until next release.
Closes: NixOS#292113
eadwu
pushed a commit
that referenced
this pull request
Aug 14, 2024
This adds some extremely helpful and popular encoders in by default: * openjpeg * celt * libwebp * libaom On the `master` branch, closure size for ffmpeg-headless went up 18.5 MiB. ``` $ nix store diff-closures nixpkgs#ffmpeg-headless^bin .#ffmpeg-headless^bin celt: ∅ → 0.11.3, +168.4 KiB ffmpeg-headless: +70.0 KiB giflib: ∅ → 5.2.2, +398.7 KiB lcms2: ∅ → 2.16, +466.2 KiB lerc: ∅ → 4.0.0, +840.2 KiB libaom: ∅ → 3.9.0, +8047.8 KiB libdeflate: ∅ → 1.20, +427.0 KiB libtiff: ∅ → 4.6.0, +655.9 KiB libvmaf: ∅ → 3.0.0, +2665.0 KiB libwebp: ∅ → 1.4.0, +2559.7 KiB openjpeg: ∅ → 2.5.2, +1525.1 KiB zstd: ∅ → 1.5.6, +1158.0 KiB $ nvd diff $(nix build nixpkgs#ffmpeg-headless^bin --print-out-paths --no-link) $(nix build .#ffmpeg-headless^bin --print-out-paths --no-link) <<< /nix/store/4n60lnj3zkjpasd4c56bzhpx2m8lc1sx-ffmpeg-headless-6.1.1-bin >>> /nix/store/884f487w5hac6rs94jq6hq5zqkxdv666-ffmpeg-headless-6.1.1-bin Added packages: [A.] #1 celt 0.11.3 [A.] #2 giflib 5.2.2 [A.] #3 lcms2 2.16 [A.] #4 lerc 4.0.0 [A.] #5 libaom 3.9.0 [A.] #6 libdeflate 1.20 [A.] #7 libtiff 4.6.0 [A.] #8 libvmaf 3.0.0 [A.] #9 libwebp 1.4.0 x2 [A.] #10 openjpeg 2.5.2 [A.] #11 zstd 1.5.6 Closure size: 66 -> 78 (15 paths added, 3 paths removed, delta +12, disk usage +18.5MiB). ```
eadwu
pushed a commit
that referenced
this pull request
Aug 25, 2024
Strongly inspired by the forgejo counterpart[1], for the following
reasons:
* The feature is broken with the current module and crashes on
authentication with the following stacktrace (with a PAM service
`gitea` added):
server # Stack trace of thread 1008:
server # #0 0x00007f3116917dfb __nptl_setxid (libc.so.6 + 0x8ddfb)
server # #1 0x00007f3116980ae6 setuid (libc.so.6 + 0xf6ae6)
server # #2 0x00007f30cc80f420 _unix_run_helper_binary (pam_unix.so + 0x5420)
server # #3 0x00007f30cc8108c9 _unix_verify_password (pam_unix.so + 0x68c9)
server # #4 0x00007f30cc80e1b5 pam_sm_authenticate (pam_unix.so + 0x41b5)
server # #5 0x00007f3116a84e5b _pam_dispatch (libpam.so.0 + 0x3e5b)
server # #6 0x00007f3116a846a3 pam_authenticate (libpam.so.0 + 0x36a3)
server # #7 0x00000000029b1e7a n/a (.gitea-wrapped + 0x25b1e7a)
server # #8 0x000000000047c7e4 n/a (.gitea-wrapped + 0x7c7e4)
server # ELF object binary architecture: AMD x86-64
server #
server # [ 42.420827] gitea[897]: pam_unix(gitea:auth): unix_chkpwd abnormal exit: 159
server # [ 42.423142] gitea[897]: pam_unix(gitea:auth): authentication failure; logname= uid=998 euid=998 tty= ruser= rhost= user=snenskek
It only worked after turning off multiple sandbox settings and adding
`shadow` as supplementary group to `gitea.service`.
I'm not willing to maintain additional multiple sandbox settings for
different features, especially given that it was probably not used for
quite a long time:
* There was no PR or bugreport about sandboxing issues related to
PAM.
* Ever since the module exists, it used the user `gitea`, i.e. it had
never read-access to `/etc/shadow`.
* Upstream has it disabled by default[2].
If somebody really needs it, it can still be brought back by an overlay
updating `tags` accordingly and modifying the systemd service config.
[1] 07641a9
[2] https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module
eadwu
pushed a commit
that referenced
this pull request
Apr 3, 2025
fluent-bit 3.2.7, 3.2.8 and 3.2.9 are segfaulting when used in combination with the systemd input. Lets revert to 3.2.6 for now. Upstream bug: fluent/fluent-bit#10139 Note that fluent-bit-3.2.7 fixes two high CVEs which we are now reintroducing. However they are only exploitable if you are using the OpenTelemetry input or the Prometheus Remote Write input. OpenTelemetry input: [CVE-2024-50609](https://nvd.nist.gov/vuln/detail/CVE-2024-50609) Prometheus Remote Write input: [CVE-2024-50608](https://nvd.nist.gov/vuln/detail/CVE-2024-50608) The problem is as follows: 3.2.7 started vendoring a copy of `libzstd` in tree and statically linking against it. Also, the fluent-bit binary exports the symbols of static libraries it links against. This is a problem because `libzstd` gets `dlopen()`ed by `libsystemd` when enumerating the journal (as journal logs are zstd compressed). and `libzstd` in Nixpkgs is built with `-DZSTD_LEGACY_SUPPORT=0` which causes `struct ZSTD_DCtx` to be 16 bytes smaller than without this flag https://github.com/facebook/zstd/blob/dev/lib/decompress/zstd_decompress_internal.h#L183-L187 `libsystemd` calls [`sym_ZSTD_createDCtx()`](https://github.com/systemd/systemd/blob/1e79a2923364b65fc9f347884dd5b9b2087f6e32/src/basic/compress.c#L480) which calls the function pointer returned by `dlsym()` which is calling into the `libzstd` that comes with `nixpkgs` and thus allocates a struct that is 16 bytes smaller. Later then `sym_ZSTD_freeDCtx()` is called. However because fluent-bit has `zstd` in its global symbol table, any functions that `sym_ZSTD_freeDCtx()` calls will be calls to the functions in the vendored fluent-bit version of the library which expects the larger struct. This then causes enough heap corruption to cause a segfault. E.g. the subsequent calls to `ZSTD_clearDict(dctx)` and `ZSTD_customFree(dctx->inBuff)` in https://github.com/facebook/zstd/blob/dev/lib/decompress/zstd_decompress.c#L324 will be working on a struct that is 16 bytes smaller than the one that was allocated by `libsystemd` and will cause a segfault at some point and thus are probably modifying pieces of memory that they shouldn't (gdb) bt #0 0x00007f10e7e9916c in __pthread_kill_implementation () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #1 0x00007f10e7e40e86 in raise () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #2 0x00007f10e7e2893a in abort () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #3 0x000000000046a938 in flb_signal_handler () #4 <signal handler called> #5 0x00007f10e7ea42b7 in unlink_chunk.isra () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #6 0x00007f10e7ea45cd in _int_free_create_chunk () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #7 0x00007f10e7ea5a1c in _int_free_merge_chunk () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #8 0x00007f10e7ea5dc9 in _int_free () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #9 0x00007f10e7ea8613 in free () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 #10 0x00007f10e80ad3b5 in ZSTD_freeDCtx () from /nix/store/wy0slah6yvchgra8nhp6vgrqa6ay72cq-zstd-1.5.6/lib/libzstd.so.1 #11 0x00007f10e8c90f6b in decompress_blob_zstd () from /nix/store/b2cfj7yk3wfg1jdwjzim7306hvsc5gnl-systemd-257.3/lib/libsystemd.so.0 #12 0x00007f10e8bf0efe in journal_file_data_payload () from /nix/store/b2cfj7yk3wfg1jdwjzim7306hvsc5gnl-systemd-257.3/lib/libsystemd.so.0 #13 0x00007f10e8c00f74 in sd_journal_enumerate_data () from /nix/store/b2cfj7yk3wfg1jdwjzim7306hvsc5gnl-systemd-257.3/lib/libsystemd.so.0 #14 0x00000000004eae2f in in_systemd_collect () #15 0x00000000004eb5a0 in in_systemd_collect_archive () #16 0x000000000047aa18 in flb_input_collector_fd () #17 0x0000000000495223 in flb_engine_start () NixOS#18 0x000000000046f304 in flb_lib_worker () NixOS#19 0x00007f10e7e972e3 in start_thread () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 NixOS#20 0x00007f10e7f1b2fc in __clone3 () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6 Reverts 7310ab3 Reverts 4fbc6cf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hello!
The upstream repository
nixOS/nixpkgs@masterhas some new changes that aren't in this fork. So, here they are, ready to be merged! 🎉If this pull request can be merged without conflict, you can publish your software with these new changes. Otherwise, fix any merge conflicts by clicking the
Resolve Conflictsbutton.If you like Backstroke, consider donating to help us pay for infrastructure here. Backstroke is a completely open source project that's free to use, but we survive on sponsorships and donations. Thanks for your support! Help out Backstroke.
Created by Backstroke (I'm a bot!)