jiebi/CodeConvo huggingface dataset:
<ins> { buildFHSEnv, envision-unwrapped }: buildFHSEnv { name = "envision"; extraOutputsToInstall = [ "dev" ]; strictDeps = true; targetPkgs = pkgs: [ pkgs.envision-unwrapped ] ++ (with pkgs; [ glibc gcc ]) ++ ( # OpenHMD dependencies pkgs.openhmd.buildInputs ++ pkgs.openhmd.nativeBuildInputs ) ++ ( # OpenComposite dependencies pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost ] ) ++ ( # Monado dependencies ( pkgs.monado.buildInputs ++ pkgs.monado.nativeBuildInputs ++ (with pkgs; [ # Additional dependencies required by Monado when built using Envision mesa shaderc xorg.libX11 xorg.libxcb xorg.libXrandr xorg.libXrender xorg.xorgproto ]) ) ) ++ ( # SteamVR driver dependencies [ pkgs.zlib ]) ++ ( # WiVRn dependencies # TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged (with pkgs; [ avahi cmake cli11 ffmpeg git gst_all_1.gstreamer gst_all_1.gst-plugins-base libmd libdrm libpulseaudio libva ninja nlohmann_json openxr-loader pipewire systemdLibs # udev vulkan-loader vulkan-headers x264 ]) ++ (with pkgs; [ android-tools # For adb installing WiVRn APKs ]) ); profile = '' export CMAKE_LIBRARY_PATH=/usr/lib export CMAKE_INCLUDE_PATH=/usr/include export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig ''; extraInstallCommands = '' mkdir -p $out/share/applications $out/share/metainfo ln -s ${envision-unwrapped}/share/envision $out/share ln -s ${envision-unwrapped}/share/icons $out/share ln -s ${envision-unwrapped}/share/applications/org.gabmus.envision.desktop $out/share/applications ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo ''; runScript = "envision"; meta = envision-unwrapped.meta // { description = "${envision-unwrapped.meta.description} (with build environment)"; }; } </ins>
postPatch = '' substituteInPlace pyproject.toml setup.py  --replace "setuptools_scm < 8.0.0" "setuptools_scm" <ins> '' + lib.optionalString (pythonAtLeast "3.12") '' substituteInPlace ./cmake_modules/FindPython3Alt.cmake --replace-fail  "from distutils import sysconfig"  "import sysconfig" </ins> ''; nativeBuildInputs = [
<ins> { lib , buildPythonPackage , hypothesis , fetchpatch , fetchPypi , setuptools , setuptools-scm , cloudpickle , cython , jinja2 , numpy , psutil , pynvml , pytestCheckHook , pythonOlder , rich }: buildPythonPackage rec { pname = "scalene"; version = "1.5.38"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-LR1evkn2m6FNBmJnUUJubesxIPeHG6RDgLFBHDuxe38="; }; patches = [ # fix scalene_config import. remove on next update (fetchpatch { name = "scalene_config-import-fix.patch"; url = "https://github.com/plasma-umass/scalene/commit/cd437be11f600ac0925ce77efa516e6d83934200.patch"; hash = "sha256-YjFh+mu5jyIJYUQFhmGqLXhec6lgQAdj4tWxij3NkwU="; }) ]; nativeBuildInputs = [ cython setuptools setuptools-scm ]; propagatedBuildInputs = [ cloudpickle jinja2 psutil pynvml rich ]; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ pytestCheckHook ]; checkInputs = [ hypothesis numpy ]; disabledTestPaths = [ # remove on next update # Failing Darwin-specific tests that were subsequently removed from the source repo. "tests/test_coverup_35.py" "tests/test_coverup_42.py" "tests/test_coverup_43.py" ]; # remove scalene directory to prevent pytest import confusion preCheck = '' rm -rf scalene ''; pythonImportsCheck = [ "scalene" ]; meta = with lib; { description = "High-resolution, low-overhead CPU, GPU, and memory profiler for Python with AI-powered optimization suggestions"; homepage = "https://github.com/plasma-umass/scalene"; changelog = "https://github.com/plasma-umass/scalene/releases/tag/v${version}"; mainProgram = "scalene"; license = licenses.asl20; maintainers = with maintainers; [ sarahec ]; }; } </ins>
# GPIO power management POWER_RESET_GPIO                 = option yes; POWER_RESET_GPIO_RESTART         = option yes; <ins> # Enable Pulse-Width-Modulation support, commonly used for fan and backlight. PWM                              = yes; </ins> } // optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE                       = yes; INTEL_RAPL                       = whenAtLeast "5.3" module;
<del> From 408e6a5170bbe9f854bf46e1cbae21265cf25294 Mon Sep 17 00:00:00 2001 From: Florian Bruhin <me@the-compiler.org> Date: Mon, 25 Apr 2022 18:39:07 +0200 Subject: [PATCH] Add Collection SearchType Backport of https://github.com/ramsayleung/rspotify/pull/306 --- src/senum.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/senum.rs b/src/senum.rs index c94c31c..79d8730 100644 --- a/src/senum.rs +++ b/src/senum.rs @@ -87,6 +87,7 @@ pub enum Type { User, Show, Episode, +    Collection, } impl Type { pub fn as_str(&self) -> &str { @@ -98,6 +99,7 @@ pub fn as_str(&self) -> &str { Type::User => "user", Type::Show => "show", Type::Episode => "episode", +            Type::Collection => "collection", } } } @@ -112,6 +114,7 @@ fn from_str(s: &str) -> Result<Self, Self::Err> { "user" => Ok(Type::User), "show" => Ok(Type::Show), "episode" => Ok(Type::Episode), +            "collection" => Ok(Type::Collection), _ => Err(Error::new(ErrorKind::NoEnum(s.to_owned()))), } } -- 2.35.3 </del>
<del> { lib , rustPlatform , fetchFromGitHub , stdenv , installShellFiles , pkg-config , openssl , python3 , libxcb , AppKit , Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; version = "0.25.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; }; cargoLock = { lockFile = ./Cargo.lock; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ openssl libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; postPatch = '' # update Cargo.lock to fix build ln -sf ${./Cargo.lock} Cargo.lock # Add patch adding the collection variant to rspotify used by spotify-tu # This fixes the issue of getting an error when playing liked songs # see https://github.com/NixOS/nixpkgs/pull/170915 patch -p1 -d $cargoDepsCopy/rspotify-0.10.0 < ${./0001-Add-Collection-SearchType.patch} ''; postInstall = '' for shell in bash fish zsh; do $out/bin/spt --completions $shell > spt.$shell installShellCompletion spt.$shell done ''; meta = with lib; { description = "Spotify for the terminal written in Rust"; homepage = "https://github.com/Rigellute/spotify-tui"; changelog = "https://github.com/Rigellute/spotify-tui/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ jwijenbergh ]; mainProgram = "spt"; }; } </del>
spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 <ins> spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 </ins> spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10
stdenv.mkDerivation (finalAttrs: { pname = "cimg"; <del> version = "3.3.4"; </del> <ins> version = "3.3.5"; </ins> src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${finalAttrs.version}"; <del> hash = "sha256-qo/k5NpTqu+o2WUEOThozuBJVPMMy8OvIMo2DfJUE8g="; </del> <ins> hash = "sha256-QdQhMEY6Zl3qdvRIeDv/12TL4HMrNJSAQ66vQymOrBU="; </ins> }; outputs = [ "out" "doc" ];
owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; <del> hash = "sha256-HagGabJ1jkg5SkMlr0Y5rGFw64jPW8QLuR0I2idM1N0="; </del> <ins> hash = "sha256-881+o6Wz4yNf92JNNLQn9x44SSjXAp/cZLkBGCfM6DY="; </ins> }; # TODO: build this from source <del> # Reference: src/Makefile, directive gmic_stdlib.h </del> <ins> # Reference: src/Makefile, directive gmic_stdlib_community.h </ins> gmic_stdlib = fetchurl { <del> name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; hash = "sha256-7JzFU4HvAtC5Nz5vusKCnJ8VMuKfSi1yFmjj0Hh+vA4="; </del> <ins> name = "gmic_stdlib_community.h"; url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; hash = "sha256-UZzCAs+x9dVMeaeEvPgyVZ5S6UO0yhJWVMgBvBiW2ME="; </ins> }; nativeBuildInputs = [
]; postPatch = '' <del> cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib.h # CMake build files were moved to subdirectory. mv resources/CMakeLists.txt resources/cmake . </del> <ins> cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h </ins> '' + lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt
rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; <del> version = "0.3.5"; </del> <ins> version = "0.3.5-unstable-2024-02-18"; </ins> src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; <del> rev = "v${version}"; hash = "sha256-+P85FWJIsfAv8/DnQFxfoWvNY8NpbZ2xUidfwN8tiA8="; </del> <ins> rev = "ff2f7a06e54bf05afd57a0243dc9f67abc15f040"; hash = "sha256-nebAd4a+ht+blRP52OF830/Dm15ZPwRL4IPWmmT9ViM="; </ins> }; <del> cargoHash = "sha256-j+2yEtn3D+vNRcY4+NnqSX4xRQIE5Sq7bentxTh6kMI="; </del> <ins> cargoHash = "sha256-6BRIMTrWTwvX3yIGEYEvigMT+n4EtaruMdrej2Dd49w="; </ins> nativeBuildInputs = [ pkg-config ];
meta = with lib; { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://spotifyd.rs/"; <del> changelog = "https://github.com/Spotifyd/spotifyd/raw/v${version}/CHANGELOG.md"; </del> <ins> changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md"; </ins> license = licenses.gpl3Plus; maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ]; platforms = platforms.unix;
{ autoPatchelfHook , blas , cmake <ins> , cudaPackages_11 ? null </ins> , cudaPackages , cudaSupport ? config.cudaSupport , fetchurl , gfortran <del> , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities </del> , gpuTargets ? [ ] # Non-CUDA targets, that is HIP , rocmPackages , lapack
let inherit (lib) lists strings trivial; <del> inherit (cudaPackages) cudaAtLeast cudaFlags cudaOlder; </del> inherit (magmaRelease) version hash supportedGpuTargets; <ins> # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1. # If we're building a version prior to that, use the latest release of the 11.x series. effectiveCudaPackages = if strings.versionOlder version "2.7.1" then cudaPackages_11 else cudaPackages; inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder; inherit (cudaFlags) cudaCapabilities; </ins> # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements #   of the first list *from* the second list. That means: #   lists.subtractLists a b = b - a
# TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is # out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777. # See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information. <ins> # Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286. </ins> '' install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/" ''
# because it has no files to install. + '' install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/" <del> install -Dm755 ./lib/libtester.so ./lib/liblapacktest.so -t "$test/lib/" </del> <ins> install -Dm755 ./lib/lib*test*.* -t "$test/lib/" </ins> '' # All of the test executables and libraries will have a reference to the build directory in their RPATH, which we # must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care
broken = !(cudaSupport || rocmSupport) # At least one back-end enabled || (cudaSupport && rocmSupport) # Mutually exclusive <del> || (cudaSupport && cudaOlder "9.0"); </del> <ins> || (cudaSupport && cudaOlder "9.0") || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null); </ins> }; }
, qtwayland , wayland , wrapQtAppsHook <ins> , kdePackages </ins> }: stdenv.mkDerivation rec { pname = "CopyQ"; <del> version = "7.1.0"; </del> <ins> version = "8.0.0"; </ins> src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; <del> hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg="; </del> <ins> hash = "sha256-Ewunl4k9f0aDjilhKAsVxwR3S6uSZ1xwtu6ccNsNOgk="; </ins> }; <del> patches = [ # itemfakevim: fix build with qt 6.6.0 # https://github.com/hluk/CopyQ/pull/2508 (fetchpatch2 { url = "https://github.com/hluk/CopyQ/commit/a20bfff0d78296b334ff8cabb047ab5d842b7311.patch"; hash = "sha256-F/6cQ8+O1Ttd4EFFxQas5ES6U+qxWdmYqUWRQLsVMa4="; }) ]; </del> nativeBuildInputs = [ cmake ninja <del> extra-cmake-modules </del> <ins> kdePackages.extra-cmake-modules </ins> wrapQtAppsHook ];
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff <ins> makeWrapper </ins> ]; <ins> postInstall = '' wrapProgram $out/bin/konsole --prefix XDG_DATA_DIRS ":" $out/share ''; </ins> propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; }
<del> { lib , copyDesktopItems , fetchFromGitHub , makeDesktopItem , python3 , wrapQtAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "onthespot"; version = "0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "casualsnek"; repo = "onthespot"; rev = "refs/tags/v${version}"; hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; }; nativeBuildInputs = with python3.pkgs; [ copyDesktopItems pythonRelaxDepsHook wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ charset-normalizer defusedxml librespot music-tag packaging pillow protobuf pyogg pyqt5 pyqt5-sip pyxdg requests setuptools show-in-file-manager urllib3 zeroconf ]; pythonRemoveDeps = [ "PyQt5-Qt5" "PyQt5-stubs" ]; pythonRelaxDeps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { description = " QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; }; } </del>
<ins> { lib , copyDesktopItems , fetchFromGitHub , makeDesktopItem , python3 , libsForQt5 }: python3.pkgs.buildPythonApplication rec { pname = "onthespot"; version = "0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "casualsnek"; repo = "onthespot"; rev = "refs/tags/v${version}"; hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; }; nativeBuildInputs = with python3.pkgs; [ copyDesktopItems pythonRelaxDepsHook libsForQt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ charset-normalizer defusedxml librespot music-tag packaging pillow protobuf pyqt5 pyqt5-sip pyxdg requests setuptools show-in-file-manager urllib3 zeroconf ]; pythonRemoveDeps = [ "PyQt5-Qt5" "PyQt5-stubs" # Doesn't seem to be used in the sources and causes # build issues "PyOgg" ]; pythonRelaxDeps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { description = " QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; }; } </ins>
<del> { stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile, substituteAll }: </del> <ins> { stdenv , lib , fetchPypi , buildPythonPackage , libvorbis , flac , libogg , libopus , opusfile , substituteAll , python }: </ins> buildPythonPackage rec { <del> pname = "pyogg"; version = "0.6.9a1"; src = fetchPypi { pname = "PyOgg"; inherit version; sha256 = "0xabqwyknpvfc53s7il5pq6b07fcaqvz5bi5vbs3pbaw8602qvim"; }; buildInputs = [ libvorbis flac libogg libopus ]; propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ]; # There are no tests in this package. doCheck = false; patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol patches = [ (substituteAll { src = ./pyogg-paths.patch; flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; meta = { </del> <ins> pname = "pyogg"; version = "0.6.14a1"; src = fetchPypi { pname = "PyOgg"; inherit version; hash = "sha256-gpSzSqWckCAMRjDCzEpbhEByCRQejl0GnXpb41jpQmI="; }; buildInputs = [ libvorbis flac libogg libopus ]; propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ]; # There are no tests in this package. doCheck = false; # patch has dos style eol patchFlags = [ "-p1" "--binary" ]; patches = [ (substituteAll { src = ./pyogg-paths.patch; flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; meta = with lib; { </ins> description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python"; homepage = "https://github.com/Zuzu-Typ/PyOgg"; <del> license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ pmiddend ]; </del> <ins> license = licenses.publicDomain; maintainers = with maintainers; [ pmiddend ]; </ins> }; }
, adwaita-icon-theme , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook3, substituteAll <del> , mtools, dosfstools </del> <ins> , mtools, dosfstools, xhost </ins> }: stdenv.mkDerivation rec {
enableParallelBuilding = true; <del> configureFlags = [ "--disable-doc" ]; </del> <ins> configureFlags = [ "--disable-doc" "--enable-xhost-root" ]; </ins> buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin adwaita-icon-theme  ]; nativeBuildInputs = [ gettext pkg-config wrapGAppsHook3 ];
preFixup = '' gappsWrapperArgs+=( <del> --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools ]}" </del> <ins> --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools xhost ]}" </ins> ) '';
# cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator <del> doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD && !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); </del> <ins> doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD && !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; </ins> # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken.
{ lib , ocamlPackages <ins> , stdenv , overrideSDK </ins> , fetchFromGitHub , python3 , dune_3 <ins> , makeWrapper , pandoc , poppler_utils , testers , docfd </ins> }: <del> ocamlPackages.buildDunePackage rec { </del> <ins> let # Needed for x86_64-darwin buildDunePackage' = ocamlPackages.buildDunePackage.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildDunePackage' rec { </ins> pname = "docfd"; <del> version = "3.0.0"; </del> <ins> version = "4.0.0"; </ins> minimalOCamlVersion = "5.1";
owner = "darrenldl"; repo = "docfd"; rev = version; <del> hash = "sha256-pJ5LlOfC+9NRfY7ng9LAxEnjr+mtJmhRNTo9Im6Lkbo="; </del> <ins> hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8="; </ins> }; <del> nativeBuildInputs = [ python3 dune_3 ]; </del> <ins> nativeBuildInputs = [ python3 dune_3 makeWrapper ]; </ins> buildInputs = with ocamlPackages; [ cmdliner containers-data
yojson ]; <ins> postInstall = '' wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ pandoc poppler_utils ]}" ''; passthru.tests.version = testers.testVersion { package = docfd; }; </ins> meta = with lib; { description = "TUI multiline fuzzy document finder"; longDescription = '' <del> Think interactive grep for both text and other document files, but word/token based instead of regex and line based, so you can search across lines easily. Aims to provide good UX via integration with common text editors and other file viewers. Optional dependencies: fzf - for fuzzy file picker with "docfd ?". poppler_utils - for pdf search. pandoc - for .epub, .odt, .docx, .fb2, .ipynb, .html, & .htm files. </del> <ins> Think interactive grep for text and other document files. Word/token based instead of regex and line based, so you can search across lines easily. Aims to provide good UX via integration with common text editors and other file viewers. </ins> ''; homepage = "https://github.com/darrenldl/docfd"; license = licenses.mit;
hash = "sha256-pve2f+XMfFokMCtW3KdeOJ9Ey330Gwv/dk1+WBtrBEQ="; }; <ins> nativeBuildInputs = [ copyDesktopItems qt5.wrapQtAppsHook ]; buildInputs = [ qt5.qtbase qt5.qtwayland ]; </ins> propagatedBuildInputs = with python3Packages; [ editdistance pyqt5 translitcodec ]; <del> doCheck = false; </del> <ins> dontWrapQtApps = true; </ins> <del> nativeBuildInputs = [ copyDesktopItems qt5.wrapQtAppsHook ]; </del> <ins> preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; doCheck = false; </ins> desktopItems = [ (makeDesktopItem {
<del> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index 2e1d9c488e2..7979cad75fa 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -729,7 +729,7 @@ bool radeon_bo_can_reclaim_slab(void *priv, struct pb_slab_entry *entry) { struct radeon_bo *bo = container_of(entry, struct radeon_bo, u.slab.entry); -   return radeon_bo_can_reclaim(NULL, &bo->base); +   return radeon_bo_can_reclaim(priv, &bo->base); } static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf) </del>
# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let <del> version = "24.0.3"; hash = "sha256-d67JoqN7fTWW6hZAs8xT0LXZs7Uqvtid4H43F+kb/b4="; </del> <ins> version = "24.0.4"; hash = "sha256-kP69MKCYy82X/2Lsw9z1yT129/oxTelEz86BlRunRfA="; </ins> # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule