jiebi/CodeConvo huggingface dataset:
meta = { description = "A notification system for tiling window managers"; homepage = https://github.com/sboli/twmn; <del> platforms = with stdenv.lib.platforms; linux; maintainers = [ stdenv.lib.maintainers.matejc ]; license = stdenv.lib.licenses.lgpl3; </del> <ins> platforms = with lib.platforms; linux; maintainers = [ lib.maintainers.matejc ]; license = lib.licenses.lgpl3; </ins> }; }
}; description = lib.mdDoc "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; <ins> input = mkOption { type = cfgFmt.type; default = { }; example = { General = { IdleTimeout = 30; ClassicBondedOnly = true; }; }; description = lib.mdDoc "Set configuration for the input service (/etc/bluetooth/input.conf)."; }; network = mkOption { type = cfgFmt.type; default = { }; example = { General = { DisableSecurity = true; }; }; description = lib.mdDoc "Set configuration for the network service (/etc/bluetooth/network.conf)."; }; </ins> }; };
environment.systemPackages = [ package ] ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; <ins> environment.etc."bluetooth/input.conf".source = cfgFmt.generate "input.conf" cfg.input; environment.etc."bluetooth/network.conf".source = cfgFmt.generate "network.conf" cfg.network; </ins> environment.etc."bluetooth/main.conf".source = cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); services.udev.packages = [ package ];
mkdir $out/etc/bluetooth ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf <ins> # https://github.com/NixOS/nixpkgs/issues/204418 ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf </ins> # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez for files in `find tools/ -type f -perm -755`; do filename=$(basename $files)
{ config, pkgs, lib, ... }: let <del> inherit (lib) any boolToString concatStringsSep isBool isString literalExpression mapAttrsToList mkDefault mkEnableOption mkIf mkOption optionalAttrs types; </del> <ins> inherit (lib) any boolToString concatStringsSep isBool isString mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption optionalAttrs types; </ins> package = pkgs.dolibarr.override { inherit (cfg) stateDir; }; cfg = config.services.dolibarr; <del> vhostCfg = config.services.nginx.virtualHosts."${cfg.domain}"; </del> <ins> vhostCfg = lib.optionalAttr (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}"; </ins> mkConfigFile = filename: settings: let
force_install_database = cfg.database.name; force_install_databaselogin = cfg.database.user; <del> force_install_mainforcehttps = vhostCfg.forceSSL; </del> <ins> force_install_mainforcehttps = vhostCfg.forceSSL or false; </ins> force_install_createuser = false; force_install_dolibarrlogin = null; } // optionalAttrs (cfg.database.passwordFile != null) {
# Security settings dolibarr_main_prod = true; <del> dolibarr_main_force_https = vhostCfg.forceSSL; </del> <ins> dolibarr_main_force_https = vhostCfg.forceSSL or false; </ins> dolibarr_main_restrict_os_commands = "${pkgs.mariadb}/bin/mysqldump, ${pkgs.mariadb}/bin/mysql"; dolibarr_nocsrfcheck = false; dolibarr_main_instance_unique_id = ''
users.groups = optionalAttrs (cfg.group == "dolibarr") { dolibarr = { }; }; <del> users.users."${config.services.nginx.group}".extraGroups = [ cfg.group ]; }; </del> <ins> } (mkIf (cfg.nginx != null) { users.users."${config.services.nginx.group}".extraGroups = mkIf (cfg.nginx != null) [ cfg.group ]; }) ]); </ins> }
aliases['ls'] = _ls_alias del _ls_alias ${cfg.config} ''; environment.systemPackages = [ cfg.package ]; <del> environment.shells = [ "/run/current-system/sw/bin/xonsh" "${cfg.package}/bin/xonsh" ]; </del> <ins> environment.shells = [ "/run/current-system/sw/bin/xonsh" "${lib.getExe cfg.package}" ]; </ins> }; }
<del> { lib , callPackage , extraPackages ? (ps: [ ]) , runCommand </del> <ins> { lib, callPackage, coreutils, fetchFromGitHub, git, gitUpdater, glibcLocales, python3Packages, </ins> }: let <del> xonsh-unwrapped = callPackage ./unwrapped.nix { }; inherit (xonsh-unwrapped.passthru) python; pythonEnv = python.withPackages (ps: [ (ps.toPythonModule xonsh-unwrapped) ] ++ extraPackages ps); </del> <ins> argset = { pname = "xonsh"; version = "0.17.0"; pyproject = true; # PyPI package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${argset.version}"; hash = "sha256-9sRY9aetWWXzCFfgdHCBCia48THIJcMxsYMnFR6Xa8A="; }; nativeBuildInputs = with python3Packages; [ setuptools wheel ]; propagatedBuildInputs = (with python3Packages; [ ply prompt-toolkit pygments ]); nativeCheckInputs = [ git glibcLocales ] ++ (with python3Packages; [ pip pyte pytest-mock pytest-subprocess pytestCheckHook requests ]); disabledTests = [ # fails on sandbox "test_colorize_file" "test_loading_correctly" "test_no_command_path_completion" "test_bsd_man_page_completions" "test_xonsh_activator" # fails on non-interactive shells "test_capture_always" "test_casting" "test_command_pipeline_capture" "test_dirty_working_directory" "test_man_completion" "test_vc_get_branch" "test_bash_and_is_alias_is_only_functional_alias" "test_spec_modifier_alias_output_format" # flaky tests "test_script" "test_alias_stability" "test_alias_stability_exception" "test_complete_import" "test_subproc_output_format" ]; disabledTestPaths = [ # fails on sandbox "tests/completers/test_command_completers.py" "tests/test_ptk_highlight.py" "tests/test_ptk_shell.py" # fails on non-interactive shells "tests/prompt/test_gitstatus.py" "tests/completers/test_bash_completer.py" ]; env.LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py sed -ie 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do sed -ie 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script done patchShebangs . ''; preCheck = '' export HOME=$TMPDIR export PATH=$out/bin:$PATH ''; passthru = { shellPath = "/bin/xonsh"; python = python3Packages.python; # To the wrapper wrapper = callPackage ./wrapper.nix { }; updateScript = gitUpdater { }; }; meta = { homepage = "https://xon.sh/"; description = "A Python-ish, BASHwards-compatible shell"; changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; license = with lib.licenses; [ bsd3 ]; mainProgram = "xonsh"; maintainers = with lib.maintainers; [ AndersonTorres samlukeyes123 ]; }; }; </ins> in <del> runCommand "xonsh-${xonsh-unwrapped.version}" { inherit (xonsh-unwrapped) pname version meta; passthru = xonsh-unwrapped.passthru // { unwrapped = xonsh-unwrapped; }; } '' mkdir -p $out/bin for bin in ${lib.getBin xonsh-unwrapped}/bin/*; do ln -s ${pythonEnv}/bin/$(basename "$bin") $out/bin/ done '' </del> <ins> python3Packages.buildPythonApplication argset </ins>
<del> { lib , coreutils , fetchFromGitHub , git , gitUpdater , glibcLocales , python3 }: let pname = "xonsh"; version = "0.15.1"; in python3.pkgs.buildPythonApplication { inherit pname version; pyproject = true; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${version}"; hash = "sha256-mHOCkUGiSSPmkIQ4tgRZIaCTLgnx39SMwug5EIx/jrU="; }; nativeBuildInputs = with python3.pkgs; [ setuptools wheel ]; propagatedBuildInputs = with python3.pkgs; [ ply prompt-toolkit pygments ]; env.LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} ; find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' patchShebangs . ''; disabledTests = [ # fails on sandbox "test_colorize_file" "test_loading_correctly" "test_no_command_path_completion" "test_bsd_man_page_completions" "test_xonsh_activator" # fails on non-interactive shells "test_capture_always" "test_casting" "test_command_pipeline_capture" "test_dirty_working_directory" "test_man_completion" "test_vc_get_branch" "test_bash_and_is_alias_is_only_functional_alias" ]; disabledTestPaths = [ # fails on sandbox "tests/completers/test_command_completers.py" "tests/test_ptk_highlight.py" "tests/test_ptk_shell.py" # fails on non-interactive shells "tests/prompt/test_gitstatus.py" "tests/completers/test_bash_completer.py" ]; nativeCheckInputs = [ git glibcLocales ] ++ (with python3.pkgs; [ pip pyte pytest-mock pytest-subprocess pytestCheckHook ]); preCheck = '' export HOME=$TMPDIR ''; dontWrapPythonPrograms = true; passthru = { shellPath = "/bin/xonsh"; python = python3; # To the wrapper updateScript = gitUpdater { }; }; meta =  { homepage = "https://xon.sh/"; description = "Python-ish, BASHwards-compatible shell"; changelog = "https://github.com/xonsh/xonsh/raw/${version}/CHANGELOG.rst"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ AndersonTorres ]; }; } </del>
<ins> { lib, runCommand, xonsh, # configurable options extraPackages ? (ps: [ ]), }: let inherit (xonsh.passthru) python; pythonEnv = python.withPackages (ps: [ (ps.toPythonModule xonsh) ] ++ extraPackages ps); in runCommand "xonsh-wrapped-${xonsh.version}" { inherit (xonsh) pname version meta passthru; } '' mkdir -p $out/bin for bin in ${lib.getBin xonsh}/bin/*; do ln -s ${pythonEnv}/bin/$(basename "$bin") $out/bin/ done '' </ins>
xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xmlada = gnatPackages.xmlada; # Added 2024-02-25 <del> xonsh-unwrapped = xonsh.passthru.unwrapped; </del> <ins> xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 </ins> xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07
, fftwSinglePrec , doxygen , swig <del> , python3Packages, enablePython ? false , opencl-headers, ocl-icd, enableOpencl ? false , clang, enableClang ? true , cudatoolkit, enableCuda ? false </del> <ins> , enablePython ? false , python3Packages , enableOpencl ? true , opencl-headers , ocl-icd , enableCuda ? false , cudaPackages , addOpenGLRunpath </ins> }: stdenv.mkDerivation rec {
serialization/tests/TestSerializeIntegrator.cpp ''; <del> nativeBuildInputs = [ cmake gfortran swig doxygen python3Packages.python ]; </del> <ins> nativeBuildInputs = [ cmake gfortran swig doxygen python3Packages.python ] ++ lib.optional enableCuda addOpenGLRunpath; </ins> buildInputs = [ fftwSinglePrec ] ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ] <del> ++ lib.optional enableCuda cudatoolkit; </del> <ins> ++ lib.optional enableCuda cudaPackages.cudatoolkit; </ins> propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ python
"-DOPENMM_BUILD_SHARED_LIB=ON" ] ++ lib.optionals enablePython [ "-DOPENMM_BUILD_PYTHON_WRAPPERS=ON" <del> ] ++ lib.optionals enableClang [ "-DCMAKE_C_COMPILER=${clang}/bin/clang" "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" </del> ] ++ lib.optionals enableOpencl [ "-DOPENMM_BUILD_OPENCL_LIB=ON" "-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON" "-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON" "-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON" ] ++ lib.optionals enableCuda [ <del> "-DCUDA_SDK_ROOT_DIR=${cudatoolkit}" </del> <ins> "-DCUDA_SDK_ROOT_DIR=${cudaPackages.cudatoolkit}" </ins> "-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON" "-DOPENMM_BUILD_CUDA_LIB=ON" "-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON" "-DOPENMM_BUILD_RPMD_CUDA_LIB=ON" <del> "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib64/stubs" </del> <ins> "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs" </ins> ]; postInstall = lib.strings.optionalString enablePython '' <del> export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include cd python ${python3Packages.python.interpreter} setup.py build ${python3Packages.python.interpreter} setup.py install --prefix=$out </del> <ins> export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include cd python ${python3Packages.python.interpreter} setup.py build ${python3Packages.python.interpreter} setup.py install --prefix=$out ''; postFixup = '' for lib in $out/lib/plugins/*CUDA.so $out/lib/plugins/*Cuda*.so; do addOpenGLRunpath "$lib" done </ins> ''; <del> doCheck = true; </del> <ins> # Couldn't get CUDA to run properly in the sandbox doCheck = !enableCuda && !enableOpencl; </ins> meta = with lib; { description = "Toolkit for molecular simulation using high performance GPU code";
nvim-client luv coxpcall busted luafilesystem penlight inspect ] )); <ins> codegenLua = if lua.pkgs.isLuaJIT then let deterministicLuajit = lua.override { deterministicStringIds = true; self = deterministicLuajit; }; in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) else lua; </ins> pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); in
# necessary so that nix can handle `UpdateRemotePlugins` for the plugins # it installs. See https://github.com/neovim/neovim/issues/9413. ./system_rplugin_manifest.patch <ins> # make the build reproducible, rebased version of # https://github.com/neovim/neovim/pull/21586 (fetchpatch { name = "neovim-build-make-generated-source-files-reproducible.patch"; url = "https://github.com/raboof/neovim/commit/485dd2af3efbfd174163583c46e0bb2a01ff04f1.patch"; hash = "sha256-9aRVK4lDkL/W4RVjeKptrZFY7rYYBx6/RGR4bQSbCsM="; }) </ins> ]; dontFixCmake = true;
substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; ''; # check that the above patching actually works <del> disallowedReferences = [ stdenv.cc ]; </del> <ins> disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; </ins> cmakeFlags = [ # Don't use downloaded dependencies. At the end of the configurePhase one
++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; <del> preConfigure = lib.optionalString stdenv.isDarwin '' </del> <ins> preConfigure = lib.optionalString lua.pkgs.isLuaJIT '' cmakeFlagsArray+=( "-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -" "-DLUA_GEN_PRG=${codegenLua}/bin/luajit" ) '' + lib.optionalString stdenv.isDarwin '' </ins> substituteInPlace src/nvim/CMakeLists.txt --replace "    util" "" '';
, enableAPICheck ? false , enableVMAssertions ? false , useSystemMalloc ? false <ins> # Upstream generates randomized string id's by default for security reasons # https://github.com/LuaJIT/LuaJIT/issues/626. Deterministic string id's should # never be needed for correctness (that should be fixed in the lua code), # but may be helpful when you want to embed jit-compiled raw lua blobs in # binaries that you want to be reproducible. , deterministicStringIds ? false </ins> , luaAttr ? "luajit_${lib.versions.major version}_${lib.versions.minor version}" } @ inputs: assert enableJITDebugModule -> enableJIT;
++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" <ins> ++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" </ins> ; in stdenv.mkDerivation rec {
]; systemd.services.paperless-scheduler = { <del> description = "Paperless scheduler"; </del> <ins> description = "Paperless Celery Beat"; </ins> serviceConfig = defaultServiceConfig // { User = cfg.user; <del> ExecStart = "${pkg}/bin/paperless-ngx qcluster"; </del> <ins> ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO"; </ins> Restart = "on-failure"; <del> # The `mbind` syscall is needed for running the classifier. SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; # Needs to talk to mail server for automated import rules PrivateNetwork = false; </del> }; environment = env; wantedBy = [ "multi-user.target" ]; <del> wants = [ "paperless-consumer.service" "paperless-web.service" ]; </del> <ins> wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ]; </ins> preStart = '' ln -sf ${manage} ${cfg.dataDir}/paperless-manage
after = [ "redis-paperless.service" ]; }; <ins> systemd.services.paperless-task-queue = { description = "Paperless Celery Workers"; serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = "${pkg}/bin/celery --app paperless worker --loglevel INFO"; Restart = "on-failure"; # The `mbind` syscall is needed for running the classifier. SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; # Needs to talk to mail server for automated import rules PrivateNetwork = false; }; environment = env; }; </ins> # Reading the user-provided password file requires root access systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) { requiredBy = [ "paperless-scheduler.service" ];
}; # Allow the web interface to access the private /tmp directory of the server. # This is required to support uploading files via the web interface. <del> unitConfig.JoinsNamespaceOf = "paperless-scheduler.service"; </del> <ins> unitConfig.JoinsNamespaceOf = "paperless-task-queue.service"; </ins> # Bind to `paperless-scheduler` so that the web server never runs # during migrations bindsTo = [ "paperless-scheduler.service" ];
makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx  --prefix PYTHONPATH : "$PYTHONPATH"  --prefix PATH : "${path}" <ins> makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery  --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src"  --prefix PATH : "${path}" </ins> ''; checkInputs = with python.pkgs.pythonPackages; [
quazip ghc_filesystem tomlplusplus <del> ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; </del> <ins> ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland ++ lib.optional gamemodeSupport gamemode.dev; </ins> cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ];
config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.supergfxctl ]; <del> environment.etc."supergfxd.conf" = lib.mkIf (cfg.settings != null) { source = json.generate "supergfxd.conf" cfg.settings; }; </del> <ins> environment.etc."supergfxd.conf" = lib.mkIf (cfg.settings != null) { source = json.generate "supergfxd.conf" cfg.settings; mode = "0644"; }; </ins> services.dbus.enable = true;
postPatch = '' substituteInPlace OpenBoard.pro  <del> --replace '/usr/include/quazip5' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip'  </del> <ins> --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip'  </ins> --replace '-lquazip5' '-lquazip1-qt5'  <del> --replace '/usr/include/poppler' '${poppler.dev}/include/poppler' </del> <ins> --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' </ins> ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ];
cp -a ${parts}/* parts/ ''; <del> NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; </del> <ins> NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; </ins> qmakeFlags = [ "phoenix.pro"
else if stdenv.hostPlatform.osxMinVersion == "10.5"  then "9" else "8"; <ins> cpu = /**/ if stdenv.hostPlatform.isArmv7 then "armv7" else if stdenv.hostPlatform.isAarch64 then "arm64" else if stdenv.hostPlatform.isx86_32 then "x86" else stdenv.hostPlatform.parsed.cpu.name; </ins> kernel = # Build system doesn't understand BSD, so pretend to be Linux. /**/ if stdenv.isBSD then "linux" else if stdenv.isDarwin then "darwin${darwinVersion}" else stdenv.hostPlatform.parsed.kernel.name; <ins> isGeneric = /**/ (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) || stdenv.hostPlatform.parsed.cpu.name == "armv6l"; target = /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") else null; </ins> in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
(enableFeature (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") <del> ] ++ optionals (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) [ "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${kernel}-gcc" </del> <ins> ] ++ optionals (target != null) [ "--target=${target}" </ins> (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
# The SSH agent protocol doesn't have support for changing TTYs; however we # can simulate this with the `exec` feature of openssh (see ssh_config(5)) # that hooks a command to the shell currently running the ssh program. <del> Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1" </del> <ins> Match host * exec "${pkgs.runtimeShell} -c '${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1'" </ins> ''; environment.extraInit = mkIf cfg.agent.enableSSHSupport ''
systemd.services.nitter = { description = "Nitter (An alternative Twitter front-end)"; wantedBy = [ "multi-user.target" ]; <del> after = [ "network.target" ]; </del> <ins> wants = [ "network-online.target" ]; after = [ "network-online.target" ]; </ins> serviceConfig = { DynamicUser = true; StateDirectory = "nitter";
, zlib }: <ins> let zig_0_10_0 = fetchFromGitHub { owner = "ziglang"; repo = "zig"; rev = "0.10.0"; hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; }; in </ins> stdenv.mkDerivation rec { pname = "zig"; version = "0.9.1";
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; <del> # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) patches = [ ./rpath.patch ]; </del> <ins> patches = [ # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) ./rpath.patch # Fix build on macOS 13 (cherry-picked from 0.10-dev) ./ventura.patch ]; # TODO: remove on next upgrade prePatch = '' cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/ ''; </ins> nativeBuildInputs = [ cmake