jiebi/CodeConvo huggingface dataset:
sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; <ins> nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; </ins> propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy27) [ futures ]; <ins> preBuild = optionalString stdenv.isDarwin "unset AR"; </ins> meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = lib.licenses.asl20;
in rustPlatform.buildRustPackage rec { pname = "rio"; <del> version = "0.1.8"; </del> <ins> version = "0.1.10"; </ins> src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "refs/tags/v${version}"; <del> hash = "sha256-NLvCLyIts3NoSqbR9PIhXj3GCeURrBXXv/zVgZecfNQ="; </del> <ins> hash = "sha256-S42is3wqjBvYgysQ6yDUAn7ZEy9xJBmQD/emYAQfCkw="; </ins> }; <del> cargoHash = "sha256-TvNmTI3At2ezsdEOd5mAc6uUQXgGP47d0AMVVUUJr/A="; </del> <ins> cargoHash = "sha256-ILX3xrcz3tMnl7mUrwUAXv9ffaZKjSoSf8cZVQB10zk="; </ins> nativeBuildInputs = [ ncurses
<del> { lib , buildPythonApplication , fetchPypi , ffmpeg , ffmpeg-progress-yield }: buildPythonApplication rec { pname = "ffmpeg-normalize"; version = "1.26.1"; src = fetchPypi { inherit pname version; hash = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; checkPhase = '' $out/bin/ffmpeg-normalize --help > /dev/null ''; meta = with lib; { description = "Normalize audio via ffmpeg"; homepage = "https://github.com/slhck/ffmpeg-normalize"; license = with licenses; [ mit ]; maintainers = with maintainers; [ prusnak ]; mainProgram = "ffmpeg-normalize"; }; } </del>
<ins> { lib, python3Packages, fetchPypi, ffmpeg, }: python3Packages.buildPythonApplication rec { pname = "ffmpeg-normalize"; version = "1.28.3"; src = fetchPypi { inherit pname version; hash = "sha256-8wNPuVRQRQpFK6opgwqdKYMYmAFRqq8p/T5V9kC8QaY="; }; propagatedBuildInputs = [ ffmpeg python3Packages.ffmpeg-progress-yield ]; dependencies = with python3Packages; [ colorlog ]; checkPhase = '' $out/bin/ffmpeg-normalize --help > /dev/null ''; meta = { description = "Normalize audio via ffmpeg"; homepage = "https://github.com/slhck/ffmpeg-normalize"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luftmensch-luftmensch prusnak ]; mainProgram = "ffmpeg-normalize"; }; } </ins>
owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; <del> hash = "sha256-nKzMHVMaoDu/d1wMAxA2q8DHdwoIb7+YG/7AhAtRVEM="; </del> <ins> hash = "sha256-DrhjmVHCX1lXJUrklVgO/eguL1uRQ33kJjSgCAEIyew="; </ins> }; pythonRelaxDeps = [
meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; <ins> syntax-tree-surfer = buildVimPlugin { pname = "syntax-tree-surfer"; version = "2023-10-06"; src = fetchFromGitHub { owner = "ziontee113"; repo = "syntax-tree-surfer"; rev = "732ea6d0f868bcccd2f526be73afa46997d5a2fb"; sha256 = "0x7kpmxq3n8531ca2bz506swww92wd3x16d125wrk54rxp1lv1cd"; }; meta.homepage = "https://github.com/ziontee113/syntax-tree-surfer/"; }; </ins> tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; version = "2024-07-31";
}; }; <ins> syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; meta.maintainers = with lib.maintainers; [ callumio ]; }; </ins> taskwarrior3 = buildVimPlugin { inherit (taskwarrior3) version pname; src = "${taskwarrior3.src}/scripts/vim";
https://github.com/AndrewRadev/switch.vim/,, https://github.com/simrat39/symbols-outline.nvim/,, https://github.com/vim-syntastic/syntastic/,, <ins> https://github.com/ziontee113/syntax-tree-surfer/,HEAD, </ins> https://github.com/nanozuki/tabby.nvim/,HEAD, https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,,
<ins> { stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: stdenv.mkDerivation rec { name = "ipvsadm-${version}"; version = "1.29"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz"; sha256 = "c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149"; }; postPatch = '' substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)" ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl popt ]; preBuild = '' makeFlagsArray+=( INCLUDE=$(pkg-config --cflags libnl-genl-3.0) BUILD_ROOT=$out MANDIR=share/man ) ''; postInstall = '' sed -i -e "s|^PATH=.*|PATH=$out/bin:${gnugrep}/bin|" $out/sbin/ipvsadm-{restore,save} ''; meta = with stdenv.lib; { description = "Linux Virtual Server support programs"; homepage = http://www.linuxvirtualserver.org/software/ipvs.html; license = licenses.gpl2; platforms = platforms.linux; }; } </ins>
stdenv.mkDerivation rec { pname = "libssh"; <del> version = "0.10.6"; </del> <ins> version = "0.11.1"; </ins> src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; <del> hash = "sha256-GGHUmPW28XQbarxz5ghHhJHtz5ydS2Yw7vbnRZbencE="; </del> <ins> hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k="; </ins> }; <del> # Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake # is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output. # Otherwise it breaks `plasma5Packages.kio-extras`: #   https://hydra.nixos.org/build/221540008/nixlog/3/tail #outputs = [ "out" "dev" ]; </del> <ins> outputs = [ "out" "dev" ]; </ins> postPatch = '' # Fix headers to use libsodium instead of NaCl
# included in `buildInputs` such as libX11. cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ]; <del> # single output, otherwise cmake and .pc files point to the wrong directory # outputs = [ "out" "dev" ]; </del> buildInputs = [ zlib openssl libsodium ]; nativeBuildInputs = [ cmake pkg-config ]; <ins> postFixup = '' substituteInPlace $dev/lib/cmake/libssh/libssh-config.cmake  --replace-fail "set(_IMPORT_PREFIX "$out")" "set(_IMPORT_PREFIX "$dev")" ''; </ins> passthru.tests = { inherit ffmpeg sshping wireshark; };
cfg = config.services.garage; toml = pkgs.formats.toml { }; configFile = toml.generate "garage.toml" cfg.settings; <ins> anyHasPrefix = prefix: strOrList: if isString strOrList then hasPrefix prefix strOrList else any ({ path, ... }: hasPrefix prefix path) strOrList; </ins> in { meta = { doc = ./garage.md; <del> maintainers = [ ]; </del> <ins> maintainers = [ maintainers.mjm ]; </ins> }; options.services.garage = {
}; logLevel = mkOption { <del> type = types.enum ([ "error" "warn" "info" "debug" "trace" ]); </del> <ins> type = types.enum ([ "error" "warn" "info" "debug" "trace" ]); </ins> default = "info"; example = "debug"; description = "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples.";
data_dir = mkOption { default = "/var/lib/garage/data"; <del> example = [ { path = "/var/lib/garage/data"; capacity = "2T"; } ]; </del> <ins> example = [ { path = "/var/lib/garage/data"; capacity = "2T"; } ]; </ins> type = with types; either path (listOf attrs); description = '' The directory in which Garage will store the data blocks of objects. This folder can be placed on an HDD.
# These assertions can be removed in NixOS 24.11, when all users have been # warned once. { <del> assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package.version "1.0.0"; </del> <ins> assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package.version "1.0.0"; </ins> message = '' Garage 1.0.0 requires an explicit replication factor to be set. Please set replication_factor to 1 explicitly to preserve the previous behavior.
systemd.services.garage = { description = "Garage Object Storage (S3 compatible)"; <del> after = [ "network.target" "network-online.target" ]; wants = [ "network.target" "network-online.target" ]; </del> <ins> after = [ "network.target" "network-online.target" ]; wants = [ "network.target" "network-online.target" ]; </ins> wantedBy = [ "multi-user.target" ]; <del> restartTriggers = [ configFile ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); </del> <ins> restartTriggers = [ configFile ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); </ins> serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; <del> StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; </del> <ins> StateDirectory = mkIf ( anyHasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir ) "garage"; </ins> DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true;
<del> { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config , alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages </del> <ins> { lib, stdenv, fetchurl, fetchzip, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, perl, llvmPackages, </ins> }: let
libDir = "lib64"; <del> deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg qtwebsockets libpulseaudio quazip llvmPackages.libcxx ]; </del> <ins> deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg qtwebsockets libpulseaudio quazip llvmPackages.libcxx ]; </ins> desktopItem = makeDesktopItem { name = "teamspeak";
}; # grab the plugin sdk for the desktop icon <del> pluginsdk = fetchurl { url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.1.1.1.zip"; sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f"; </del> <ins> pluginsdk = fetchzip { url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip"; hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ="; </ins> }; nativeBuildInputs = [ makeWrapper which <del> unzip </del> perl # Installer script needs `shasum` ];
# ++ exec # + PAGER_PATH= # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs. <del> unpackPhase = '' echo -e 'ny' | PAGER=cat sh -xe $src cd TeamSpeak* ''; buildPhase = '' mv ts3client_linux_${arch} ts3client echo "patching ts3client..." patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client patchelf  --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir}  --force-rpath  ts3client ''; </del> <ins> unpackPhase = '' echo -e 'ny' | PAGER=cat sh -xe $src cd TeamSpeak* ''; buildPhase = '' mv ts3client_linux_${arch} ts3client echo "patching ts3client..." patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client patchelf  --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir}  --force-rpath  ts3client ''; </ins> installPhase = ''
# Make a desktop item mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/ <del> unzip ${pluginsdk} cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png </del> <ins> cp ${pluginsdk}/doc/_static/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png </ins> cp ${desktopItem}/share/applications/* $out/share/applications/ # Make a symlink to the binary from bin.
wrapProgram $out/bin/ts3client  --set LD_PRELOAD "${libredirect}/lib/libredirect.so"  --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"  <del> '' /* wayland is currently broken, remove when TS3 fixes that */ + '' --set QT_QPA_PLATFORM xcb  --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb </del> <ins> '' # wayland is currently broken, remove when TS3 fixes that + '' --set QT_QPA_PLATFORM xcb  --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb </ins> ''; dontStrip = true;
homepage = "https://teamspeak.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { <ins> # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak. </ins> fullName = "Teamspeak client license"; url = "https://www.teamspeak.com/en/privacy-and-terms/"; free = false; }; <del> maintainers = with maintainers; [ lhvwb lukegb atemu ]; </del> <ins> maintainers = with maintainers; [ lhvwb lukegb atemu ]; </ins> mainProgram = "ts3client"; platforms = [ "x86_64-linux" ]; }; } <del> /* License issues: Date: Mon, 10 Dec 2007 19:55:16 -0500 From: TeamSpeak Sales <sales@tritoncia.com> To: 'Marc Weber' <marco-oweber@gmx.de> Subject: RE: teamspeak on nix? Yes, that would be fine.  As long as you are not renting servers or selling TeamSpeak then you are more than welcome to distribute it. Thank you, TeamSpeak Sales Team ________________________________ e-Mail: sales@tritoncia.com TeamSpeak: http://www.TeamSpeak.com Account Login: https://sales.TritonCIA.com/users -----Original Message----- From: Marc Weber [mailto:marco-oweber@gmx.de] Sent: Monday, December 10, 2007 5:03 PM To: sales@tritoncia.com Subject: teamspeak on nix? Hello, nix is very young software distribution system (http://nix.cs.uu.nl/) I'd like to ask wether you permit us to add teamspeak (server/ client?) Sincerly Marc Weber (small nix contributor) */ </del>
<ins> License issues: Date: Mon, 10 Dec 2007 19:55:16 -0500 From: TeamSpeak Sales <sales@tritoncia.com> To: 'Marc Weber' <marco-oweber@gmx.de> Subject: RE: teamspeak on nix? Yes, that would be fine.  As long as you are not renting servers or selling TeamSpeak then you are more than welcome to distribute it. Thank you, TeamSpeak Sales Team ________________________________ e-Mail: sales@tritoncia.com TeamSpeak: http://www.TeamSpeak.com Account Login: https://sales.TritonCIA.com/users -----Original Message----- From: Marc Weber [mailto:marco-oweber@gmx.de] Sent: Monday, December 10, 2007 5:03 PM To: sales@tritoncia.com Subject: teamspeak on nix? Hello, nix is very young software distribution system (http://nix.cs.uu.nl/) I'd like to ask wether you permit us to add teamspeak (server/ client?) Sincerly Marc Weber (small nix contributor) </ins>
description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; <ins> # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak. </ins> license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; }; } <del> /* License issues: Date: Mon, 10 Dec 2007 19:55:16 -0500 From: TeamSpeak Sales <sales@tritoncia.com> To: 'Marc Weber' <marco-oweber@gmx.de> Subject: RE: teamspeak on nix? Yes, that would be fine.  As long as you are not renting servers or selling TeamSpeak then you are more than welcome to distribute it. Thank you, TeamSpeak Sales Team ________________________________ e-Mail: sales@tritoncia.com TeamSpeak: http://www.TeamSpeak.com Account Login: https://sales.TritonCIA.com/users -----Original Message----- From: Marc Weber [mailto:marco-oweber@gmx.de] Sent: Monday, December 10, 2007 5:03 PM To: sales@tritoncia.com Subject: teamspeak on nix? Hello, nix is very young software distribution system (http://nix.cs.uu.nl/) I'd like to ask wether you permit us to add teamspeak (server/ client?) Sincerly Marc Weber (small nix contributor) */ </del>
+		os_is_macosx=false +		nonLinuxOS=false +		;; <del> +esac </del> <ins> +esac </ins> +AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue]) +AM_COND_IF([IS_DARWIN], +	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
#include <sys/types.h> #include <stdint.h> diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h <del> index 4b69983..8e2ac75 100644 </del> <ins> index 4b69983..c75151b 100644 </ins> --- a/include/bsd/stdio.h +++ b/include/bsd/stdio.h @@ -48,12 +48,16 @@
/* XXX: The function requires cooperation from the system libc to store the * line buffer in the FILE struct itself. */ char *fgetln(FILE *fp, size_t *lenp) <del> LIBBSD_DEPRECATED("This functions cannot be safely ported, " "use getline(3) instead, as it is supported " "by GNU and POSIX.1-2008."); </del> <ins> -	LIBBSD_DEPRECATED("This functions cannot be safely ported, " -	                  "use getline(3) instead, as it is supported " -	                  "by GNU and POSIX.1-2008."); +	__attribute__((deprecated("This functions cannot be safely ported, " +	                          "use getline(3) instead, as it is supported " +	                          "by GNU and POSIX.1-2008."))); </ins> +#else +char *fgetln(FILE *fp, size_t *lenp); +#endif /* * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations, <ins> diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h index ebc9638..6cd7943 100644 --- a/include/bsd/stdlib.h +++ b/include/bsd/stdlib.h @@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb, const unsigned char *table, unsigned endbyte); void *reallocf(void *ptr, size_t size); -#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) +#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) +#if !__GLIBC_PREREQ(2, 26) void *reallocarray(void *ptr, size_t nmemb, size_t size); #endif +#endif long long strtonum(const char *nptr, long long minval, long long maxval, const char **errstr); </ins> diff --git a/include/bsd/string.h b/include/bsd/string.h <del> index ee2f953..a3ab077 100644 </del> <ins> index 6798bf6..6baaa14 100644 </ins> --- a/include/bsd/string.h +++ b/include/bsd/string.h <del> @@ -37,11 +37,14 @@ </del> <ins> @@ -37,6 +37,12 @@ </ins> #include <sys/types.h> __BEGIN_DECLS <del> -size_t strlcpy(char *dst, const char *src, size_t siz); -size_t strlcat(char *dst, const char *src, size_t siz); char *strnstr(const char *str, const char *find, size_t str_len); </del> +#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) +size_t bsd_strlcpy(char *dst, const char *src, size_t siz); +size_t bsd_strlcat(char *dst, const char *src, size_t siz); <ins> +char *bsd_strnstr(const char *str, const char *find, size_t str_len); </ins> +void bsd_strmode(mode_t mode, char *str); +#else <del> void strmode(mode_t mode, char *str); - +#endif </del> <ins> size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz); char *strnstr(const char *str, const char *find, size_t str_len); @@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str); #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) </ins> void explicit_bzero(void *buf, size_t len); <ins> #endif +#endif </ins> __END_DECLS <ins> #endif </ins> diff --git a/src/Makefile.am b/src/Makefile.am index ad83dbf..0f2a7ee 100644 --- a/src/Makefile.am
+} #endif diff --git a/src/funopen.c b/src/funopen.c <del> index 1e05c7e..ed8ce85 100644 </del> <ins> index 1e05c7e..75e61ea 100644 </ins> --- a/src/funopen.c +++ b/src/funopen.c <del> @@ -137,7 +137,7 @@ funopen(const void *cookie, return fopencookie(cookiewrap, mode, funcswrap); } -#elif defined(__MUSL__) +#elif defined(__MUSL__) || defined(darwin) || defined(__APPLE__) || defined(MACOSX) /* * This is unimplementable on musl based systems, and upstream has stated </del> <ins> @@ -143,6 +143,7 @@ funopen(const void *cookie, </ins> * they will not add the needed support to implement it. Just ignore this <ins> * interface there, as it has never been provided anyway. */ +#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) #else #error "Function funopen() needs to be ported or disabled." #endif </ins> diff --git a/src/getentropy.c b/src/getentropy.c index 3f11a1e..8a23a07 100644 --- a/src/getentropy.c
#define SHA512_DIGEST_LENGTH		64 diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c <del> index b3c8d5e..4fade0f 100644 </del> <ins> index b3c8d5e..f69013d 100644 </ins> --- a/src/hash/sha512c.c +++ b/src/hash/sha512c.c <del> @@ -25,7 +25,11 @@ </del> <ins> @@ -25,7 +25,13 @@ </ins> */ #include <sys/cdefs.h> <ins> +__FBSDID("$FreeBSD$"); + </ins> +#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) +#include <machine/endian.h> +#else
#include <string.h> diff --git a/src/nlist.c b/src/nlist.c <del> index 0932f59..a3ba2be 100644 </del> <ins> index 0932f59..598a329 100644 </ins> --- a/src/nlist.c +++ b/src/nlist.c <del> @@ -27,6 +27,8 @@ </del> <ins> @@ -27,6 +27,10 @@ </ins> * SUCH DAMAGE. */ +#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) <del> + </del> <ins> +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ </ins> #include <sys/cdefs.h> #include <sys/param.h> <del> @@ -265,3 +267,5 @@ nlist(const char *name, struct nlist *list) </del> <ins> @@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list) </ins> (void)close(fd); return (n); } <del> + +#endif </del> <ins> +#endif /* _NLIST_DO_ELF */ </ins> diff --git a/src/setproctitle.c b/src/setproctitle.c index 038ac7d..d0ef01b 100644 --- a/src/setproctitle.c
cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; cloudlog = handleTest ./cloudlog.nix {}; cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; <ins> cockpit = handleTest ./cockpit.nix {}; </ins> cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; collectd = handleTest ./collectd.nix {}; connman = handleTest ./connman.nix {};