jiebi/CodeConvo huggingface dataset:
export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")" '' + '' export DATABASE_URL="${dbUrl}" <del> ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php' </del> <ins> exec ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php' </ins> ''; serviceConfig = { User = "nextcloud";
<del> { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-credential-1password"; version = "1.2.1"; src = fetchFromGitHub { owner = "develerik"; repo = pname; rev = "v${version}"; sha256 = "sha256-8qdUOJ0MOk/xVvp3kDuxNRo3lMEJhLeI3Fle0tuZez0="; }; vendorHash = "sha256-B6BlVnUX4XLT+9EpL63Ht4S8Wo84RsmY99CL+srQfpw="; meta = with lib; { description = "A git credential helper for 1Password"; homepage = "https://github.com/develerik/git-credential-1password"; changelog = "https://github.com/develerik/git-credential-1password/releases/tag/v${version}"; license = licenses.isc; maintainers = [ maintainers.ivankovnatsky ]; mainProgram = "git-credential-1password"; }; } </del>
ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 <ins> git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 </ins> git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // {
git-crecord = callPackage ../applications/version-management/git-crecord { }; <del> git-credential-1password = callPackage ../applications/version-management/git-credential-1password { }; </del> git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; };
x@{builderDefsPackage , gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1 <del> , gnupg, libgcrypt, perl, nettle, yajl </del> <ins> , gnupg, libgcrypt, perl, nettle, yajl, libcap_ng </ins> , ...}: builderDefsPackage (a :
<del> From: Jack Baldry <jack.baldry@grafana.com> Date: Tue, 15 Nov 2022 15:40:31 -0400 Subject: [PATCH] Remove circular definition of AUDIT_FILTER_EXCLUDE https://github.com/osquery/osquery/issues/6551 Signed-off-by: Jack Baldry <jack.baldry@grafana.com> --- libraries/cmake/source/libaudit/src/lib/libaudit.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/cmake/source/libaudit/src/lib/libaudit.h b/libraries/cmake/source/libaudit/src/libaudit.h --- a/libraries/cmake/source/libaudit/src/lib/libaudit.h +++ b/libraries/cmake/source/libaudit/src/lib/libaudit.h @@ -260,7 +260,6 @@ extern "C" { #define AUDIT_KEY_SEPARATOR 0x01 /* These are used in filter control */ -#define AUDIT_FILTER_EXCLUDE	AUDIT_FILTER_TYPE #define AUDIT_FILTER_MASK	0x07	/* Mask to get actual filter */ #define AUDIT_FILTER_UNSET	0x80	/* This value means filter is unset */ -- 2.38.1 </del>
<del> diff --git a/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h b/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h index 4f9baece2..afe947956 100644 --- a/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h +++ b/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h @@ -48,9 +48,9 @@ /* NetBSD 5.0 mis-defines NULL.  */ #include <stddef.h> -/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */ +/* Mac OS X 10.5 defines the locale_t type in <locale.h>.  */ #if 1 -# include <xlocale.h> +# include <locale.h> #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */ diff --git a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h b/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h index 4f9baece2..afe947956 100644 --- a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h +++ b/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h @@ -48,9 +48,9 @@ /* NetBSD 5.0 mis-defines NULL.  */ #include <stddef.h> -/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>.  */ +/* Mac OS X 10.5 defines the locale_t type in <locale.h>.  */ #if 1 -# include <xlocale.h> +# include <locale.h> #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */ </del>
<ins> { stdenvNoCC, lib, autoPatchelfHook, fetchzip }: let version = "1.1.0"; dist = { "x86_64-linux" = { url = "https://github.com/osquery/osquery-toolchain/releases/download/${version}/osquery-toolchain-${version}-x86_64.tar.xz"; hash = "sha256-irekR8a0d+T64+ZObgblsLoc4kVBmb6Gv0Qf8dLDCMk="; }; "aarch64-linux" = { url = "https://github.com/osquery/osquery-toolchain/releases/download/${version}/osquery-toolchain-${version}-aarch64.tar.xz"; hash = "sha256-cQlx9AtO6ggIQqHowa+42wQ4YCMCN4Gb+0qqVl2JElw="; }; }; in stdenvNoCC.mkDerivation { name = "osquery-toolchain-bin"; inherit version; src = fetchzip dist.${stdenvNoCC.hostPlatform.system}; nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' mkdir $out cp -r * $out ''; meta = with lib; { description = "A LLVM-based toolchain for Linux designed to build a portable osquery"; homepage = "https://github.com/osquery/osquery-toolchain"; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ gpl2Only asl20 ]; maintainers = with maintainers; [ squalus ]; }; } </ins>
# requires a relative directory name to create beneath /var/lib StateDirectory = user; StateDirectoryMode = "0750"; <del> ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail"; </del> <ins> ExecStart = "${getExe cfg.package} mail"; </ins> # lowest CPU and IO priority, but both still in best-effort class to prevent starvation Nice=19; IOSchedulingPriority=7;
for line in f: result = line result = re.sub( <del> fr'^    version = ".+"; #{variant}', f'    version = "{version}"; #{variant}', </del> <ins> fr'^      version = ".+"; #{variant}', f'      version = "{version}"; #{variant}', </ins> result) result = re.sub( <del> fr'^    suffix = ".+"; #{variant}', f'    suffix = "{suffix}"; #{variant}', </del> <ins> fr'^      suffix = ".+"; #{variant}', f'      suffix = "{suffix}"; #{variant}', </ins> result) result = re.sub( <del> fr'^    sha256 = ".+"; #{variant}', f'    sha256 = "{sha256}"; #{variant}', </del> <ins> fr'^      sha256 = ".+"; #{variant}', f'      sha256 = "{sha256}"; #{variant}', </ins> result) print(result, end='')
<del> { lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: </del> <ins> { lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args: </ins> let # These names are how they are designated in https://xanmod.org. # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit <del> ltsVariant = { version = "6.6.46"; hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo="; variant = "lts"; }; mainVariant = { version = "6.10.5"; hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA="; variant = "main"; </del> <ins> variants = { lts = { version = "6.6.46"; hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo="; }; main = { version = "6.10.5"; hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA="; }; </ins> }; <del> xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { </del> <ins> xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec { </ins> inherit version; pname = "linux-xanmod"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
<del> { lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: </del> <ins> { lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args: </ins> let # comments with variant added for update script <del> # ./update-zen.py zen zenVariant = { version = "6.10.5"; #zen suffix = "zen1"; #zen sha256 = "08ibz7560xsmlnrm8j13hxf8hjjcxfmnjdrwffqc81g9g6rvpqra"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { version = "6.10.5"; #lqx suffix = "lqx1"; #lqx sha256 = "09rscj20j94qkmvk0hlpjm6v1n1ndnkv2vl035gsp5lwggws2jqm"; #lqx isLqx = true; </del> <ins> variants = { # ./update-zen.py zen zen = { version = "6.10.5"; #zen suffix = "zen1"; #zen sha256 = "08ibz7560xsmlnrm8j13hxf8hjjcxfmnjdrwffqc81g9g6rvpqra"; #zen isLqx = false; }; # ./update-zen.py lqx lqx = { version = "6.10.5"; #lqx suffix = "lqx1"; #lqx sha256 = "09rscj20j94qkmvk0hlpjm6v1n1ndnkv2vl035gsp5lwggws2jqm"; #lqx isLqx = true; }; </ins> }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { inherit version;
# https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708 zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix; <del> linux_zen = (zenKernels { </del> <ins> linux_zen = zenKernels { variant = "zen"; </ins> kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; <del> }).zen; </del> <ins> }; </ins> <del> linux_lqx = (zenKernels { </del> <ins> linux_lqx = zenKernels { variant = "lqx"; </ins> kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; <del> }).lqx; </del> <ins> }; </ins> # This contains the variants of the XanMod kernel <del> xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix { </del> <ins> xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix; linux_xanmod = xanmodKernels { variant = "lts"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; linux_xanmod_stable = xanmodKernels { variant = "main"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; linux_xanmod_latest = xanmodKernels { variant = "main"; </ins> kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; <del> linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = xanmodKernels.main; linux_xanmod_latest = xanmodKernels.main; </del> linux_libre = deblobKernel packageAliases.linux_default.kernel;
environment.systemPackages = [ cfg.package ]; environment.etc = let <del> # generate contents for /etc/systemd/system-${type} from attrset of links and packages hooks = type: links: pkgs.runCommand "system-${type}" { </del> <ins> # generate contents for /etc/systemd/${dir} from attrset of links and packages hooks = dir: links: pkgs.runCommand "${dir}" { </ins> preferLocalBuild = true; packages = cfg.packages; } ''
${cfg.sleep.extraConfig} ''; <del> "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; </del> <ins> "systemd/user-generators" = { source = hooks "user-generators" cfg.user.generators; }; "systemd/system-generators" = { source = hooks "system-generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "system-shutdown" cfg.shutdown; }; </ins> }); services.dbus.enable = true;
}; }; <ins> systemd.user.generators = mkOption { type = types.attrsOf types.path; default = {}; example = { systemd-gpt-auto-generator = "/dev/null"; }; description = '' Definition of systemd generators; see {manpage}`systemd.generator(5)`. For each `NAME = VALUE` pair of the attrSet, a link is generated from `/etc/systemd/user-generators/NAME` to `VALUE`. ''; }; </ins> systemd.additionalUpstreamUserUnits = mkOption { default = []; type = types.listOf types.str;
import ../make-test-python.nix ( <del> { pkgs, lib, ... }: { </del> <ins> { pkgs, lib, ... }: let quadletContainerFile = pkgs.writeText "quadlet.container" '' [Unit] Description=A test quadlet container [Container] Image=localhost/scratchimg:latest Exec=bash -c 'trap exit SIGTERM SIGINT; while true; do sleep 1; done' ContainerName=quadlet Volume=/nix/store:/nix/store Volume=/run/current-system/sw/bin:/bin [Install] WantedBy=default.target ''; in { </ins> name = "podman"; meta = { maintainers = lib.teams.podman.members;
with subtest("A podman non-member can not use the docker cli"): docker.fail(su_cmd("docker version", user="mallory")) <ins> with subtest("A rootless quadlet container service is created"): dir = "/home/alice/.config/containers/systemd" rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) rootless.succeed(su_cmd(f"mkdir -p {dir}")) rootless.succeed(su_cmd(f"cp -f ${quadletContainerFile} {dir}/quadlet.container")) rootless.systemctl("daemon-reload", "alice") rootless.systemctl("start quadlet", "alice") rootless.wait_until_succeeds(su_cmd("podman ps | grep quadlet"), timeout=20) rootless.systemctl("stop quadlet", "alice") </ins> # TODO: add docker-compose test '';
buildInputs = let # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps; <del> in [ lua.pkgs.luarocks ] </del> <ins> in [ luarocks_bootstrap ] </ins> ++ buildInputs ++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs) ++ (map (d: d.dep) externalDeps')
}; }) {}; <ins> luarocks = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks"; version = "3.11.0-1"; knownRockspec = (fetchurl { url    = "mirror://luarocks/luarocks-3.11.0-1.rockspec"; sha256 = "0pi55445dskpw6nhrq52589h4v39fsf23c0kp8d4zg2qaf6y2n38"; }).outPath; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v3.11.0"; hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; }; meta = { homepage = "http://www.luarocks.org"; description = "A package manager for Lua modules."; maintainers = with lib.maintainers; [ mrcjkb teto ]; license.fullName = "MIT"; }; }) {}; </ins> luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks-build-rust-mlua";
]; }); <ins> # As a nix user, use this derivation instead of "luarocks_bootstrap" luarocks = prev.luarocks.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles lua unzip ]; # cmake is just to compile packages with "cmake" buildType, not luarocks itself dontUseCmakeConfigure = true; propagatedBuildInputs = [ zip unzip cmake ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks  --bash <($out/bin/luarocks completion bash)  --fish <($out/bin/luarocks completion fish)  --zsh <($out/bin/luarocks completion zsh) installShellCompletion --cmd luarocks-admin  --bash <($out/bin/luarocks-admin completion bash)  --fish <($out/bin/luarocks-admin completion fish)  --zsh <($out/bin/luarocks-admin completion zsh) ''; meta = oa.meta // { mainProgram = "luarocks"; }; }); </ins> luasec = prev.luasec.overrideAttrs (oa: { externalDeps = [ { name = "OPENSSL"; dep = openssl; }
<ins> /* This is a minimal/manual luarocks derivation used by `buildLuarocksPackage` to install lua packages. As a nix user, you should use the generated lua.pkgs.luarocks that contains a luarocks manifest which makes it recognizable to luarocks. Generating the manifest for luarocks_bootstrap seemed too hackish, which is why we end up with two "luarocks" derivations. */ </ins> { lib , stdenv , fetchFromGitHub
inherit (pkgs.buildPackages) makeSetupHook makeWrapper; }; <del> luarocks = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { }); </del> <ins> luarocks_bootstrap = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { }); </ins> # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = toLuaModule (callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { });
wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec { version = "2.3.1"; <del> src = oldAttrs.src.override { </del> <ins> src = fetchPypi { pname = "WTForms"; </ins> inherit version; sha256 = "sha256-hhoTs65SHWcA2sOydxlwvTVKY7pwQ+zDqCtSiFlqGXI="; };
<ins> { lib, buildPythonPackage, fetchFromGitHub, backoff, httpx, idna, langchain, llama-index, openai, packaging, poetry-core, pydantic, pythonRelaxDepsHook, wrapt, }: buildPythonPackage rec { pname = "langfuse"; version = "2.33.1"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; hash = "sha256-ZPCL3Xle4qEw2pNIcja252meep26W/RbVEk2suzywYI="; }; build-system = [ poetry-core ]; nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "packaging" ]; dependencies = [ backoff httpx idna packaging pydantic wrapt ]; optional-dependencies = { langchain = [ langchain ]; llama-index = [ llama-index ]; openai = [ openai ]; }; pythonImportsCheck = [ "langfuse" ]; # tests require network access and openai api key doCheck = false; meta = { description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; homepage = "https://github.com/langfuse/langfuse-python"; changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; } </ins>
python3.pkgs.buildPythonApplication rec { pname = "radicale"; <del> version = "3.2.1"; </del> <ins> version = "3.2.0"; </ins> pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; <del> hash = "sha256-OUwznn71xl8oWkw90fT1NYYZOuD83k+B5zLhygp1VQQ="; </del> <ins> hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ="; </ins> }; postPatch = ''
# This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html <del> src = fetchgit { url = "https://repo.or.cz/syslinux"; </del> <ins> src = fetchFromRepoOrCz { repo = "syslinux"; </ins> rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; <del> sha256 = "sha256-GqvRTr9mA2yRD0G0CF11x1X0jCgqV4Mh+tvE0/0yjqk="; fetchSubmodules = true; </del> <ins> hash = "sha256-XNC+X7UYxdMQQAg4MLACQLxRNnI5/ZCOiCJrEkKgPeM="; </ins> }; patches = let
"0018-prevent-pow-optimization.patch" "26f0e7b2" "sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=") <ins> # Fixes build with "modern" gnu-efi ./import-efisetjmp.patch </ins> ]; postPatch = '' <del> substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) </del> <ins> substituteInPlace Makefile --replace-fail /bin/pwd $(type -P pwd) substituteInPlace utils/ppmtolss16 --replace-fail /usr/bin/perl $(type -P perl) </ins> # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h  <del> --replace /usr/include/ "" # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir gnu-efi/inc/ia32/gnu touch gnu-efi/inc/ia32/gnu/stubs-32.h </del> <ins> --replace-fail /usr/include/ "" </ins> ''; nativeBuildInputs = [
"MANDIR=$(out)/share/man" "PERL=perl" "HEXDATE=0x00000000" <ins> # Works around confusing (unrelated) error messages when upx is not made available "UPX=false" # Configurations needed to make use of external gnu-efi "LIBEFI=${gnu-efi}/lib/libefi.a" "LIBDIR=${gnu-efi}/lib/" "EFIINC=${gnu-efi}/include/efi" # Legacy bios boot target is always built "bios" </ins> ] <del> ++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; </del> <ins> # Build "ia32" EFI for i686 ++ lib.optional stdenv.hostPlatform.isi686 "efi32" # Build "x86_64" EFI for x86_64 ++ lib.optional stdenv.hostPlatform.isx86_64 "efi64" ; </ins> # Some tests require qemu, some others fail in a sandboxed environment doCheck = false;
rm -rf $out/share/syslinux/com32 ''; <ins> passthru.tests.biosCdrom = nixosTests.boot.biosCdrom; </ins> meta = with lib; { <del> homepage = "http://www.syslinux.org/"; </del> <ins> homepage = "https://www.syslinux.org/"; </ins> description = "A lightweight bootloader"; license = licenses.gpl2Plus; maintainers = [ maintainers.samueldr ];
<ins> From 68defee52f4eba82eefaeea17f21c7498448dd6b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel <samuel@dionne-riel.com> Date: Mon, 3 Jun 2024 16:16:25 -0400 Subject: [PATCH] efi/efi.h: Add efisetjmp.h See https://github.com/ncroxon/gnu-efi/commit/486ba3c3bdd147b7d98159b9e650be60bce0f027 --- efi/efi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/efi/efi.h b/efi/efi.h index c266532f3..e4497574b 100644 --- a/efi/efi.h +++ b/efi/efi.h @@ -23,6 +23,7 @@ #include <efi.h> #include <efilib.h> #include <efistdarg.h> +#include <efisetjmp.h> /* Delay for 100 ms */ #define EFI_NOMAP_PRINT_DELAY	100 </ins>
<ins> { lib, stdenv, fetchFromGitHub, rustPlatform, cargo, rustc, meson, ninja, pkg-config, appstream, blueprint-compiler, desktop-file-utils, gettext, wrapGAppsHook4, libadwaita, }: stdenv.mkDerivation (finalAttrs: { pname = "keypunch"; version = "1.0"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "keypunch"; rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-S4RckHwrVVQrxy9QngTisNM4+cMM+1dXucwEDnM98Rg="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; inherit (finalAttrs) src; hash = "sha256-YzENAGy7zEu1dyuhme+x+gJQlE74Vw0JZvRso0vNQXs="; }; strictDeps = true; nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo rustc meson ninja pkg-config appstream blueprint-compiler desktop-file-utils gettext wrapGAppsHook4 ]; buildInputs = [ libadwaita ]; meta = { description = "Practice your typing skills"; homepage = "https://github.com/bragefuglseth/keypunch"; license = lib.licenses.gpl3Plus; mainProgram = "keypunch"; maintainers = with lib.maintainers; [ tomasajt ]; }; }) </ins>
buildInputs = [ libffi libxml2 <ins> llvm </ins> zlib ] ++ lib.optionals (!stdenv.isDarwin) [ libclang ]; cmakeFlags = [ <del> (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getDev libclang}") </del> <ins> (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}") </ins> (lib.cmakeBool "SPHINX_HTML" withHTML) (lib.cmakeBool "SPHINX_MAN" withManual) ] ++ lib.optionals stdenv.isDarwin [ (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") ]; <del> # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all doCheck = false; </del> <ins> doCheck = true; </ins> strictDeps = true; <del> # -E exclude 4 tests based on names # see https://github.com/CastXML/CastXML/issues/90 checkPhase = '' runHook preCheck ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd' runHook postCheck ''; </del> <ins> passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; </ins> meta = { homepage = "https://github.com/CastXML/CastXML";
ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore ''; <ins> # muse-sounds-manager installs Muse Sounds sampler libMuseSamplerCoreLib.so. # It requires that argv0 of the calling process ends with "/mscore" or "/MuseScore-4". # We need to ensure this in two cases: # # 1) when the user invokes MuseScore as "mscore" on the command line or from #    the .desktop file, and the normal argv0 is "mscore" (no "/"); # 2) when MuseScore invokes itself via File -> New, and the normal argv0 is #    the target of /proc/self/exe, which in Nixpkgs was "{...}/.mscore-wrapped" # # In order to achieve (2) we install the final binary as $out/libexec/mscore, and # in order to achieve (1) we use makeWrapper without --inherit-argv0. # # wrapQtAppsHook uses wrapQtApp -> wrapProgram -> makeBinaryWrapper --inherit-argv0 # so we disable it and explicitly use makeQtWrapper. # # TODO: check if something like this is also needed for macOS. dontWrapQtApps = stdenv.isLinux; postFixup = lib.optionalString stdenv.isLinux '' mkdir -p $out/libexec mv $out/bin/mscore $out/libexec makeQtWrapper $out/libexec/mscore $out/bin/mscore ''; </ins> # Don't run bundled upstreams tests, as they require a running X window system. doCheck = false;