jiebi/CodeConvo huggingface dataset:
<ins> From 98285b17b3887de37b630da66f09a44f42ddbe01 Mon Sep 17 00:00:00 2001 From: Jakub Konka <kubkon@jakubkonka.com> Date: Tue, 25 Oct 2022 11:46:42 +0200 Subject: [PATCH] darwin: bump max macOS version to 13.0 --- lib/std/target.zig | 4 ++-- src/target.zig     | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/std/target.zig b/lib/std/target.zig index d791e3b0350..7fbad5baa3c 100644 --- a/lib/std/target.zig +++ b/lib/std/target.zig @@ -277,13 +277,13 @@ pub const Target = struct { .aarch64 => VersionRange{ .semver = .{ .min = .{ .major = 11, .minor = 6 }, -                                .max = .{ .major = 12, .minor = 0 }, +                                .max = .{ .major = 13, .minor = 0 }, }, }, .x86_64 => VersionRange{ .semver = .{ .min = .{ .major = 10, .minor = 13 }, -                                .max = .{ .major = 12, .minor = 0 }, +                                .max = .{ .major = 13, .minor = 0 }, }, }, else => unreachable, diff --git a/src/target.zig b/src/target.zig index 9e2d26dac65..fc585912c45 100644 --- a/src/target.zig +++ b/src/target.zig @@ -18,6 +18,7 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .aarch64, .os = .windows, .abi = .gnu }, .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } }, .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } }, +    .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } }, .{ .arch = .armeb, .os = .linux, .abi = .gnueabi }, .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf }, .{ .arch = .armeb, .os = .linux, .abi = .musleabi }, @@ -73,6 +74,7 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 10, .minor = 0 } }, .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } }, .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } }, +    .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } }, }; pub fn libCGenericName(target: std.Target) [:0]const u8 { </ins>
<del> { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz"; sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) </del>
<ins> { black , fetchFromGitHub , lib , python3 }: python3.pkgs.buildPythonApplication rec { pname = "blacken-docs"; version = "1.15.0"; format = "pyproject"; src = fetchFromGitHub { owner = "adamchainz"; repo = "blacken-docs"; rev = version; hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8="; }; nativeBuildInputs = [ python3.pkgs.setuptools ]; propagatedBuildInputs = [ black ]; nativeCheckInputs = [ black python3.pkgs.pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/adamchainz/blacken-docs"; changelog = "https://github.com/adamchainz/blacken-docs/blob/${src.rev}/CHANGELOG.rst"; description = "Run Black on Python code blocks in documentation files"; license = licenses.mit; maintainers = with maintainers; [ l0b0 ]; }; } </ins>
<ins> { black , blacken-docs , fetchFromGitHub , lib , python3 , ruff }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; version = "1.7.0"; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; rev = version; hash = "sha256-CTF5HisBS44Ta18cVT04UrMIF30WmEBwZBGW7fkKXwk="; }; passthru.optional-dependencies = { black = [ black ]; blacken-docs = [ blacken-docs ]; flake8 = [ python3.pkgs.flake8 ]; isort = [ python3.pkgs.isort ]; jupytext = [ python3.pkgs.jupytext ]; mypy = [ python3.pkgs.mypy ]; pylint = [ python3.pkgs.pylint ]; pyupgrade = [ python3.pkgs.pyupgrade ]; ruff = [ ruff ]; }; propagatedBuildInputs = with python3.pkgs; [ autopep8 ipython tokenize-rt tomli ] ++ builtins.attrValues passthru.optional-dependencies; postPatch = '' # Force using the Ruff executable rather than the Python package substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' ''; preCheck = '' # Allow the tests to run `nbqa` itself from the path export PATH="$out/bin":"$PATH" ''; nativeCheckInputs = [ black ruff ] ++ (with python3.pkgs; [ autoflake flake8 isort jupytext mdformat pre-commit-hooks pydocstyle pylint pytestCheckHook pyupgrade yapf ]); disabledTests = [ # Test data not found "test_black_multiple_files" "test_black_return_code" "test_grep" "test_jupytext_on_folder" "test_mypy_works" "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" ]; disabledTestPaths = [ # Test data not found "tests/test_include_exclude.py" ]; meta = with lib; { homepage = "https://github.com/nbQA-dev/nbQA"; changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; license = licenses.mit; maintainers = with maintainers; [ l0b0 ]; }; } </ins>
in '' runHook preInstall <ins> mv build/linux-x86_64-server-${buildType}/images/jdk/man build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} </ins> rm -rf build/linux-x86_64-server-${buildType}/images/jdk mv build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} build/linux-x86_64-server-${buildType}/images/jdk '' + oldAttrs.installPhase + "runHook postInstall";
in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) // { <ins> qt3d = { inherit version; src = fetchgit { url = "https://invent.kde.org/qt/qt/qt3d.git"; rev = "c3c7e6ebc29cce466d954f72f340a257d76b5ec2"; sha256 = "sha256-KMWZ4N2OO7TBVpcgvQf/gweZRT62i9XABOnq0x94PY4="; fetchLFS = false; fetchSubmodules = true; deepClone = false; leaveDotGit = false; }; }; </ins> # qtwebkit does not have an official release tarball on the qt mirror and is # mostly maintained by the community. qtwebkit = rec {
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; <ins> # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; </ins> preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
spdlog ]; <ins> # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; </ins> meta = with lib; { description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient";
mtpfs = callPackage ../tools/filesystems/mtpfs { }; <del> mtxclient = callPackage ../development/libraries/mtxclient { }; </del> <ins> mtxclient = callPackage ../development/libraries/mtxclient { # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; </ins> mu = callPackage ../tools/networking/mu { texinfo = texinfo4;
ngt = callPackage ../development/libraries/ngt { }; <del> nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; </del> <ins> nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; </ins> nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };
wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 <ins> wrapProgram $out/bin/mullvad-daemon  --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" </ins> sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop runHook postInstall
stdenv.mkDerivation (finalAttrs: { pname = "mdds"; <del> version = "2.1.0"; </del> <ins> version = "2.0.3"; </ins> src = fetchFromGitLab { owner = "mdds"; repo = "mdds"; rev = finalAttrs.version; <del> hash = "sha256-RZ2wGwle4raWlogc5X+VEeriPGS0Nqs7CWGENFEotvs="; </del> <ins> hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; </ins> }; nativeBuildInputs = [ autoreconfHook ];
<ins> { lib , stdenv , fetchhg , qt5 }: let inherit (qt5) qtbase qtmultimedia wrapQtAppsHook; in stdenv.mkDerivation (self: { pname = "rpcemu"; version = "0.9.4"; src = fetchhg { url = "http://www.home.marutan.net/hg/rpcemu"; rev = "release_${self.version}"; sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI="; }; nativeBuildInputs = [ wrapQtAppsHook ]; buildInputs = [ qtbase qtmultimedia ]; configurePhase = '' runHook preConfigure cd src/qt5 qmake runHook postConfigure ''; installPhase = '' runHook preInstall cd ../.. install -Dm755 rpcemu-interpreter -t $out/bin runHook postInstall ''; meta = { homepage = "https://www.marutan.net/rpcemu/index.php"; description = "Risc PC Emulator"; longDescription = '' RPCEmu is an emulator of classic Acorn computer systems, such as the Risc PC and A7000. It runs on multiple platforms including Windows, Linux and Mac OS X. RPCEmu should be considered Alpha Quality code. It has many known and unknown bugs, and all files used with it should be well backed up before using them with RPCEmu. ''; license = lib.licenses.gpl2Plus; maintainers =  builtins.attrValues { inherit (lib.maintainers) AndersonTorres; }; platforms = lib.platforms.linux; }; }) </ins>
<ins> { lib , rustPlatform , fetchFromGitHub , pkg-config , openssl , cmake , alsa-lib , dbus , fontconfig }: rustPlatform.buildRustPackage rec { pname = "spotify-player"; version = "0.10.0"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "v${version}"; sha256 = "sha256-bHPWpx8EJibr2kNuzuGAQPZ0DE6qeJwIRYDy+NFS/PQ="; }; cargoSha256 = "sha256-QeQ3PYI5RmbJ+VQ9hLSTXgQXVVoID5zbRqSTrbWzVy8="; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl alsa-lib dbus fontconfig ]; buildNoDefaultFeatures = true; buildFeatures = [ "rodio-backend" "media-control" "image" "lyric-finder" ]; meta = with lib; { description = "A command driven spotify player"; homepage = "https://github.com/aome510/spotify-player"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; } </ins>
, enableMultilib }: <ins> let forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; }; in </ins> originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { <ins> passthru = (originalAttrs.passthru or {}) // { inherit forceLibgccToBuildCrtStuff; }; </ins> preUnpack = '' oldOpts="$(shopt -po nounset)" || true set -euo pipefail
<ins> { lib , stdenv }: # Trick to build a gcc that is capable of emitting shared libraries *without* having the # targetPlatform libc available beforehand.  Taken from: #   https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ #   https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff let # crt{i,n}.o are the first and last (respectively) object file # linked when producing an executable.  Traditionally these # files are delivered as part of the C library, but on GNU # systems they are in fact built by GCC.  Since libgcc needs to # build before glibc, we can't wait for them to be copied by # glibc.  At this early pre-glibc stage these files sometimes # have different names. crtstuff-ofiles = if stdenv.targetPlatform.isPower then "ecrti.o ecrtn.o ncrti.o ncrtn.o" else "crti.o crtn.o"; # Normally, `SHLIB_LC` is set to `-lc`, which means that # `libgcc_s.so` cannot be built until `libc.so` is available. # The assignment below clobbers this variable, removing the # `-lc`. # # On PowerPC we add `-mnewlib`, which means "libc has not been # built yet".  This causes libgcc's Makefile to use the # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the # versions which have been repackaged in libc as `crt{n,i}.o` # SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib"; in '' echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in '' </ins>
!langJit && !stdenv.hostPlatform.isDarwin && enableShared <del> ; </del> <ins> ; </ins> <del> # For some reason libgcc_s.so has major-version "2" on m68k but # "1" everywhere else.  Might be worth changing this to "*". libgcc_s-version-major = if targetPlatform.isM68k then "2" else "1"; </del> <ins> # For some reason libgcc_s.so has major-version "2" on m68k but # "1" everywhere else.  Might be worth changing this to "*". libgcc_s-version-major = if targetPlatform.isM68k then "2" else "1"; </ins> in (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
export inhibit_libc=true '' <del> # Trick to build a gcc that is capable of emitting shared libraries *without* having the # targetPlatform libc available beforehand.  Taken from: #   https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ #   https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff </del> + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared) <del> (let # crt{i,n}.o are the first and last (respectively) object file # linked when producing an executable.  Traditionally these # files are delivered as part of the C library, but on GNU # systems they are in fact built by GCC.  Since libgcc needs to # build before glibc, we can't wait for them to be copied by # glibc.  At this early pre-glibc stage these files sometimes # have different names. crtstuff-ofiles = if targetPlatform.isPower then "ecrti.o ecrtn.o ncrti.o ncrtn.o" else "crti.o crtn.o"; # Normally, `SHLIB_LC` is set to `-lc`, which means that # `libgcc_s.so` cannot be built until `libc.so` is available. # The assignment below clobbers this variable, removing the # `-lc`. # # On PowerPC we add `-mnewlib`, which means "libc has not been # built yet".  This causes libgcc's Makefile to use the # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the # versions which have been repackaged in libc as `crt{n,i}.o` # SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib"; in '' echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in '') </del> <ins> (import ./libgcc-buildstuff.nix { inherit lib stdenv; }) </ins>
liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22 liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 <del> libgcc = throw "libgcc was removed, use gcc.cc.libgcc if needed"; # added 2023-05-13 </del> libgksu = throw "libgksu has been removed"; # Added 2022-01-16 libgme = game-music-emu; # Added 2022-07-20 libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22
it is set, instead of the previous hardcoded default of `${networking.hostName}.${security.ipa.domain}`. <ins> - The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. </ins> - The fcgiwrap module now allows multiple instances running as distinct users. The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance.
let inherit (lib) getBin getExe optionals; <del> version = "1.8.22"; </del> <ins> version = "1.8.25"; </ins> src = fetchFromGitHub { owner = "marlam"; <del> repo = "msmtp-mirror"; </del> <ins> repo = "msmtp"; </ins> rev = "msmtp-${version}"; <del> hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ="; </del> <ins> hash = "sha256-UZKUpF/ZwYPM2rPDudL1O8e8LguKJh9sTcJRT3vgsf4="; </ins> }; meta = with lib; {
<ins> diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq index bcb384e..9622e47 100755 --- a/scripts/msmtpq/msmtpq +++ b/scripts/msmtpq/msmtpq @@ -60,8 +60,6 @@ err() { dsp '' "$@" '' ; exit 1 ; } ##   export the location of the msmtp executable before running this script  (no quotes !!) ##   e.g. ( export MSMTP=/path/to/msmtp ) MSMTP="${MSMTP:-msmtp}" -"$MSMTP" --version >/dev/null 2>&1 ||  -  log_later -e 1 "msmtpq : can't run the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit ## ## set the queue var to the location of the msmtp queue directory ##   if the queue dir doesn't yet exist, create it (0700) </ins>
<ins> diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq index bcb384e..dbaf1b5 100755 --- a/scripts/msmtpq/msmtpq +++ b/scripts/msmtpq/msmtpq @@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then fi fi [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")" + +JOURNAL=@journal@ ## ====================================================================================== ## msmtpq can use the following environment variables : @@ -144,6 +146,7 @@ on_exit() {                          # unlock the queue on exit if the lock was ## display msg to user, as well ## log() { +  local NAME=msmtpq local ARG RC PFX PFX="$('date' +'%Y %d %b %H:%M:%S')" # time stamp prefix - "2008 13 Mar 03:59:45 " @@ -161,10 +164,19 @@ log() { done fi +  if [ "$JOURNAL" = "Y" ]; then +    for ARG; do +      [ -n "$ARG" ] && +        echo "$ARG" | systemd-cat -t "$NAME" -p info +    done +  fi + if [ -n "$RC" ] ; then             # an error ; leave w/error return [ -n "$LKD" ] && lock_queue -u   # unlock here (if locked) [ -n "$MSMTPQ_LOG" ] &&  echo "    exit code = $RC" >> "$MSMTPQ_LOG" # logging ok ; send exit code to log +    [ "$JOURNAL" = "Y" ] &&  +      echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg exit "$RC"                       # exit w/return code fi } </ins>
<del> diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq index d8b4039..1f2a7b5 100755 --- a/scripts/msmtpq/msmtpq +++ b/scripts/msmtpq/msmtpq @@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; } ##   e.g. ( export MSMTP=/path/to/msmtp ) if [ "$MSMTP" = "" ] ; then  # If MSMTP is unset or empty... MSMTP=msmtp -elif [ ! -x "$MSMTP" ] ; then -  log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit +# elif [ ! -x "$MSMTP" ] ; then +#   log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit fi ## ## set the queue var to the location of the msmtp queue directory @@ -71,7 +71,7 @@ fi ##            ( chmod 0700 msmtp.queue ) ## ## the queue dir - export this variable to reflect where you'd like it to be  (no quotes !!) -Q=${Q:-~/.msmtp.queue} +Q=${MSMTP_QUEUE:-~/.msmtp.queue} [ -d "$Q" ] || mkdir -m 0700 -p "$Q" ||  err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" ''     # if not present - complain ; quit ## @@ -85,8 +85,10 @@ Q=${Q:-~/.msmtp.queue} ## ## the queue log file - export this variable to change where logs are stored  (but no quotes !!) ##                      Set it to "" (empty string) to disable logging. -[ -v LOG ] || LOG=~/log/msmtp.queue.log +LOG=${MSMTP_LOG:-~/log/msmtp.queue.log} [ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")" + +JOURNAL=@journal@ ## ====================================================================================== ## msmtpq can use the following environment variables : @@ -139,6 +141,7 @@ on_exit() {                          # unlock the queue on exit if the lock was ## display msg to user, as well ## log() { +  local NAME=msmtpq local ARG RC PFX PFX="$('date' +'%Y %d %b %H:%M:%S')" # time stamp prefix - "2008 13 Mar 03:59:45 " @@ -156,10 +159,19 @@ log() { done fi +  if [ "$JOURNAL" = "Y" ]; then +    for ARG; do +      [ -n "$ARG" ] && +        echo "$ARG" | systemd-cat -t "$NAME" -p info +    done +  fi + if [ -n "$RC" ] ; then             # an error ; leave w/error return [ -n "$LKD" ] && lock_queue -u   # unlock here (if locked) [ -n "$LOG" ] &&  echo "    exit code = $RC" >> "$LOG" # logging ok ; send exit code to log +    [ "$JOURNAL" = "Y" ] &&  +      echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg exit "$RC"                       # exit w/return code fi } </del>
"--with-app-defaults=$(out)/lib/X11/app-defaults" ] ++ lib.optional enableDecLocator "--enable-dec-locator"; <del> # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; </del> <ins> env = { # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; } // lib.optionalAttrs stdenv.hostPlatform.isMusl { # Various symbols missing without this define: TAB3, NLDLY, CRDLY, BSDLY, FFDLY, CBAUD NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; }; </ins> # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', # decided by the sysadmin to allow the xterm reporting to /var/run/utmp
wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper DocService/docservice /run/onlyoffice/config"; <del> ExecStartPre = onlyoffice-prestart; </del> <ins> ExecStartPre = [ onlyoffice-prestart ]; </ins> Group = "onlyoffice"; Restart = "always"; RuntimeDirectory = "onlyoffice";
- `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details. <ins> - `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option. </ins> ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
loadplugin Mail::SpamAssassin::Plugin::Check #loadplugin Mail::SpamAssassin::Plugin::DCC loadplugin Mail::SpamAssassin::Plugin::DKIM <ins> loadplugin Mail::SpamAssassin::Plugin::DMARC </ins> loadplugin Mail::SpamAssassin::Plugin::DNSEval loadplugin Mail::SpamAssassin::Plugin::FreeMail <del> loadplugin Mail::SpamAssassin::Plugin::Hashcash </del> loadplugin Mail::SpamAssassin::Plugin::HeaderEval loadplugin Mail::SpamAssassin::Plugin::HTMLEval loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch
<ins> diff -ru orig/t/sa_compile.t new/t/sa_compile.t --- orig/t/sa_compile.t	2022-12-14 06:03:26.000000000 +0000 +++ new/t/sa_compile.t	2023-06-25 12:30:39.735577152 +0000 @@ -40,7 +40,7 @@ # we now have an "installed" version we can run sa-compile with.  Ensure # sarun() will use it appropriately -$scr = "$instdir/$temp_binpath/spamassassin"; +$scr = "$perl_cmd -T $instdir/$temp_binpath/spamassassin"; $scr_localrules_args = $scr_cf_args = "";      # use the default rules dir, from our "install" &set_rules(' @@ -86,8 +86,8 @@ # ------------------------------------------------------------------- rmtree( glob "~/.spamassassin/sa-compile.cache". { safe => 1 }); # reset test -system_or_die "TMP=$instdir TMPDIR=$instdir $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug";  # --debug -$scr = "$instdir/$temp_binpath/spamassassin"; +system_or_die "TMP=$instdir TMPDIR=$instdir $perl_cmd -T $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug";  # --debug +$scr = "$perl_cmd -T $instdir/$temp_binpath/spamassassin"; $scr_localrules_args = $scr_cf_args = "";      # use the default rules dir, from our "install" %patterns = ( </ins>