jiebi/CodeConvo huggingface dataset:
# extra `/`. ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch <ins> # Prevent a compilation error on darwin ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch </ins> ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
<del> { stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch </del> <ins> { stdenv , lib , fetchurl , fetchpatch , cairo , cmake , curl , fontconfig , freetype , lcms , libiconv , libintl , libjpeg , ninja , openjpeg , pkg-config , zlib </ins> , withData ? true, poppler_data , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { <del> name = "poppler-${suffix}-${version}"; </del> <ins> pname = "poppler-${suffix}"; inherit version; </ins> src = fetchurl { <del> url = "${meta.homepage}/poppler-${version}.tar.xz"; </del> <ins> url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; </ins> sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; }; outputs = [ "out" "dev" ]; patches = [ <ins> # Fix internal crash: a negative number that should not be </ins> (fetchpatch { name = "CVE-2018-13988"; url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; }) <ins> # Fix internal crash: a negative number that should not be (not the above!) </ins> ./0.61-CVE-2019-9959.patch ]; <del> buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; </del> <ins> nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; </ins> # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib;
meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; longDescription = '' Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; <del> license = licenses.gpl2; </del> <ins> license = licenses.gpl2Plus; </ins> platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; };
<del> { stdenv , lib </del> <ins> { lib , stdenv </ins> , fetchurl , fetchpatch <ins> , cairo </ins> , cmake <del> , ninja , pkg-config , libiconv , libintl , zlib </del> <ins> , pcre , boost , cups-filters </ins> , curl <del> , cairo , freetype </del> , fontconfig <ins> , freetype , inkscape </ins> , lcms <ins> , libiconv , libintl </ins> , libjpeg <ins> , ninja </ins> , openjpeg <ins> , pkg-config , scribusUnstable , texlive , zlib </ins> , withData ? true, poppler_data , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null , utils ? false, nss ? null , minimal ? false , suffix ? "glib" <del> , inkscape , cups-filters , texlive , scribusUnstable </del> }: let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { <del> name = "poppler-${suffix}-${version}"; version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! </del> <ins> pname = "poppler-${suffix}"; version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! </ins> outputs = [ "out" "dev" ]; src = fetchurl { <del> url = "${meta.homepage}/poppler-${version}.tar.xz"; sha256 = "sha256-2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw="; </del> <ins> url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ="; </ins> }; nativeBuildInputs = [
meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; longDescription = '' <del> Poppler is a PDF rendering library based on the xpdf-3.0 code base. In addition it provides a number of tools that can be installed separately. </del> <ins> Poppler is a PDF rendering library based on the xpdf-3.0 code base. In addition it provides a number of tools that can be installed separately. </ins> ''; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
<ins> { stdenvNoCC, lib, linuxPackages }: stdenvNoCC.mkDerivation { pname = "rtw89-firmware"; inherit (linuxPackages.rtw89) version src; dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out/lib/firmware/rtw89 cp *.bin $out/lib/firmware/rtw89 runHook postInstall ''; meta = with lib; { description = "Driver for Realtek 8852AE, an 802.11ax device"; homepage = "https://github.com/lwfinger/rtw89"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ tvorog ]; platforms = platforms.linux; }; } </ins>
<ins> { stdenv, lib, fetchFromGitHub, kernel }: let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtw89"; in stdenv.mkDerivation { pname = "rtw89"; version = "unstable-2021-07-03"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw89"; rev = "cebafc6dc839e66c725b92c0fabf131bc908f607"; sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af"; }; makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; installPhase = '' runHook preInstall mkdir -p ${modDestDir} find . -name '*.ko' -exec cp --parents {} ${modDestDir} ; find ${modDestDir} -name '*.ko' -exec xz -f {} ; runHook postInstall ''; meta = with lib; { description = " Driver for Realtek 8852AE, an 802.11ax device"; homepage = "https://github.com/lwfinger/rtw89"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ tvorog ]; platforms = platforms.linux; broken = kernel.kernelOlder "5.4"; priority = -1; }; } </ins>
rtw88 = callPackage ../os-specific/linux/rtw88 { }; rtlwifi_new = rtw88; <ins> rtw89 = callPackage ../os-specific/linux/rtw89 { }; </ins> openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; # Current stable release; don't backport release updates!
# Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { <del> version = "460.73.01"; sha256_64bit = "120ymf59l6nipczszf82lrm2p4ihhqyv2pfwwfg9wy96vqcckc8i"; settingsSha256 = "08jh7g34p9yxv5fh1cw0r2pjx65ryiv3w2lk1qg0gxn2r7xypkx0"; persistencedSha256 = "040gx4wqp3hxcfb4aba4sl7b01ixr5slhzw0xldwcqlmhpwqphi5"; </del> <ins> version = "470.57.02"; sha256_64bit = "sha256-VdeuEEgn+qeel1Mh/itg+d1C+/9lZCBTRDwOVv20xH0="; settingsSha256 = "sha256-DJg5QbyuKJmPpLQVYgTLvucI1e9YgQOO16690VXIWvk="; persistencedSha256 = "sha256-Cqv6oUFnsSi3S1sjplJKeq9bI2pqgBXPPb11HOJSlDo="; </ins> } else legacy_390;
do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT"  "$out/bin/$NEO4J_SCRIPT"  <del> --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}"  --set JAVA_HOME "$jre8" </del> <ins> --prefix PATH : "${lib.makeBinPath [ jre which gawk ]}"  --set JAVA_HOME "${jre}" </ins> done '';
check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; <del> neo4j = callPackage ../servers/nosql/neo4j { }; </del> <ins> neo4j = callPackage ../servers/nosql/neo4j { jre = jre8_headless; }; </ins> neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };
url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch"; sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2"; }) <ins> # Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch"; name = "qtwebengine-everywhere-src-5.15.5-_1904652.patch"; sha256 = "01q7hagq0ysii1jnrh5adm97vdm9cis592xr6im7accyw6hgcn7b"; }) </ins> ] ++ optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch
rustPlatform.buildRustPackage rec { pname = "helvum"; <del> version = "0.2.1"; </del> <ins> version = "0.3.0"; </ins> src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ryuukyu"; repo = pname; rev = version; <del> sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A="; </del> <ins> sha256 = "sha256-AlHCK4pWaoNjR0eflxHBsuVaaily/RvCbgJv/ByQZK4="; </ins> }; <del> cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU="; </del> <ins> cargoSha256 = "sha256-mAhh12rGvQjs2xtm+OrtVv0fgG6qni/QM/oRYoFR7U8="; </ins> nativeBuildInputs = [ clang copyDesktopItems pkg-config ]; buildInputs = [ glib gtk4 pipewire ];
python regex sip <del> zeroconf </del> <ins> (zeroconf.overrideAttrs (oldAttrs: rec { version = "0.31.0"; src = fetchFromGitHub { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; }; })) </ins> # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll
stdenv.mkDerivation rec { pname = "jetty"; <del> version = "9.4.41.v20210516"; </del> <ins> version = "9.4.43.v20210629"; </ins> src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; <del> sha256 = "sha256-hFQC1UiqZbbvyMf1FC3eqvVga3QdPWh0fbotatkVHBI="; </del> <ins> sha256 = "sha256-AfrmVLCZMuRGAZqoWeevbgXifbreErVM17rjJJ/HI9k="; </ins> }; dontBuild = true;
<del> { lib, stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg , hicolor-icon-theme, procps </del> <ins> { lib , stdenv , fetchFromGitHub , perlPackages , wrapGAppsHook , imagemagick , gdk-pixbuf , librsvg , hicolor-icon-theme , procps , libwnck , libappindicator-gtk3 </ins> }: let <del> perlModules = with perlPackages; [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo EncodeLocale TryTiny TypesSerialiser LWPMediaTypes </del> <ins> perlModules = with perlPackages; [ # Not sure if these are needed # Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique ImageMagick Cairo FileBaseDir FileWhich FileCopyRecursive XMLSimple XMLTwig XMLParser SortNaturally LocaleGettext ProcProcessTable X11Protocol ProcSimple ImageExifTool JSON JSONMaybeXS NetOAuth PathClass LWP LWPProtocolHttps NetDBus TryTiny WWWMechanize HTTPMessage HTTPDate HTMLForm HTMLParser HTMLTagset HTTPCookies EncodeLocale URI CarpAlways GlibObjectIntrospection NumberBytesHuman CairoGObject Readonly Gtk3ImageView Gtk3 Glib Pango GooCanvas2 GooCanvas2CairoTypes commonsense TypesSerialiser </ins> ]; in <del> stdenv.mkDerivation { name = "shutter-0.94.3"; </del> <ins> stdenv.mkDerivation rec { pname = "shutter"; version = "0.97"; </ins> <del> src = fetchurl { url = "https://launchpad.net/shutter/0.9x/0.94.3/+download/shutter-0.94.3.tar.gz"; sha256 = "01wv5k6zqfqa2rss461lpdpjxpfk4awzfdc6j2qk6bh4g4zgmgl5"; </del> <ins> src = fetchFromGitHub { owner = "shutter-project"; repo = "shutter"; rev = "v${version}"; sha256 = "sha256-/2eQLJJZP0ArQUrxcFdogv/4wy+O021hODkJYLQmLY8="; </ins> }; <del> nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg ] ++ perlModules; </del> <ins> nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg libwnck libappindicator-gtk3 ] ++ perlModules; </ins> <del> installPhase = '' mkdir -p "$out" cp -a . "$out" (cd "$out" && mv CHANGES README COPYING "$out/share/doc/shutter") </del> <ins> makeFlags = [ "prefix=${placeholder "out"}" ]; </ins> <del> wrapProgram $out/bin/shutter  --set PERL5LIB "${perlPackages.makePerlPath perlModules}"  --prefix PATH : "${imagemagick.out}/bin"  --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"  --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" </del> <ins> postPatch = '' patchShebangs po2mo.sh ''; preFixup = '' gappsWrapperArgs+=( --set PERL5LIB ${perlPackages.makePerlPath perlModules}  --prefix PATH : ${lib.makeBinPath [ imagemagick ] }  --suffix XDG_DATA_DIRS : ${hicolor-icon-theme}/share  --set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE ) </ins> ''; meta = with lib; {
}; }; <ins> GooCanvas2CairoTypes = buildPerlPackage rec { pname = "GooCanvas2-CairoTypes"; version = "0.001"; src = fetchurl { url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/GooCanvas2-CairoTypes-${version}.tar.gz"; sha256 = "sha256-uoBnNuvMnePYFBp2Omgr3quxy4cCveKZrf1XSs6HUFI="; }; propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ]; meta = { description = "Bridge between GooCanvas2 and Cairo types"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; </ins> GoogleProtocolBuffers = buildPerlPackage { pname = "Google-ProtocolBuffers"; version = "0.12";
}; }; <del> Gtk3ImageView = buildPerlPackage { </del> <ins> Gtk3ImageView = buildPerlPackage rec { </ins> pname = "Gtk3-ImageView"; <del> version = "6"; </del> <ins> version = "9"; </ins> src = fetchurl { <del> url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk3-ImageView-6.tar.gz"; sha256 = "0krkif9i3hrgjdskw05pcks40fmb43d21lxf4h8aclv0g8z647f0"; </del> <ins> url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz"; sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w="; </ins> }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; <del> checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; </del> <ins> checkInputs = [ TestDifferences TestDeep ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; </ins> checkPhase = '' ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24'  make test
{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint <del> , libpng, libtiff, libusb1, lz4, xz, lzo, openblas, pkg-config, qtbase , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: </del> <ins> , libpng, libtiff, libusb1, lz4, xz, lzo, openblas, opencv, pkg-config, qtbase , qtmultimedia, qtscript, qtserialport, lib, stdenv, superlu, wrapQtAppsHook, }: </ins> let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { inherit (source) src;
# opentoonz requires its own modified version of libtiff.  We still build it as # a separate package #  1. For visibility for tools like vulnix, and <del> #  2. To avoid a diamond-dependency problem with qt linking the normal libtiff #     and opentoonz linking qt and this modified libtiff, we build a qt against #     this modified libtiff as well. </del> <ins> #  2. To avoid a diamond-dependency problem with opencv linking the normal libtiff #     and opentoonz linking opencv and this modified libtiff, we build an opencv #     against this modified libtiff as well. # # We use a separate mkDerivation rather than a minimal libtiff.overrideAttrs # because the main libtiff builds with cmake and this version of libtiff was # forked before libtiff gained CMake build capability (added in libtiff-4.0.5). { lib, fetchFromGitHub, stdenv, pkg-config, zlib, libjpeg, xz, libtiff, }: </ins> <del> { fetchFromGitHub, libtiff }: </del> let source = import ./source.nix { inherit fetchFromGitHub; }; <del> in libtiff.overrideAttrs (old: { inherit (source) src; </del> <ins> in stdenv.mkDerivation { pname = "libtiff"; </ins> version = source.versions.libtiff + "-opentoonz"; <del> postUnpack = (old.postUnpack or "") + '' </del> <ins> inherit (source) src; outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ zlib libjpeg xz ]; postUnpack = '' </ins> sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}" ''; # opentoonz uses internal libtiff headers <del> postInstall = (old.postInstall or "") + '' </del> <ins> postInstall = '' </ins> cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include ''; <del> }) </del> <ins> meta = libtiff.meta // { knownVulnerabilities = ['' Do not open untrusted files with Opentoonz: Opentoonz uses an old custom fork of tibtiff from 2012 that is known to be affected by at least these 50 vulnerabilities: CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 CVE-2020-35523 CVE-2020-35524 More info at https://github.com/opentoonz/opentoonz/issues/4193 '']; maintainers = with lib.maintainers; [ chkno ]; }; } </ins>
{ fetchFromGitHub, }: rec { versions = { <del> opentoonz = "1.4.0"; libtiff = "4.0.3"; </del> <ins> opentoonz = "1.5.0"; libtiff = "4.0.3";  # The version in thirdparty/tiff-* </ins> }; src = fetchFromGitHub { owner = "opentoonz"; repo = "opentoonz"; rev = "v${versions.opentoonz}"; <del> sha256 = "0vgclx2yydsm5i2smff3fj8m750nhf35wfhva37kywgws01s189b"; </del> <ins> sha256 = "1rw30ksw3zjph1cwxkfvqj0330v8wd4333gn0fdf3cln1w0549lk"; </ins> }; }
opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; <del> opentoonz = (qt514.overrideScope' (_: _: { libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; })).callPackage ../applications/graphics/opentoonz { }; </del> <ins> opentoonz = let opentoonz-libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; in qt5.callPackage ../applications/graphics/opentoonz { libtiff = opentoonz-libtiff; opencv = opencv.override { libtiff = opentoonz-libtiff; }; }; </ins> opentabletdriver = callPackage ../tools/X11/opentabletdriver { };
substituteInPlace src/tss2-tcti/tctildr-dl.c  --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c  <del> --replace ', "libtss2' ", "$out/lib/libtss2"  --replace ', "foo' ", "$out/lib/foo"  --replace ', TEST_TCTI_NAME' ", "$out/lib/"TEST_TCTI_NAME" </del> <ins> --replace '@PREFIX@' $out/lib </ins> ''; configureFlags = [
diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c <del> index b364695c..b13be3ef 100644 </del> <ins> index b364695c..d026de71 100644 </ins> --- a/src/tss2-tcti/tctildr-dl.c +++ b/src/tss2-tcti/tctildr-dl.c <del> @@ -85,7 +85,15 @@ handle_from_name(const char *file, if (handle == NULL) { return TSS2_TCTI_RC_BAD_REFERENCE; </del> <ins> @@ -116,6 +116,50 @@ handle_from_name(const char *file, return TSS2_TCTI_RC_BAD_VALUE; </ins> } <del> -    *handle = dlopen(file, RTLD_NOW); </del> <ins> *handle = dlopen(file_xfrm, RTLD_NOW); +    if (*handle != NULL) { +        return TSS2_RC_SUCCESS; +    } else { +        LOG_DEBUG("Failed to load TCTI for name "%s": %s", file, dlerror()); +    } </ins> +    size = snprintf(file_xfrm, +                    sizeof (file_xfrm), +                    "@PREFIX@%s",
<ins> diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common --- a/comm/mail/config/mozconfigs/common +++ b/comm/mail/config/mozconfigs/common @@ -1,6 +1,3 @@ ac_add_options --enable-application=comm/mail -# Disable enforcing that add-ons are signed by the trusted root. -MOZ_REQUIRE_SIGNING= - . "$topsrcdir/build/mozconfig.common.override" diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure --- a/comm/mail/moz.configure +++ b/comm/mail/moz.configure @@ -12,6 +12,7 @@ imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/") imply_option("--enable-default-browser-agent", False) +imply_option("MOZ_REQUIRE_SIGNING", False) @depends(target_is_windows, target_is_linux) </ins>
}; patches = [ ./no-buildconfig-90.patch <ins> # There is a bug in Thunderbird 91 where add-ons are required # to be signed when the build is run with default settings. # https://bugzilla.mozilla.org/show_bug.cgi?id=1727113 # https://phabricator.services.mozilla.com/D124361 ./D124361.diff </ins> ]; meta = with lib; {
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { python = python3; }; <del> google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; }; </del> <ins> google-cloud-sdk-gce = google-cloud-sdk.override { python = python38; with-gce = true; }; </ins> google-fonts = callPackage ../data/fonts/google-fonts { };
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO="${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml"'' ]; <del> preFixup = '' rm $out/share/glib-2.0/schemas/gschemas.compiled''; </del> postInstall = '' mkdir -p $out/etc/NetworkManager/VPN ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name
# https://github.com/tulir/mautrix-telegram/issues/584 [ -f ${settingsFile} ] && rm -f ${settingsFile} old_umask=$(umask) <del> umask 0277 </del> <ins> umask 0177 </ins> ${pkgs.envsubst}/bin/envsubst  -o ${settingsFile}  -i ${settingsFileUnsubstituted}
patchShebangs meson-postinstall.py ''; <ins> dontWrapGApps = true; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; postFixup = '' wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" ''; </ins> passthru = { updateScript = gnome.updateScript { packageName = pname;
''; }; <ins> logrotate = { enable = mkOption { type = types.bool; default = true; description = '' Enable rotation of log files. ''; }; frequency = mkOption { type = types.str; default = "daily"; description = "How often to rotate the logs."; }; keep = mkOption { type = types.int; default = 30; description = "How many rotations to keep."; }; extraConfig = mkOption { type = types.lines; default = '' copytruncate compress ''; description = '' Extra logrotate config options for this path. Refer to <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details. ''; }; }; </ins> extraConfig = mkOption { type = types.attrs; default = {};
ensureUsers = singleton { name = cfg.databaseUsername; }; }; <ins> # Enable rotation of log files services.logrotate = { enable = cfg.logrotate.enable; paths = { gitlab = { path = "${cfg.statePath}/log/*.log"; user = cfg.user; group = cfg.group; frequency = cfg.logrotate.frequency; keep = cfg.logrotate.keep; extraConfig = cfg.logrotate.extraConfig; }; }; }; </ins> # The postgresql module doesn't currently support concepts like # objects owners and extensions; for now we tack on what's needed # here.
# converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI gitFlattenAttrs = let recurse = path: value: <del> if isAttrs value then </del> <ins> if isAttrs value && !lib.isDerivation value then </ins> lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value else if length path > 1 then { ${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value;
python3Packages.buildPythonApplication rec { pname = "pyradio"; <del> version = "0.8.7.2"; </del> <ins> version = "0.8.9.9"; </ins> src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = version; <del> sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1"; </del> <ins> sha256 = "04asw5alkkf2q5iixswarj6ddb0y4a6ixm7cckl6204jiyxpv6kc"; </ins> }; checkPhase = ''
fingerprint = "D618 7A03 A40A 3D56 62F5  4B46 03EF BF83 9A5F DC15"; }]; }; <ins> hleboulanger = { email = "hleboulanger@protonmail.com"; name = "Harold Leboulanger"; github = "thbkrhsw"; githubId = 33122; }; </ins> hlolli = { email = "hlolli@gmail.com"; github = "hlolli";