jiebi/CodeConvo huggingface dataset:
<ins> { lib, buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "pathvalidate"; version = "2.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "sha256-PJvZTH7CPpz7IR/741audfl51sCZosdF7pSQ9STzJGg="; }; # Requires `pytest-md-report`, causing infinite recursion. doCheck = false; pythonImportsCheck = [ "pathvalidate" ]; meta = with lib; { description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc"; homepage = "https://github.com/thombashi/pathvalidate"; license = licenses.mit; maintainers = with maintainers; [ oxalica ]; }; } </ins>
<ins> { lib, buildPythonPackage, fetchPypi, pyscard, ecdsa, pyaes , pythonOlder }: buildPythonPackage rec { pname = "pysatochip"; version = "0.11.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-Jj/zZIS9aXmZ2xdi29Eun7iRIrIk9oBlrtN9+6opIMo="; }; propagatedBuildInputs = [ pyscard ecdsa pyaes ]; pythonImportsCheck = [ "pysatochip" ]; meta = with lib; { description = "Simple python library to communicate with a Satochip hardware wallet"; homepage = "https://github.com/Toporin/pysatochip"; license = licenses.lgpl3Only; maintainers = with maintainers; [ oxalica ]; }; } </ins>
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev <del> { lib, buildGoPackage, zip, fetchFromGitHub }: </del> <ins> { lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }: </ins> let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; <del> rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82"; sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; </del> <ins> rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106"; sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA="; </ins> }; in buildGoPackage rec { pname = "teleport"; <del> version = "5.1.2"; </del> <ins> version = "5.2.1"; </ins> # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; <del> sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh"; </del> <ins> sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08="; </ins> }; goPackagePath = "github.com/gravitational/teleport"; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; <del> nativeBuildInputs = [ zip ]; </del> <ins> nativeBuildInputs = [ zip makeWrapper ]; </ins> postBuild = '' pushd .
, qttools , taglib , zlib <ins> , python3 </ins> }: <ins> let py = python3.withPackages (ps: with ps; [ pydbus ]); in </ins> mkDerivation rec { <del> pname = "sayonara-player"; version = "1.6.0-beta6"; </del> <ins> pname = "sayonara"; version = "1.6.0-beta7"; </ins> src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; <del> sha256 = "sha256-SbJS0DQvbW++CNXbuDHQxFlLRb1kTtDdIdHOqu0YxeQ="; </del> <ins> sha256 = "14svszfldx32vn937rszd21rgl31vb5kzs0hnrg41ygx0br61rvd"; </ins> }; nativeBuildInputs = [ cmake ninja pkg-config qttools ];
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; <ins> passthru = { updateScript = nix-update-script { attrPath = pname; }; }; </ins> meta = with lib; { description = "Sayonara music player"; homepage = "https://sayonara-player.com/";
propagatedBuildInputs = [ ncurses zlib ]; <ins> patches = [ # Force a test to evaluate the saved benchmark for a CPU for which LLVM has # an execution model. See NixOS/nixpkgs#119673. ../../exegesis-force-bdver2.patch ]; </ins> postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake  --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)"
<ins> diff --git a/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s b/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s index 3fc1f31d54dc..a4c9bdd92131 100644 --- a/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s +++ b/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s @@ -1,5 +1,6 @@ # RUN: llvm-exegesis -mode=uops -opcode-name=CMOV16rm  -benchmarks-file=%t.CMOV16rm-uops.yaml # RUN: FileCheck -check-prefixes=CHECK-YAML -input-file=%t.CMOV16rm-uops.yaml %s +# RUN: sed -i 's,cpu_name:.*,cpu_name: bdver2,g' %t.CMOV16rm-uops.yaml # RUN: llvm-exegesis -mcpu=bdver2 -mode=analysis -benchmarks-file=%t.CMOV16rm-uops.yaml -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.1 -analysis-inconsistency-epsilon=0.1 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS %s # https://bugs.llvm.org/show_bug.cgi?id=41448 </ins>
# This file is autogenerated from update.sh in the same directory. <del> # VHASH: 545cfbcd1fc31d037d1e6b5382995075d2a875a51d181cc26851e49dbd2227d8 </del> <ins> # VHASH: c9500486764a2433d0f059134a981eb9adccd3546a6f779bc0e05cdcb26d2ae6 </ins> { dev = { <del> version = "22.0.1207.1"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1207.1.tar.bz2"; sha256 = "1kzzaaczz1mwsfw7fn8la6h4yls2wy537ypabqgwyim01jhfmilp"; </del> <ins> version = "22.0.1221.1"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1221.1.tar.bz2"; sha256 = "08cx2im0ng1dg83mk8jlx4in7v8f5vsf9y2ild0i22jb20c7h31s"; </ins> }; beta = { <del> version = "21.0.1180.41"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.41.tar.bz2"; sha256 = "1225ny7y5msyk44lb5dspd4aq0yiaawsb5xi9g8iimiv80j4h34a"; </del> <ins> version = "21.0.1180.57"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2"; sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri"; </ins> }; stable = { <del> version = "20.0.1132.57"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2"; sha256 = "06v4ybvaj3gx1v4visfyfzbq2q3xasa8xlf05f4wi2bf62vcc98j"; </del> <ins> version = "21.0.1180.57"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2"; sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri"; </ins> }; }
sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g="; }; <del> sourceRoot = "./src"; </del> <ins> sourceRoot = "${src.name}/src"; </ins> meta = with lib; { homepage = "http://michaelcmartin.github.io/Ophis/";
''; serviceConfig = { ExecStart = '' <del> ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m  </del> <ins> ${pkgs.jre8}/bin/java -Xmx${toString cfg.maxMemory}m  </ins> -Dairsonic.home=${cfg.home}  -Dserver.address=${cfg.listenAddress}  -Dserver.port=${toString cfg.port}
<ins> import ./make-test-python.nix ({ pkgs, ... }: { name = "airsonic"; meta = with pkgs.lib.maintainers; { maintainers = [ sumnerevans ]; }; machine = { pkgs, ... }: { services.airsonic = { enable = true; maxMemory = 800; }; # Airsonic is a Java application, and unfortunately requires a significant # amount of memory. virtualisation.memorySize = 1024; }; testScript = '' def airsonic_is_up(_) -> bool: return machine.succeed("curl --fail http://localhost:4040/login") machine.start() machine.wait_for_unit("airsonic.service") machine.wait_for_open_port(4040) with machine.nested("Waiting for UI to work"): retry(airsonic_is_up) ''; }) </ins>
_3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; agda = handleTest ./agda.nix {}; <ins> airsonic = handleTest ./airsonic.nix {}; </ins> amazon-init-shell = handleTest ./amazon-init-shell.nix {}; ammonite = handleTest ./ammonite.nix {}; atd = handleTest ./atd.nix {};
freeformType = let validSettingsPrimitiveTypes = oneOf [ int str bool float ]; validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ]; <del> settingsType = (attrsOf validSettingsTypes); in attrsOf (oneOf [ string settingsType (listOf settingsType) ]) </del> <ins> settingsType = oneOf [ str (attrsOf validSettingsTypes) ]; in attrsOf (oneOf [ settingsType (listOf settingsType) ]) </ins> // { description = '' unbound.conf configuration type. The format consist of an attribute set of settings. Each settings can be either one value, a list of
<ins> { lib, fetchurl, appimageTools, }: let pname = "ytmdesktop"; version = "1.13.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${version}/YouTube-Music-Desktop-App-${version}.AppImage"; sha256 = "0f5l7hra3m3q9zd0ngc9dj4mh1lk0rgicvh9idpd27wr808vy28v"; }; appimageContents = appimageTools.extract { inherit name src; }; in appimageTools.wrapType2 rec { inherit name src; extraInstallCommands = '' mv $out/bin/{${name},${pname}} install -m 444  -D ${appimageContents}/youtube-music-desktop-app.desktop  -t $out/share/applications substituteInPlace  $out/share/applications/youtube-music-desktop-app.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { description = "A Desktop App for YouTube Music"; homepage = "https://ytmdesktop.app/"; license = licenses.cc0; platforms = platforms.linux; maintainers = [ maintainers.lgcl ]; }; } </ins>
</listitem> <listitem> <para> <ins> The WireGuard module gained a new option <option>networking.wireguard.interfaces.&lt;name&gt;.peers.*.dynamicEndpointRefreshSeconds</option> that implements refreshing the IP of DNS-based endpoints periodically (which WireGuard itself <link xlink:href="https://lists.zx2c4.com/pipermail/wireguard/2017-November/002028.html">cannot do</link>). </para> </listitem> <listitem> <para> </ins> MariaDB has been updated to 10.5. Before you upgrade, it would be best to take a backup of your database and read <link xlink:href="https://mariadb.com/kb/en/upgrading-from-mariadb-104-to-mariadb-105/#incompatible-changes-between-104-and-105">
example = "demo.wireguard.io:12913"; type = with types; nullOr str; description = ''Endpoint IP or hostname of the peer, followed by a colon, <del> and then a port number of the peer.''; </del> <ins> and then a port number of the peer. Warning for endpoints with changing IPs: The WireGuard kernel side cannot perform DNS resolution. Thus DNS resolution is done once by the <literal>wg</literal> userspace utility, when setting up WireGuard. Consequently, if the IP address behind the name changes, WireGuard will not notice. This is especially common for dynamic-DNS setups, but also applies to any other DNS-based setup. If you do not use IP endpoints, you likely want to set <option>networking.wireguard.dynamicEndpointRefreshSeconds</option> to refresh the IPs periodically. ''; }; dynamicEndpointRefreshSeconds = mkOption { default = 0; example = 5; type = with types; int; description = '' Periodically re-execute the <literal>wg</literal> utility every this many seconds in order to let WireGuard notice DNS / hostname changes. Setting this to <literal>0</literal> disables periodic reexecution. ''; </ins> }; persistentKeepalive = mkOption {
''; }; <del> generatePeerUnit = { interfaceName, interfaceCfg, peer }: </del> <ins> peerUnitServiceName = interfaceName: publicKey: dynamicRefreshEnabled: </ins> let keyToUnitName = replaceChars [ "/" "-"    " "     "+"     "="      ] [ "-" "x2d" "x20" "x2b" "x3d" ]; <del> unitName = keyToUnitName peer.publicKey; </del> <ins> unitName = keyToUnitName publicKey; refreshSuffix = optionalString dynamicRefreshEnabled "-refresh"; in "wireguard-${interfaceName}-peer-${unitName}${refreshSuffix}"; generatePeerUnit = { interfaceName, interfaceCfg, peer }: let </ins> psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey
dst = interfaceCfg.interfaceNamespace; ip = nsWrap "ip" src dst; wg = nsWrap "wg" src dst; <del> in nameValuePair "wireguard-${interfaceName}-peer-${unitName}" </del> <ins> dynamicRefreshEnabled = peer.dynamicEndpointRefreshSeconds != 0; # We generate a different name (a `-refresh` suffix) when `dynamicEndpointRefreshSeconds` # to avoid that the same service switches `Type` (`oneshot` vs `simple`), # with the intent to make scripting more obvious. serviceName = peerUnitServiceName interfaceName peer.publicKey dynamicRefreshEnabled; in nameValuePair serviceName </ins> { description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}"; requires = [ "wireguard-${interfaceName}.service" ];
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; path = with pkgs; [ iproute2 wireguard-tools ]; <del> serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; </del> <ins> serviceConfig = if !dynamicRefreshEnabled then { Type = "oneshot"; RemainAfterExit = true; } else { Type = "simple"; # re-executes 'wg' indefinitely # Note that `Type = "oneshot"` services with `RemainAfterExit = true` # cannot be used with systemd timers (see `man systemd.timer`), # which is why `simple` with a loop is the best choice here. # It also makes starting and stopping easiest. }; </ins> script = let <del> wg_setup = "${wg} set ${interfaceName} peer ${peer.publicKey}" + optionalString (psk != null) " preshared-key ${psk}" + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"; </del> <ins> wg_setup = concatStringsSep " " ( [ ''${wg} set ${interfaceName} peer "${peer.publicKey}"'' ] ++ optional (psk != null) ''preshared-key "${psk}"'' ++ optional (peer.endpoint != null) ''endpoint "${peer.endpoint}"'' ++ optional (peer.persistentKeepalive != null) ''persistent-keepalive "${toString peer.persistentKeepalive}"'' ++ optional (peer.allowedIPs != []) ''allowed-ips "${concatStringsSep "," peer.allowedIPs}"'' ); </ins> route_setup = optionalString interfaceCfg.allowedIPsAsRoutes (concatMapStringsSep "n" (allowedIP: <del> "${ip} route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" </del> <ins> ''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"'' </ins> ) peer.allowedIPs); in '' ${wg_setup} ${route_setup} <ins> ${optionalString (peer.dynamicEndpointRefreshSeconds != 0) '' # Re-execute 'wg' periodically to notice DNS / hostname changes. # Note this will not time out on transient DNS failures such as DNS names # because we have set 'WG_ENDPOINT_RESOLUTION_RETRIES=infinity'. # Also note that 'wg' limits its maximum retry delay to 20 seconds as of writing. while ${wg_setup}; do sleep "${toString peer.dynamicEndpointRefreshSeconds}"; done ''} </ins> ''; postStop = let route_destroy = optionalString interfaceCfg.allowedIPsAsRoutes (concatMapStringsSep "n" (allowedIP: <del> "${ip} route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" </del> <ins> ''${ip} route delete "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"'' </ins> ) peer.allowedIPs); in '' <del> ${wg} set ${interfaceName} peer ${peer.publicKey} remove </del> <ins> ${wg} set "${interfaceName}" peer "${peer.publicKey}" remove </ins> ${route_destroy} ''; };
${values.preSetup} <del> ${ipPreMove} link add dev ${name} type wireguard ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) "${ipPreMove} link set ${name} netns ${ns}"} </del> <ins> ${ipPreMove} link add dev "${name}" type wireguard ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"''} </ins> ${concatMapStringsSep "n" (ip: <del> "${ipPostMove} address add ${ip} dev ${name}" </del> <ins> ''${ipPostMove} address add "${ip}" dev "${name}"'' </ins> ) values.ips} <del> ${wg} set ${name} private-key ${privKey} ${ optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"} </del> <ins> ${concatStringsSep " " ( [ ''${wg} set "${name}" private-key "${privKey}"'' ] ++ optional (values.listenPort != null) ''listen-port "${toString values.listenPort}"'' )} </ins> <del> ${ipPostMove} link set up dev ${name} </del> <ins> ${ipPostMove} link set up dev "${name}" </ins> ${values.postSetup} ''; postStop = '' <del> ${ipPostMove} link del dev ${name} </del> <ins> ${ipPostMove} link del dev "${name}" </ins> ${values.postShutdown} ''; };
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; <del> sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; </del> <ins> sha256 = "0awiyvicvcn3b18x0vx5ik3ly0k3k51ivz2ljj8pnx6ms95nyp2n"; </ins> }; prePatch = "patchShebangs .";
, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau <del> , libglvnd , enableRadv ? true </del> <ins> , libglvnd, libunwind </ins> , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"]
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; <del> sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; </del> <ins> sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz"; </ins> }; prePatch = "patchShebangs .";
url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) <ins> # For RISC-V support: (fetchpatch { name = "add-riscv-default-selections.patch"; url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch"; sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w"; }) </ins> ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] <ins> ++ lib.optionals stdenv.isDarwin [ libunwind ] </ins> ++ lib.optional withValgrind valgrind-light; depsBuildBuild = [ pkg-config ];
#include "pipe/p_compiler.h" #include "pipe/p_state.h" <del> --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h </del> <ins> --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h </ins> @@ -28,6 +28,8 @@ #ifndef RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H +#include <sys/types.h> + <del> #include "radv_radeon_winsys.h" #include "ac_gpu_info.h" #include "addrlib/addrinterface.h"<Paste> </del> <ins> #include <amdgpu.h> #include <pthread.h> #include "util/list.h" </ins>
buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; <del> version = "1.10.0"; </del> <ins> version = "2.0.0"; </ins> <del> vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0="; </del> <ins> vendorSha256 = "sha256-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8="; </ins> doCheck = false;
owner = "drone"; repo = "drone"; rev = "v${version}"; <del> sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; </del> <ins> sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80="; </ins> }; preBuild = ''
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { <del> x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; </del> <ins> x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; </ins> armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
{ lib, stdenv, fetchurl, bash, jre }: let mcVersion = "1.16.5"; <del> buildNum = "488"; </del> <ins> buildNum = "771"; </ins> jar = fetchurl { <del> url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; sha256 = "07zgq6pfgwd9a9daqv1dab0q8cwgidsn6sszn7bpr37y457a4ka8"; </del> <ins> url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l"; </ins> }; in stdenv.mkDerivation { pname = "papermc";
<ins> { lib , stdenvNoCC , fetchFromGitHub }: stdenvNoCC.mkDerivation rec { pname = "mutt-wizard"; version = "3.2.1"; src = fetchFromGitHub { owner = "LukeSmithxyz"; repo = "mutt-wizard"; rev = "v${version}"; sha256 = "1m4s0vj57hh38rdgdc28p10vnsq80dh708imvdgxbj1i96nq41r8"; }; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "System for automatically configuring mutt and isync"; homepage = "https://github.com/LukeSmithxyz/mutt-wizard"; license = licenses.gpl3Plus; maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; }; } </ins>
src = fetchurl { url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; <del> sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p"; </del> <ins> sha256 = "0w4d0rxi54p8lvbynypcywqqwbbzmyyzc0svjab27ngmdj1034ii"; </ins> }; dontUnpack = true;
src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; <del> sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh"; </del> <ins> sha256 = "07irlhkvziv51cp5zn1yz8ljfnrnfjcykv5pgfwmpslw3nl5szxv"; </ins> }; nativeBuildInputs = [
export AR="${ar}" ''; <del> mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; </del> <ins> mesonFlags = [ "--buildtype=release" "-Db_lto=true" "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" ]; </ins> # build and run binary generating PGO profiles, # then reconfigure to build the normal foot binary utilizing PGO
llvm-profdata merge default_*profraw --output=default.profdata ''; <ins> outputs = [ "out" "terminfo" ]; # make sure nix-env and buildEnv also include the # terminfo output when the package is installed postInstall = '' mkdir -p "$out/nix-support" echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" ''; </ins> passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv;
<ins> diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp --- a/lib/sanitizer_common/sanitizer_mac.cpp +++ b/lib/sanitizer_common/sanitizer_mac.cpp @@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { // Offset example: // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 constexpr u16 GetOSMajorKernelOffset() { -  if (TARGET_OS_OSX) return 4; -  if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -  if (TARGET_OS_WATCH) return 13; +#if TARGET_OS_OSX +  return 4; +#endif +#if TARGET_OS_IOS || TARGET_OS_TV +  return 6; +#endif +#if TARGET_OS_WATCH +  return 13; +#endif } using VersStr = char[64]; @@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { u16 os_major = kernel_major - offset; const char *format = "%d.0"; -  if (TARGET_OS_OSX) { -    if (os_major >= 16) {  // macOS 11+ -      os_major -= 5; -    } else {  // macOS 10.15 and below -      format = "10.%d"; -    } +#if TARGET_OS_OSX +  if (os_major >= 16) {  // macOS 11+ +    os_major -= 5; +  } else {  // macOS 10.15 and below +    format = "10.%d"; } +#endif return internal_snprintf(vers, sizeof(VersStr), format, os_major); } @@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { // Aligned versions example: // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 static void MapToMacos(u16 *major, u16 *minor) { -  if (TARGET_OS_OSX) -    return; - -  if (TARGET_OS_IOS || TARGET_OS_TV) +#if !TARGET_OS_OSX +#if TARGET_OS_IOS || TARGET_OS_TV *major += 2; -  else if (TARGET_OS_WATCH) +#elif TARGET_OS_WATCH *major += 9; -  else +#else UNREACHABLE("unsupported platform"); +#endif if (*major >= 16) {  // macOS 11+ *major -= 5; @@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { *minor = *major; *major = 10; } +#endif } static MacosVersion GetMacosAlignedVersionInternal() { </ins>