jiebi/CodeConvo huggingface dataset:
<ins> { lib , stdenv , sassc , gdk-pixbuf , glib , gobject-introspection , librsvg , gtk3 , python3 , fetchFromGitHub , wrapGAppsHook }: let py = python3.withPackages (p: [ p.pygobject3 ]); pname = "themix-gui"; version = "1.15.1"; in stdenv.mkDerivation { inherit pname version; src = fetchFromGitHub { owner = "themix-project"; repo = "themix-gui"; rev = version; hash = "sha256-xFtwNx1c7Atb+9yorZhs/uVkkoxbZiELJ0SZ88L7KMs="; fetchSubmodules = true; }; nativeBuildInputs = [ gobject-introspection py sassc wrapGAppsHook ]; buildInputs = [ gdk-pixbuf glib gtk3 librsvg py ]; postPatch = '' substituteInPlace gui.sh packaging/bin/{oomox,themix}-gui --replace python3 ${lib.getExe py} ''; dontBuild = true; installPhase = '' runHook preInstall make DESTDIR=/ APPDIR=$out/opt/oomox PREFIX=$out install_gui install_import_xresources install_export_xresources python -O -m compileall $out/opt/oomox/oomox_gui -d /opt/oomox/oomox_gui runHook postInstall ''; meta = { description = "Graphical application for designing themes and exporting them using plugins"; longDescription = '' Graphical application for generating different color variations of Oomox (Numix-based) and Materia (ex-Flat-Plat) themes (GTK2, GTK3, Cinnamon, GNOME, Openbox, Xfwm), Archdroid, Gnome-Color, Numix, Papirus and Suru++ icon themes. Have a hack for HiDPI in gtk2. Its Base16 plugin also allowing a lot of app themes support like Alacritty, Emacs, GTK4, KDE, VIM and many more. ''; homepage = "https://github.com/themix-project/themix-gui"; license = lib.licenses.gpl3Only; mainProgram = "themix-gui"; maintainers = with lib.maintainers; [ eclairevoyant ]; platforms = lib.platforms.linux; }; } </ins>
<ins> { lib , stdenv , fetchFromGitHub , qtbase , qmake , wrapQtAppsHook , copyDesktopItems , makeDesktopItem }: stdenv.mkDerivation rec { pname = "cubiomes-viewer"; version = "1.12.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE="; fetchSubmodules = true; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake wrapQtAppsHook copyDesktopItems ]; desktopItems = [ (makeDesktopItem { name = pname; desktopName = "Cubiomes Viewer"; exec = pname; icon = pname; categories = "Game"; comment = meta.description; }) ]; preBuild = '' # QMAKE_PRE_LINK is not executed (I dont know why) make -C ./cubiomes libcubiomes CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all ''; installPhase = '' runHook preInstall mkdir -p $out/bin cp cubiomes-viewer $out/bin mkdir -p $out/share/pixmaps cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png runHook postInstall ''; meta = with lib; { homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "A graphical Minecraft seed finder and map viewer"; longDescription = '' Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation. ''; platforms = platforms.all; license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; }; } </ins>
python3.pkgs.buildPythonApplication rec { pname = "radicale"; <del> version = "3.1.3"; </del> <ins> version = "3.1.4"; </ins> src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; <del> hash = "sha256-a1oapCktJPvNO+MTsB9COtxSFB/ZIZvJiuqX+s+lncY="; </del> <ins> hash = "sha256-vX6lYiDqpQeWVLotyt2ODwcjskWB6EuCky3/V8m1m7Q="; </ins> }; postPatch = ''
<ins> { lib , stdenv , fetchFromGitHub , appstream-glib , desktop-file-utils , gobject-introspection , meson , ninja , pkg-config , wrapGAppsHook4 , gjs , gtk4 , libadwaita , libportal-gtk4 }: stdenv.mkDerivation rec { pname = "junction"; version = "1.5.0"; src = fetchFromGitHub { owner = "sonnyp"; repo = "junction"; rev = "v${version}"; sha256 = "sha256-jS4SHh1BB8jk/4EP070X44C4n3GjyCz8ozgK8v5lbqc="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils gobject-introspection meson ninja pkg-config wrapGAppsHook4 ]; buildInputs = [ gjs gtk4 libadwaita libportal-gtk4 ]; postInstall = '' # autoPatchShebangs does not like "/usr/bin/env -S gjs" substituteInPlace $out/bin/re.sonny.Junction --replace "/usr/bin/env -S gjs" "/usr/bin/gjs" ''; meta = with lib; { description = "Choose the application to open files and links"; homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; }; } </ins>
<del> { stdenv, lib, fetchFromGitHub , python3Packages , fehSupport ? false, feh , imagemagickSupport ? true, imagemagick , intltool , gtk3 </del> <ins> { lib , stdenv , fetchFromGitHub </ins> , gexiv2 <del> , libnotify </del> , gobject-introspection <ins> , gtk3 </ins> , hicolor-icon-theme <ins> , intltool , libnotify </ins> , librsvg <ins> , python3 , runtimeShell </ins> , wrapGAppsHook <del> , makeWrapper </del> <ins> , fehSupport ? false, feh , imagemagickSupport ? true, imagemagick </ins> }: <del> with python3Packages; buildPythonApplication rec { </del> <ins> python3.pkgs.buildPythonApplication rec { </ins> pname = "variety"; version = "0.8.5";
sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; <del> nativeBuildInputs = [ makeWrapper intltool wrapGAppsHook ]; </del> <ins> nativeBuildInputs = [ intltool wrapGAppsHook ]; </ins> <del> buildInputs = [ distutils_extra ]; </del> <ins> propagatedBuildInputs = [ gexiv2 gobject-introspection gtk3 hicolor-icon-theme libnotify librsvg ] ++ (with python3.pkgs; [ beautifulsoup4 configobj dbus-python distutils_extra httplib2 lxml pillow pycairo pygobject3 requests setuptools ]) ++ lib.optional fehSupport feh ++ lib.optional imagemagickSupport imagemagick; </ins> doCheck = false;
prePatch = '' substituteInPlace variety_lib/varietyconfig.py  <del> --replace "__variety_data_directory__ = "../data"" "__variety_data_directory__ = "$out/share/variety"" </del> <ins> --replace "__variety_data_directory__ = "../data""  "__variety_data_directory__ = "$out/share/variety"" </ins> substituteInPlace data/scripts/set_wallpaper  <del> --replace /bin/bash ${stdenv.shell} </del> <ins> --replace /bin/bash ${runtimeShell} </ins> substituteInPlace data/scripts/get_wallpaper  <del> --replace /bin/bash ${stdenv.shell} </del> <ins> --replace /bin/bash ${runtimeShell} </ins> ''; <del> propagatedBuildInputs = [ beautifulsoup4 configobj dbus-python gexiv2 gobject-introspection gtk3 hicolor-icon-theme httplib2 libnotify librsvg lxml pillow pycairo pygobject3 requests setuptools ] ++ lib.optional fehSupport feh ++ lib.optional imagemagickSupport imagemagick; </del> meta = with lib; { homepage = "https://github.com/varietywalls/variety"; description = "A wallpaper manager for Linux systems";
Variety also includes a range of image effects, such as oil painting and blur, as well as options to layer quotes and a clock onto the background. ''; <del> license = licenses.gpl3; </del> <ins> license = licenses.gpl3Plus; </ins> maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; <del> platforms = with platforms; linux; </del> }; }
substituteInPlace variety_lib/varietyconfig.py  --replace "__variety_data_directory__ = "../data""  "__variety_data_directory__ = "$out/share/variety"" <del> substituteInPlace data/scripts/set_wallpaper  --replace /bin/bash ${runtimeShell} substituteInPlace data/scripts/get_wallpaper  --replace /bin/bash ${runtimeShell} </del> <ins> substituteInPlace variety/VarietyWindow.py  --replace '[script,' '["${runtimeShell}", script,'  --replace 'check_output(script)' 'check_output(["${runtimeShell}", script])' </ins> ''; meta = with lib; {
''; })) <ins> (patchExtension "gtk4-ding@smedius.gitlab.com" (old: { patches = [ (substituteAll { inherit gjs util-linux xdg-utils; util_linux = util-linux; xdg_utils = xdg-utils; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; nautilus_gsettings_path = "${glib.getSchemaPath gnome.nautilus}"; }) ]; })) </ins> (patchExtension "pano@elhan.io" (old: { patches = [ (substituteAll {
SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; } (mkIf cfg.x11 { <del> services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ]; </del> <ins> services.xserver.videoDrivers = [ "vmware" "virtualbox" "modesetting" ]; </ins> services.xserver.config = ''
owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; <del> sha256 = "0izmzyj6gb51d71vbdjcgd9qw34aidvbmz0mg4bkc13n48w8s9vj"; </del> <ins> sha256 = "sha256-oNJm9Gi41aA5krkpkQI0EYdIlMcQpdodv9yqXhnNURA="; </ins> }); nativeBuildInputs = [ cmake ];
version = "8.0.0"; src = fetchurl { <del> url = "https://web.archive.org/web/20211130172544/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; </del> <ins> url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; </ins> name = "tetrio-desktop.deb"; sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf"; };
postPatch = '' sed -i setup.py -e "/pip>=/c'pip'," substituteInPlace setup.py  <del> --replace 'typing==3.6.4' 'typing' </del> <ins> --replace "typing==3.6.4" "typing"  --replace "attrs>=19.3.0,<21.3.0" "attrs" </ins> ''; disabledTestPaths = [
version = "1.7.0"; format = "setuptools"; <del> disabled = pythonOlder "3.5"; </del> <ins> disabled = pythonOlder "3.7"; </ins> <del> src = fetchPypi { inherit pname version; sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; </del> <ins> src = fetchFromGitHub { owner = "jamesls"; repo = pname; rev = version; hash = "sha256-P6PUg9SY0Qshlvj+iV1xdrzVLJ9JXUV4cGHUynKO3m0="; </ins> }; propagatedBuildInputs = [
pytestCheckHook ]; <ins> patches = [ # Support for redis <= 4.1.0, https://github.com/jamesls/fakeredis/pull/324 (fetchpatch { name = "support-redis-4.1.0.patch"; url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch"; sha256 = "sha256-4DrF/5WEWQWlJZtAi4qobMDyRAAcO/weHIaK9waN00k="; }) ]; </ins> disabledTestPaths = [ # AttributeError: 'AsyncGenerator' object has no attribute XXXX "test/test_aioredis2.py"
<ins> { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "open-fprintd"; version = "0.6"; src = fetchFromGitHub { owner = "uunicorn"; repo = pname; rev = version; sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; }; propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; checkInputs = with python3Packages; [ dbus-python ]; postInstall = '' install -D -m 644 debian/open-fprintd.service  $out/lib/systemd/system/open-fprintd.service install -D -m 644 debian/open-fprintd-resume.service  $out/lib/systemd/system/open-fprintd-resume.service install -D -m 644 debian/open-fprintd-suspend.service  $out/lib/systemd/system/open-fprintd-suspend.service substituteInPlace $out/lib/systemd/system/open-fprintd.service  --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" substituteInPlace $out/lib/systemd/system/open-fprintd-resume.service  --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" substituteInPlace $out/lib/systemd/system/open-fprintd-suspend.service  --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" ''; postFixup = '' wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" ''; meta = with lib; { description = "Fprintd replacement which allows you to have your own backend as a standalone service"; homepage = "https://github.com/uunicorn/open-fprintd"; license = licenses.gpl2Only; platforms = platforms.linux; }; } </ins>
, libXt, qt, readline , useSCEL ? false, emacs }: <del> let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { </del> <ins> let optional = stdenv.lib.optional; ljack2 = libjack2.override { gcc = gcc; }; in stdenv.mkDerivation rec { </ins> name = "supercollider-3.6.6"; meta = {
cmakeFlags = '' -DSC_WII=OFF <del> -DSC_EL=${if useSCEL then "ON" else "OFF"} </del> <ins> -DSC_EL=${if useSCEL then "ON" else "OFF"} </ins> ''; nativeBuildInputs = [ cmake pkgconfig ]; <del> buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qt readline ] </del> <ins> buildInputs = [ gcc ljack2 libsndfile fftw curl libXt qt readline ] </ins> ++ optional useSCEL emacs; }
{ lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds <del> , libtirpc, rpcsvc-proto </del> <ins> , libtirpc, rpcsvc-proto, nixosTests </ins> }: # Note: zlib is not required; MySQL can use an internal zlib.
let self = stdenv.mkDerivation rec { pname = "mysql"; <del> version = "5.7.27"; </del> <ins> version = "5.7.37"; </ins> src = fetchurl { url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; <del> sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; </del> <ins> sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0="; </ins> }; preConfigure = lib.optionalString stdenv.isDarwin ''
{ fetchFromGitHub }: rec { <del> version = "4.1.6"; </del> <ins> version = "4.1.7"; </ins> src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; <del> sha256 = "09avkiazpfxzrgr3av58jbina5x9jqvqhjkn39475pfhfhrlv9fv"; </del> <ins> sha256 = "08z23mi6xkr6zzp0hzh1cppvl2y0177s0lnpxqbpy8jiii5fxw8f"; </ins> }; }
source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor; }; <ins> environment.etc."pipewire/media-session.d/with-audio" = mkIf config.services.pipewire.audio.enable { text = ""; }; </ins> environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = "";
}; }; <ins> audio = { enable = lib.mkOption { type = lib.types.bool; # this is for backwards compatibility default = cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable; defaultText = lib.literalExpression "config.services.pipewire.alsa.enable || config.services.pipewire.jack.enable || config.services.pipewire.pulse.enable"; description = "Whether to use PipeWire as the primary sound server"; }; }; </ins> alsa = { enable = mkEnableOption "ALSA support"; support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems";
config = mkIf cfg.enable { assertions = [ { <del> assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; </del> <ins> assertion = cfg.audio.enable -> !config.hardware.pulseaudio.enable; message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; </ins> } { assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; } <ins> { # JACK intentionally not checked, as PW-on-JACK setups are a thing that some people may want assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable; message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true."; } </ins> ]; environment.systemPackages = [ cfg.package ]
]; environment.systemPackages = [ cfg.package ]; <ins> environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) { text = '' # Pipewire is not used for audio, so prevent it from grabbing audio devices alsa_monitor.enable = function() end ''; }; </ins> systemd.packages = [ cfg.package ]; systemd.services.wireplumber.enable = config.services.pipewire.systemWide;
in py.pkgs.buildPythonApplication rec { pname = "salt"; <del> version = "3004"; </del> <ins> version = "3004.1"; </ins> src = py.pkgs.fetchPypi { inherit pname version; <del> sha256 = "PVNWG8huAU3KLsPcmBB5vgTVXqBHiQyr3iXlsQv6WxM="; </del> <ins> hash = "sha256-fzRKJDJkik8HjapazMaNzf/hCVzqE+wh5QQTVg8Ewpg="; </ins> }; propagatedBuildInputs = with py.pkgs; [
}: python3.pkgs.buildPythonApplication rec { pname = "salt"; <del> version = "3003.3"; </del> <ins> version = "3003.4"; </ins> src = python3.pkgs.fetchPypi { inherit pname version; <del> sha256 = "pvnIyLXiYA6oYgtKZzcd4XYRvrT42X5LubCzCKN+0eI="; </del> <ins> sha256 = "53uAjlG0HX5Jae4VWIrAT9DbmzPfonEPVEGNfrOHJM0="; </ins> }; propagatedBuildInputs = with python3.pkgs; [
rustPlatform.buildRustPackage rec { pname = "lapce"; <del> version = "0.0.10"; </del> <ins> version = "0.0.12"; </ins> src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; <del> sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; </del> <ins> sha256 = "sha256-ZFQjQ5+G0b0Fgg3+du/drt+62rC/TCNR5MIdJXAkTrE="; </ins> }; <del> cargoPatches = [ ./fix-version.patch ]; cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; </del> <ins> cargoSha256 = "sha256-sMTootPsenaWzLLFImo6HWC1pcm2uFupPhVWsUJp1Ak="; </ins> nativeBuildInputs = [ cmake
<del> diff --git a/Cargo.lock b/Cargo.lock index bc9a0f8..45a74ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "lapce" -version = "0.0.9" +version = "0.0.10" dependencies = [ "lapce-core", "lapce-proxy", @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "lapce-core" -version = "0.0.9" +version = "0.0.10" dependencies = [ "Inflector", "alacritty_terminal 0.15.0", @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "lapce-proxy" -version = "0.0.9" +version = "0.0.10" dependencies = [ "alacritty_terminal 0.16.0-rc2", "anyhow", </del>
<ins> From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 From: Mark Adler <madler@alumni.caltech.edu> Date: Mon, 28 Mar 2022 18:34:10 -0700 Subject: [PATCH] Fix configure issue that discarded provided CC definition. --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 52ff4a04e..3fa3e8618 100755 --- a/configure +++ b/configure @@ -174,7 +174,10 @@ if test -z "$CC"; then else cc=${CROSS_PREFIX}cc fi +else +  cc=${CC} fi + cflags=${CFLAGS-"-O3"} # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure case "$cc" in </ins>
}: mkDerivation rec { pname = "jl"; <del> version = "0.0.5"; src = fetchFromGitHub { owner = "chrisdone"; repo = "jl"; rev = "v${version}"; sha256 = "1hlnwsl4cj0l4x8dxwda2fcnk789cwlphl9gv9cfrivl43mgkgar"; }; patches = [ # MonadFail compatibility patch. Should be removed with the next release (fetchpatch { url = "https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch"; sha256 = "1pg92ffkg8kim5r8rz8js6fjqyjisg1266sf7p9jyxjgsskwpa4g"; }) ]; </del> <ins> version = "0.1.0"; sha256 = "15vvn3swjpc5qmdng1fcd8m9nif4qnjmpmxc9hdw5cswzl055lkj"; </ins> isLibrary = true; isExecutable = true; libraryHaskellDepends = [
description = "Functional sed for JSON"; maintainers = with lib.maintainers; [ fgaz ]; homepage = "https://github.com/chrisdone/jl"; <del> # jl needs to be updated to work with aeson-2.0. # As far as I can tell, there is unfortunately no where to report issues upstream # for us to be able to track when upstream adds aeson-2.0 support. hydraPlatforms = lib.platforms.none; broken = true; </del> }
}); in { <del> subversion_1_10 = common { version = "1.10.8"; sha256 = "sha256-CnO6MSe1ov/7j+4rcCmE8qgI3nEKjbKLfdQBDYvlDlo="; }; </del> subversion = common { version = "1.14.2"; sha256 = "sha256-yRMOjQt1copm8OcDj8dwUuZxgw14W1YWqtU7SBDTzCg=";
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 steam-run-native = steam-run; # added 2022-02-21 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 <ins> subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26 </ins> subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
patches = [ ./tag-date.patch ./setuptools-distutils-C++.patch <ins> # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. # https://github.com/pypa/distutils/pull/145 (fetchpatch { url = "https://github.com/pypa/distutils/commit/aed7294b7b0c228cc0666a8b04f2959bf310ab57.patch"; hash = "sha256-/9+TKv0nllBfnj48zcXLrOgyBj52dBIVbrpnIaQ4O84="; stripLen = 2; extraPrefix = "setuptools/_distutils/"; }) </ins> ]; buildPhase = ''
sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY="; }; <ins> patches = [ # https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436 ./patches/bug62436.patch ]; </ins> buildInputs = [ readline ncurses
<ins> # HG changeset patch # User John Donoghue <john.donoghue@ieee.org> # Date 1652358904 14400 #      Thu May 12 08:35:04 2022 -0400 # Branch stable # Node ID 8c940cfcce257369677c09154da2aab2c56eaa79 # Parent  63710f3bd9811c2d206ac9e7b4f47cf06c47e153 * scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436) diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m --- a/scripts/pkg/private/build.m	Wed May 11 09:44:55 2022 -0700 +++ b/scripts/pkg/private/build.m	Thu May 12 08:35:04 2022 -0400 @@ -77,8 +77,12 @@ else arch_abi = getarch (); configure_make (desc, build_root, verbose); -      unlink (fullfile (build_root, "src", "configure")); -      unlink (fullfile (build_root, "src", "Makefile")); +      if exist (fullfile (build_root, "src", "configure"), "file") +        unlink (fullfile (build_root, "src", "configure")); +      endif +      if exist (fullfile (build_root, "src", "Makefile"), "file") +        unlink (fullfile (build_root, "src", "Makefile")); +      endif endif tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"]; tar_path = fullfile (builddir, tar_name); </ins>
githubId = 1550265; name = "Dominic Steinitz"; }; <ins> ifurther = { email = "55025025+ifurther@users.noreply.github.com"; github = "ifurther"; githubId = 55025025; name = "Feather Lin"; }; </ins> igsha = { email = "igor.sharonov@gmail.com"; github = "igsha";
<ins> { buildPythonPackage , cython , fetchPypi , jdk , lib , six }: buildPythonPackage rec { pname = "pyjnius"; version = "1.4.1"; src = fetchPypi { inherit pname version; sha256 = "8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce"; }; propagatedBuildInputs = [ six ]; nativeBuildInputs = [ jdk cython ]; pythonImportsCheck = [ "jnius" ]; meta = with lib; { description = "A Python module to access Java classes as Python classes using the Java Native Interface (JNI)"; homepage = "https://github.com/kivy/pyjnius"; license = licenses.mit; maintainers = with maintainers; [ ifurther ]; }; } </ins>
inherit (packages) version; format = "wheel"; <del> disabled = pythonAtLeast "3.10"; </del> <ins> # See https://github.com/tensorflow/tensorflow/issues/55581#issuecomment-1101890383 disabled = pythonAtLeast "3.10" && !cudaSupport; </ins> src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
( cd unpacked/tensorflow* # Adjust dependency requirements: <del> # - Relax gast version requirement that doesn't match what we have packaged </del> <ins> # - Relax tensorflow-estimator version requirement that doesn't match what we have packaged </ins> # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. sed -i *.dist-info/METADATA  <del> -e "s/Requires-Dist: gast.*/Requires-Dist: gast/"  </del> <ins> -e "s/Requires-Dist: tf-estimator-nightly.*/Requires-Dist: tensorflow-estimator/"  </ins> -e "/Requires-Dist: libclang/d"  -e "/Requires-Dist: keras/d"  -e "/Requires-Dist: tensorflow-io-gcs-filesystem/d"