Update from upstream repo nixOS/nixpkgs@master#13
Merged
eadwu merged 62 commits intoeadwu:masterfrom Jun 22, 2018
Merged
Conversation
for example:
services.dockerRegistry = {
enable = true;
extraConfig = {
http = {
host = "https://${config.networking.hostName}:5000";
tls = {
certificate = "${registry-tls}/snakeoil.pem";
key = "${registry-tls}/snakeoil.key";
};
};
};
};
A tool for performing one-way active measurements. https://github.com/perfsonar/owamp This is the reference implementation for the IETF rfc https://tools.ietf.org/html/rfc4656
You can retrieve the one way latency between your client and the remote host via owping.
Used by flent
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libpfm/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. - directory tree listing: https://gist.github.com/18a96cac8552cdaa20b1dc95f0a5dd0d - du listing: https://gist.github.com/b27b79dfd650b016fa859607d16859d9
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsixel/versions. These checks were done: - built on NixOS - /nix/store/ik92zw2fv4xpgnyrqj7aqyck2zzvxva5-libsixel-1.8.1/bin/img2sixel passed the binary check. - /nix/store/ik92zw2fv4xpgnyrqj7aqyck2zzvxva5-libsixel-1.8.1/bin/sixel2png passed the binary check. - /nix/store/ik92zw2fv4xpgnyrqj7aqyck2zzvxva5-libsixel-1.8.1/bin/libsixel-config passed the binary check. - 3 of 3 passed binary check by having a zero exit code. - 1 of 3 passed binary check by having the new version present in output. - found 1.8.1 with grep in /nix/store/ik92zw2fv4xpgnyrqj7aqyck2zzvxva5-libsixel-1.8.1 - directory tree listing: https://gist.github.com/12d77ba43524f986a70f71b8e6f1714e - du listing: https://gist.github.com/9642634786b1c4b8f9c5396f7d8c02cd
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/marco/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/marco-message had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/marco-window-demo had a zero exit code or showed the expected version - /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/marco passed the binary check. - Warning: no invocation of /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/marco-theme-viewer had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/.marco-message-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/.marco-window-demo-wrapped had a zero exit code or showed the expected version - /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/.marco-wrapped passed the binary check. - Warning: no invocation of /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2/bin/.marco-theme-viewer-wrapped had a zero exit code or showed the expected version - 2 of 8 passed binary check by having a zero exit code. - 0 of 8 passed binary check by having the new version present in output. - found 1.20.2 with grep in /nix/store/3d7i93si0k0hw4rnizj1wbfxc05p0rib-marco-1.20.2 - directory tree listing: https://gist.github.com/5f84e537102f55b7305fa05523d6ae45 - du listing: https://gist.github.com/0c776c9cc3cd0b81c377dca02c0ce516
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-media/versions. These checks were done: - built on NixOS - /nix/store/gwzsp1glki73nq66abq5z1znh1lil0x6-mate-media-1.20.1/bin/mate-volume-control-applet passed the binary check. - /nix/store/gwzsp1glki73nq66abq5z1znh1lil0x6-mate-media-1.20.1/bin/mate-volume-control passed the binary check. - /nix/store/gwzsp1glki73nq66abq5z1znh1lil0x6-mate-media-1.20.1/bin/.mate-volume-control-applet-wrapped passed the binary check. - /nix/store/gwzsp1glki73nq66abq5z1znh1lil0x6-mate-media-1.20.1/bin/.mate-volume-control-wrapped passed the binary check. - 4 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 1.20.1 with grep in /nix/store/gwzsp1glki73nq66abq5z1znh1lil0x6-mate-media-1.20.1 - directory tree listing: https://gist.github.com/300945f471b2583b1ee1a6c1c4549e55 - du listing: https://gist.github.com/6c5caabcd4ffedd883ecbedc924fcebf
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-power-manager/versions. These checks were done: - built on NixOS - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/mate-power-manager passed the binary check. - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/mate-power-preferences passed the binary check. - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/mate-power-statistics passed the binary check. - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/.mate-power-manager-wrapped passed the binary check. - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/.mate-power-preferences-wrapped passed the binary check. - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/.mate-power-statistics-wrapped passed the binary check. - /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2/bin/mate-power-backlight-helper passed the binary check. - 7 of 7 passed binary check by having a zero exit code. - 2 of 7 passed binary check by having the new version present in output. - found 1.20.2 with grep in /nix/store/8hng11y2bqq66g844xwpfa0a977wn10p-mate-power-manager-1.20.2 - directory tree listing: https://gist.github.com/f8d3fda03f4b6da87bde96d8dd1e974e - du listing: https://gist.github.com/8b7bb5497d6d6ab20df5efb10ba50b19
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-polkit/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.20.1 with grep in /nix/store/6jg3p5hdy44ijwbbzdjy7vjm6dzbkp6a-mate-polkit-1.20.1 - directory tree listing: https://gist.github.com/01e5b02d44da8912f9242d3772fcd447 - du listing: https://gist.github.com/8d2779ce364c45ecdae0c047392431e8
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gsl/versions. These checks were done: - built on NixOS - /nix/store/cams8w74kvh5b7bx2jykap5yh469qzap-gsl-2.5/bin/gsl-randist passed the binary check. - /nix/store/cams8w74kvh5b7bx2jykap5yh469qzap-gsl-2.5/bin/gsl-histogram passed the binary check. - /nix/store/cams8w74kvh5b7bx2jykap5yh469qzap-gsl-2.5/bin/gsl-config passed the binary check. - 3 of 3 passed binary check by having a zero exit code. - 1 of 3 passed binary check by having the new version present in output. - found 2.5 with grep in /nix/store/cams8w74kvh5b7bx2jykap5yh469qzap-gsl-2.5 - directory tree listing: https://gist.github.com/70df8117b02b4102425b4cd0219498cb - du listing: https://gist.github.com/67a7925931ba8738deb32c46fbf5d919
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwup/versions. These checks were done: - built on NixOS - /nix/store/3s224sym5k1x127cdw3325viz8ra5ayk-fwup-1.2.1/bin/fwup passed the binary check. - Warning: no invocation of /nix/store/3s224sym5k1x127cdw3325viz8ra5ayk-fwup-1.2.1/bin/img2fwup had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 1 of 2 passed binary check by having the new version present in output. - found 1.2.1 with grep in /nix/store/3s224sym5k1x127cdw3325viz8ra5ayk-fwup-1.2.1 - directory tree listing: https://gist.github.com/1a05338ae9e6c25b9b4629c585534efa - du listing: https://gist.github.com/aa6a7bc6b62cc7b0c47ce36dc0173a5f
enableShared in generic-builder.nix should default to what the GHC compiler was compiled with. Add a passthru to all of the GHC compilers to hold the value of enableShared. If enableShared is not set in the GHC we just use false as the default value for enableSharedLibraries. Note: I may have missed some compilers. Only GHC & GHCJS are covered by this commit but this shouldn’t break evaluation of anything else.
[RDY] Owamp : Get one way (network) latencies between synchronized computers
Small improvements to the docker registry module
leetcode-cli: init at 2.5.2
gams: move optgams and gamslice to $out/share/gams
The triple is needed for armv7a-android-prebuilt to work (partly) with GHC. - also set EXTRA_CC_OPTS for ghc8.2
libsixel: 1.7.3 -> 1.8.1
mate.mate-media: 1.20.0 -> 1.20.1
mate.marco: 1.20.1 -> 1.20.2
I no longer use rancher and can test this derivation. Also rancher-compose should have the same version as the rancher cluster used. So it is better to be build by the user using it rather having a random version in nixpkgs.
fwup: 1.1.0 -> 1.2.1
The custom theme just sets the old background colour that OCR works again.
gsl: 2.4 -> 2.5
rancher-compose: remove
nodejs: 10.4.1 -> 10.5.0
This is the newest sdk. I have skipped 9.3 for now but someone can certainly add it if they need it for some reason. Also I added a generic "xcode" that will always point to the newest xcode that is available in Nixpkgs.
This is easier than having to remember which SDKs are supported, etc. Stuff based on this can become more future-proof.
add erlang-21.0
init androidenv.buildGradleApp
…defaults haskell: make generic builder follow compiler’s shared config
tests.plasma5: Fixes OCR in sddm by providing a custom theme
gitAndTools.hub: remove go compiler from runtime closure
This file pulls in some big dependencies that are unneeded (like clang).
[RFC/RDY] flent: add manpage + init http-getter
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!)