jiebi/CodeConvo huggingface dataset:
cd obj-* ''; <del> makeFlags = lib.optionals ltoSupport [ "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar" "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump" "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm" "RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib" "STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip" ] ++ extraMakeFlags; </del> <ins> makeFlags = extraMakeFlags; </ins> enableParallelBuilding = true; doCheck = false; # "--disable-tests" above
gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") ''; <ins> # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh # Remove it when PR #146275 is merged. preFixup = lib.optionalString enableDebugSymbols '' _separateDebugInfo() { [ -e "$prefix" ] || return 0 local dst="''${debug:-$out}" if [ "$prefix" = "$dst" ]; then return 0; fi dst="$dst/lib/debug/.build-id" # Find executables and dynamic libraries. local i while IFS= read -r -d $'0' i; do if ! isELF "$i"; then continue; fi # Extract the Build ID. FIXME: there's probably a cleaner way. local id="$($READELF -n "$i" | sed 's/.*Build ID: ([0-9a-f]*).*/1/; t; d')" if [[ -z "$id" ]]; then echo "could not find build ID of $i, skipping" >&2 continue fi # Extract the debug info. header "separating debug info from $i (build ID $id)" mkdir -p "$dst/''${id:0:2}" $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" $STRIP --strip-debug "$i" # Also a create a symlink <original-name>.debug. ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")" done < <(find "$prefix" -type f -print0) } ''; </ins> doInstallCheck = true; installCheckPhase = '' # Some basic testing
sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48"; }; <del> checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel-yaml ]; </del> <ins> checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy ]; </ins> <del> disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; </del> <ins> # these have dependencies that are broken on Python 2 disabledTestPaths = [ "tests/gallery/test_gallery.py" "tests/test_benchmarks.py" "tests/test_compiler.py" ]; disabledTests = [ "test_timestamp" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; </ins> pytestFlagsArray = [ "--benchmark-disable" ];
sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"; }; <del> checkInputs = [ flake8 pytest_4 pytest-expect mock ]; </del> propagatedBuildInputs = [ <del> six webencodings </del> <ins> six webencodings </ins> ]; <del> checkPhase = '' # remove test causing error # https://github.com/html5lib/html5lib-python/issues/411 rm html5lib/tests/test_stream.py py.test ''; </del> <ins> checkInputs = [ mock pytest-expect pytestCheckHook_5 ]; </ins> meta = { homepage = "https://github.com/html5lib/html5lib-python";
# it should not override the version of pytest that is used for say # Python 2. This is an ugly hack that is needed now because the hook # propagates the package. <ins> pytestCheckHook_5 = if isPy3k then self.pytestCheckHook.override { pytest = self.pytest_5; } else self.pytestCheckHook; </ins> pytestCheckHook_6_1 = if isPy3k then self.pytestCheckHook.override { pytest = self.pytest_6_1; } else
, gmime, json_glib, avahi, tracker, itstool }: stdenv.mkDerivation rec { <del> name = "grilo-plugins-0.2.13"; </del> <ins> name = "grilo-plugins-0.2.16"; </ins> src = fetchurl { url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; <del> sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; </del> <ins> sha256 = "00sjmkzxc8w4qn4lp5yj65c4y83mwhp0zlvk11ghvpxnklgmgd40"; </ins> }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
, libxml2, gnome3, gobjectIntrospection, libsoup }: stdenv.mkDerivation rec { <del> name = "grilo-0.2.12"; </del> <ins> name = "grilo-0.2.14"; </ins> src = fetchurl { url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; <del> sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m"; </del> <ins> sha256 = "1k8wj8f7xfaw5hxypnmwd34li3fq8h76dacach547rvsfjhjxj3r"; </ins> }; setupHook = ./setup-hook.sh;
in '' mkdir -p $out/etc/udev/rules.d/ <del> ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules ||  </del> <ins> ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules ||  </ins> cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules # the created 49-libsane references /bin/sh substituteInPlace $out/etc/udev/rules.d/49-libsane.rules
--prefix PATH : ${lib.makeBinPath [ openssl ]} ''; <del> preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit </del> <ins> preFixup = lib.optionalString withSlimLib </ins> # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. <del> # There was some problem with this on Darwin; let's not complicate non-Linux. </del> '' configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" configurePhase
config = mkIf cfg.enable { assertions = [ { <del> assertion = pkgs.stdenv.hostPlatform.isx86; </del> <ins> assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64; </ins> message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}"; } ]; boot.initrd.availableKernelModules = [ "mptspi" ]; <del> boot.initrd.kernelModules = [ "vmw_pvscsi" ]; </del> <ins> boot.initrd.kernelModules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ "vmw_pvscsi" ]; </ins> environment.systemPackages = [ open-vm-tools ];
++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc ++ lib.optional (cfg.speechSynthesisSupport or false) speechd <del> ++ pkcs11Modules; </del> <ins> ++ pkcs11Modules ++ gtk_modules; </ins> gtk_modules = [ libcanberra-gtk3 ]; launcherName = "${applicationName}${nameSuffix}";
final Uri entryUri = _fileSystem.path.toUri(asset); result.add(_Asset( -          baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'), <del> +          baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, 'bin', 'cache', 'artifacts', 'material_fonts'), </del> <ins> +          baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'), </ins> relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null,
in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; <del> sha256 = "sha256-NSNaL0ERYTSYn9ETjWcQiuI4hY+w/lWVOz3n9lt6O+4="; </del> <ins> sha256 = "sha256-Td3iRYGmTg8Vx9c4e4ugIIbAqhDFPax9vR2BsCIQCZA="; </ins> }; <ins> dontConfigure = true; dontBuild = true; </ins> buildInputs = [ alsa-lib freetype krb5 <ins> libtasn1 </ins> stdenv.cc.cc.lib ];
sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; }; <del> nativeBuildInputs = [ makeWrapper ]; </del> <ins> nativeBuildInputs = [ makeWrapper zip ]; </ins> installPhase = '' runHook preInstall mkdir -p $out/{bin,lib} <ins> # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class </ins> install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek
}: buildPythonPackage rec { <del> version = "1.6.0"; </del> <ins> version = "1.6.1"; </ins> pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; <del> sha256 = "73fa9769214a310486d7916453a09bd38b07d28a9dcbdf27719183c1d7d949f6"; </del> <ins> sha256 = "688be16ee5d1a2f94aa4abdc6d881e8e254d173d724ac88725955fe66bdb63d4"; </ins> }; postPatch = ''
buildPythonPackage rec { pname = "tatsu"; <del> version = "5.6.1"; </del> <ins> version = "5.7.1"; </ins> src = fetchFromGitHub { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; <del> sha256 = "149ra1lwax5m1svlv4dwjfqw00lc5vwyfj6zw2v0ammmfm1b94x9"; </del> <ins> sha256 = "12ljff6l29q92625pgsg4f7xf4dz6iz1c3zdkzz188s4lnwpy8b8"; </ins> }; disabled = pythonOlder "3.8";
buildPythonPackage rec { pname = "terminaltables"; <del> version = "3.1.0"; </del> <ins> version = "3.1.7"; </ins> src = fetchPypi { inherit pname version; <del> sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81"; </del> <ins> sha256 = "5dab2f33927c0a020b8011c81b92830ff9fd4ba701657da5d7bfdc41048360a6"; </ins> }; meta = with lib; {
buildPythonPackage rec { pname = "textacy"; <del> version = "0.11.0"; </del> <ins> version = "0.12.0"; </ins> disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; <del> sha256 = "sha256-d/tyTCewoERA15iBv4H2LORFzgco15fnnN1sneeGuF4="; </del> <ins> sha256 = "2c92bdd6b47305447b64e4cb6cc43c11675f021f910a8074bc8149dbf5325e5b"; </ins> }; propagatedBuildInputs = [
buildPythonApplication rec { pname = "trytond"; <del> version = "6.2.1"; </del> <ins> version = "6.2.2"; </ins> format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; <del> sha256 = "418f16c45b7130555447af901639b92bb188d39f46ce7fe4dfcd941c5959ed7e"; </del> <ins> sha256 = "9494016dd8b4da5a06dccdd1afbd918248d42da9f2c19b1eb8958052c747e193"; </ins> }; # Tells the tests which database to use
buildPythonPackage rec { pname = "types-protobuf"; <del> version = "3.18.1"; </del> <ins> version = "3.18.2"; </ins> src = fetchPypi { inherit pname version; <del> sha256 = "6696bf3cabc51dcc076e8de025c405dbdea7488c5268c2febd14527dac82c233"; </del> <ins> sha256 = "ca21dedfe7759acbeb0cd8f5c72a74ff3c409ae0c07bc1d94eff5123ac0fa23c"; </ins> }; propagatedBuildInputs = [ types-futures ];
buildPythonPackage rec { pname = "websocket-client"; <del> version = "1.2.1"; </del> <ins> version = "1.2.2"; </ins> disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; <del> sha256 = "8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d"; </del> <ins> sha256 = "21861f8645eb5725d1becfe86d7e7ae1a31d98b72556f9d44fcc5100976353cf"; </ins> }; propagatedBuildInputs = [
buildPythonPackage rec { pname = "youtube-search-python"; <del> version = "1.5.2"; </del> <ins> version = "1.5.3"; </ins> disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; <del> sha256 = "33f0d58f4803b0b2badf860cd31fb83d3f7edecdd2c01dd09cd6511abbf0e6b9"; </del> <ins> sha256 = "4bc39224d1f0915692101a7739289c41173de2eb88b445aabc7be284802b7489"; </ins> }; propagatedBuildInputs = [ httpx ];
buildPythonPackage rec { pname = "zope-deferredimport"; <del> version = "4.3"; </del> <ins> version = "4.3.1"; </ins> src = fetchPypi { pname = "zope.deferredimport"; inherit version; <del> sha256 = "2ddef5a7ecfff132a2dd796253366ecf9748a446e30f1a0b3a636aec9d9c05c5"; </del> <ins> sha256 = "57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1"; </ins> }; propagatedBuildInputs = [ zope_proxy ];
buildPythonPackage rec { pname = "zope-hookable"; <del> version = "5.0.1"; </del> <ins> version = "5.1.0"; </ins> src = fetchPypi { pname = "zope.hookable"; inherit version; <del> sha256 = "0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19"; </del> <ins> sha256 = "8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e"; </ins> }; checkInputs = [ zope_testing ];
# Convert systemd-style address specification to kresd config line(s). # On Nix level we don't attempt to precisely validate the address specifications. <ins> # The optional IPv6 scope spec comes *after* port, perhaps surprisingly. </ins> mkListen = kind: addr: let <del> al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr; al_v6 = builtins.match "[(.+)]:([0-9]+)" addr; </del> <ins> al_v4 = builtins.match "([0-9.]+):([0-9]+)()" addr; al_v6 = builtins.match "[(.+)]:([0-9]+)(%.*|$)" addr; </ins> al_portOnly = builtins.match "([0-9]+)" addr; al = findFirst (a: a != null) (throw "services.kresd.*: incorrect address specification '${addr}'") [ al_v4 al_v6 al_portOnly ]; <del> port = last al; addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '0.0.0.0'}"; </del> <ins> port = elemAt al 1; addrSpec = if al_portOnly == null then "'${head al}${elemAt al 2}'" else "{'::', '0.0.0.0'}"; </ins> in # freebind is set for compatibility with earlier kresd services; # it could be configurable, for example. ''
unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; <del> version = "5.4.3"; </del> <ins> version = "5.4.4"; </ins> src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; <del> sha256 = "488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506"; </del> <ins> sha256 = "588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea"; </ins> }; outputs = [ "out" "dev" ]; <del> patches = [ (fetchpatch { # https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1237 name = "console.aws.amazon.com-fix.patch"; url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4dabfbec9273703.diff"; sha256 = "3J+FDwNQ6CqIGo9pSzhrQZlHX99vXFDpPOBpwpCnOxs="; }) ]; </del> # Path fixups for the NixOS service. postPatch = '' patch meson.build <<EOF
owner = "singularityware"; repo = "singularity"; rev = version; <del> sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d"; </del> <ins> sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933"; </ins> }; nativeBuildInputs = [ autoreconfHook makeWrapper ];
outputs = [ "out" "dev" "devdoc" ]; <del> separateDebugInfo = stdenv.isLinux; </del> <ins> # https://github.com/NixOS/nixpkgs/issues/153528 # Can't be linked within a 4GB address space. separateDebugInfo = stdenv.isLinux && !stdenv.is32bit; </ins> src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
def get_current_plugins(editor: Editor) -> List[Plugin]: with CleanEnvironment(): <del> cmd = ["nix", "eval", "--impure", "--json", "--expr", editor.get_plugins] </del> <ins> cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins] </ins> log.debug("Running command %s", cmd) out = subprocess.check_output(cmd) data = json.loads(out)
description = lib.mdDoc "List of plugins to install."; example = lib.literalExpression "[ pkgs.tmuxPlugins.nord ]"; }; <ins> withUtempter = mkOption { description = lib.mdDoc '' Whether to enable libutempter for tmux. This is required so that tmux can write to /var/run/utmp (which can be queried with `who` to display currently connected user sessions). Note, this will add a guid wrapper for the group utmp! ''; default = true; type = types.bool; }; </ins> }; };
TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}''; }; }; <ins> security.wrappers = mkIf cfg.withUtempter { utempter = { source = "${pkgs.libutempter}/lib/utempter/utempter"; owner = "root"; group = "utmp"; setuid = false; setgid = true; }; }; </ins> }; imports = [
stdenv.mkDerivation rec { pname = "libutempter"; <del> version = "1.1.6"; </del> <ins> version = "1.2.1"; </ins> src = fetchurl { <del> url = "mirror://ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2"; sha256 = "15y3xbgznjxnfmix4xg3bwmqdvghdw7slbhazb0ybmyf65gmd65q"; </del> <ins> url = "http://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-${version}.tar.gz"; sha256 = "sha256-ln/vNy85HeUBhDrYdXDGz12r2WUfAPF4MJD7wSsqNMs="; </ins> }; buildInputs = [ glib ]; patches = [ ./exec_path.patch ]; <ins> patchFlags = [ "-p2" ]; </ins> prePatch = '' substituteInPlace Makefile --replace 2711 0711 '';
<del> diff -ur libutempter-1.1.6/iface.c libutempter-1.1.6.patched/iface.c --- libutempter-1.1.6/iface.c	2010-11-04 18:14:53.000000000 +0100 +++ libutempter-1.1.6.patched/iface.c	2018-06-06 15:09:11.417755549 +0200 @@ -60,9 +60,9 @@ </del> <ins> diff --git a/libutempter/iface.c b/libutempter/iface.c index 37c74a8..6f44c9a 100644 --- a/libutempter/iface.c +++ b/libutempter/iface.c @@ -43,7 +43,7 @@ __result; })) #endif -#define UTEMPTER_DEFAULT_PATHNAME	LIBEXECDIR "/utempter/utempter" +#define UTEMPTER_DEFAULT_PATHNAME	"utempter" static const char *utempter_pathname; static int saved_fd = -1; @@ -57,8 +57,8 @@ do_child(int master_fd, const char *path, char *const *argv) </ins> _exit(EXIT_FAILURE); } -	execv(path, argv); <ins> -	print_dbg("execv: %s", strerror(errno)); </ins> +	execvp(path, argv); <del> #ifdef	UTEMPTER_DEBUG -	fprintf(stderr, "libutempter: execv: %sn", strerror(errno)); +	fprintf(stderr, "libutempter: execvp: %sn", strerror(errno)); #endif </del> <ins> +	print_dbg("execvp: %s", strerror(errno)); </ins> <del> while (EACCES == errno) @@ -79,7 +79,7 @@ </del> <ins> while (EACCES == errno) { /* try saved group ID */ @@ -73,7 +73,7 @@ do_child(int master_fd, const char *path, char *const *argv) </ins> if (setgid(sgid)) break;
ncurses libevent ] ++ lib.optionals withSystemd [ systemd ] <del> ++ lib.optionals stdenv.isDarwin [ utf8proc ]; </del> <ins> ++ lib.optionals stdenv.isDarwin [ utf8proc ] ++ lib.optionals withUtempter [ libutempter ]; </ins> configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" ] ++ lib.optionals withSystemd [ "--enable-systemd" ] <ins> ++ lib.optionals withUtempter [ "--enable-utempter" ] </ins> ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ]; enableParallelBuilding = true;
<del> diff -ur mosh-1.3.2/src/frontend/mosh-server.cc mosh-1.3.2.patched/src/frontend/mosh-server.cc --- mosh-1.3.2/src/frontend/mosh-server.cc	2017-07-22 23:14:53.000000000 +0200 +++ mosh-1.3.2.patched/src/frontend/mosh-server.cc	2018-06-06 10:45:50.725352804 +0200 @@ -351,6 +351,10 @@ } } +#ifdef HAVE_UTEMPTER +    utempter_set_helper( "utempter" ); +#endif + try { return run_server( desired_ip, desired_port, command_path, command_argv, colors, verbose, with_motd ); } catch ( const Network::NetworkException &e ) { </del>
stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; <del> version = "0.5.3"; </del> <ins> version = "0.5.4"; </ins> src = fetchurl { url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz"; <del> sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; </del> <ins> sha256 = "1wvsc21imbgq3chlxfw4aycmkb2vi1bkjj9frvhga2m5b5pq82k5"; </ins> }; nativeBuildInputs = [ cmake pkg-config  ];
"-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"" ]; <del> # The comgr build tends to link against the static LLVM libraries # *and* the dynamic library. Linking against both causes errors # about command line options being registered twice. This patch # removes the static library linking. patchPhase = '' sed -e '/^llvm_map_components_to_libnames/,/[[:space:]]*Symbolize)/d'  -i CMakeLists.txt ''; </del> passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts
, enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk3 ? false, cairo <ins> , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null </ins> , Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx }: assert enableGhostscript -> ghostscript != null; assert enableGtk2 -> pygtk != null; <ins> assert enableTk -> (tcl != null) && (tk != null) && (tkinter != null) && (libX11 != null) ; </ins> buildPythonPackage rec { name = "matplotlib-${version}";
libpng pkgconfig mock pytz ] ++ stdenv.lib.optional enableGtk2 pygtk <del> ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]; </del> <ins> ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; </ins> <del> patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; </del> <ins> patches = [ ./basedirlist.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if # `$DISPLAY` is not set. The fallback option assumes that Tcl/Tk are both # installed under the same path which is not true in Nix. # With the following patch we just hard-code these paths into the install # script. postPatch = let inherit (stdenv.lib.strings) substring; tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"''; in stdenv.lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; </ins> checkPhase = '' ${python.interpreter} tests.py
stdenv.mkDerivation rec { pname = "connman"; <del> version = "1.40"; </del> <ins> version = "1.41"; </ins> src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; <del> sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI="; </del> <ins> sha256 = "sha256-eftA9P3VUwxFqo5ZL7Froj02dPOpjPELiaZXbxmN5Yk="; </ins> }; patches = lib.optionals stdenv.hostPlatform.isMusl [
<del> { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config }: </del> <ins> { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: </ins> stdenv.mkDerivation rec { <del> version = "1.0.8"; </del> <ins> version = "1.0.9"; </ins> pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; <del> sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml"; </del> <ins> sha256 = "sha256-OpiQapppuKCR27tIG5OW+KiNMP9ysv7CaobiBOW6VUI="; </ins> }; <del> patches = [ (fetchpatch { name = "CVE-2022-1253.patch"; url = "https://github.com/strukturag/libde265/commit/8e89fe0e175d2870c39486fdd09250b230ec10b8.patch"; sha256 = "sha256-F1BOWFx9oXR2trM22atyD3AJ5x6vVfURQ/PTlYP2Ibg="; }) ]; </del> nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true;
sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) <ins> (fetchpatch { name = "CVE-2021-4145.patch"; url = "https://gitlab.com/qemu-project/qemu/-/commit/66fed30c9cd11854fc878a4eceb507e915d7c9cd.patch"; sha256 = "10za2nag51y4fhc8z7fzw3dfhj37zx8rwg0xcmw5kzmb0gyvvz70"; }) </ins> ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch
"--bin=codelldb" ]; <ins> postFixup = '' mkdir -p $out/share # codelldb expects libcodelldb.so to be in the same # directory as the executable, and can't find it in $out/lib. # To make codelldb executable as a standalone, # we put all files in $out/share, and then wrap the binary in $out/bin. mv $out/bin/* $out/share cp $out/lib/* $out/share ln -s ${lldb.lib} $out/lldb makeWrapper $out/share/codelldb $out/bin/codelldb  --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" ''; </ins> patches = [ ./adapter-output-shared_object.patch ]; # Tests are linked to liblldb but it is not available here.
mkdir -p $ext/{adapter,formatters} mv -t $ext vsix-extracted/extension/* <del> cp -t $ext/adapter ${adapter}/{bin,lib}/* </del> <ins> cp -t $ext/adapter ${adapter}/share/* </ins> cp -r ../adapter/scripts $ext/adapter wrapProgram $ext/adapter/codelldb  --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
doCheck = false; postPatch = '' <del> substituteInPlace CMakeLists.txt --replace $'{SoQt_INCLUDE_DIRS}'  </del> <ins> substituteInPlace distutils_cmake/CMakeLists.txt --replace $'{SoQt_INCLUDE_DIRS}'  </ins> $'{Coin_INCLUDE_DIR}';$'{SoQt_INCLUDE_DIRS}' '';
</listitem> <listitem> <para> <ins> <literal>programs.zsh.autosuggestions.strategy</literal> now takes a list of strings instead of a string. </para> </listitem> <listitem> <para> </ins> The <literal>services.unifi.openPorts</literal> option default value of <literal>true</literal> is now deprecated and will be changed to <literal>false</literal> in 22.11. Configurations
combined `influxdb2` package is still provided in this release for backwards compatibilty, but will be removed at a later date. <ins> - `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string. </ins> - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt.