jiebi/CodeConvo huggingface dataset:
<ins> { lib, stdenvNoCC, fetchFromGitHub, makeWrapper, fzf, gawk }: stdenvNoCC.mkDerivation rec { pname = "sysz"; version = "1.3.0"; src = fetchFromGitHub { owner = "joehillen"; repo = pname; rev = version; sha256 = "HNwsYE1Cv90IDi3A5PmRv3uHANR3ya+VOGBQ3+zkBLM="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; installPhase = '' runHook preInstall install -Dm755 sysz $out/libexec/sysz makeWrapper $out/libexec/sysz $out/bin/sysz  --prefix PATH : ${lib.makeBinPath [ fzf gawk ]} runHook postInstall ''; meta = with lib; { homepage = "https://github.com/joehillen/sysz"; description = "A fzf terminal UI for systemctl"; license = licenses.unlicense; maintainers = with maintainers; [ hleboulanger ]; platforms = platforms.unix; changelog = "https://github.com/joehillen/sysz/blob/${version}/CHANGELOG.md"; }; } </ins>
# fix up this call: # https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/VersionHelper.cmake#L8 echo 0 <ins> elif [[ "$1" == "rev-parse" ]]; then echo ${openfst.rev} echo 0 </ins> fi true EOF
<del> { lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices, installShellFiles }: </del> <ins> { lib , stdenv , fetchFromGitHub , rustPlatform , cmake , pkg-config , openssl , oniguruma , CoreServices , installShellFiles , libsass }: </ins> rustPlatform.buildRustPackage rec { pname = "zola";
cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n"; <del> nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] ++ lib.optional stdenv.isDarwin CoreServices; </del> <ins> nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ openssl oniguruma ] ++ lib.optional stdenv.isDarwin [ CoreServices libsass ]; </ins> RUSTONIG_SYSTEM_LIBONIG = true;
<ins> { lib, vscode-utils }: with vscode-utils; let buildVscodeLanguagePack = { language, sha256 }: buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-language-pack-${language}"; publisher = "MS-CEINTL"; version = "1.64.3"; inherit sha256; }; meta = { license = lib.licenses.mit; }; }; in # See list of core language packs at https://github.com/Microsoft/vscode-loc { # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; sha256 = "sha256-6ynT1sbMgKO8iZReQ6KxFpR1VL3Nuo58MvXCtp+67vA="; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; sha256 = "sha256-5aNFpzNMZAZJH3n0rJevke9P6AW0au5i8+r4PXsb9Rg="; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; sha256 = "sha256-oEaWtsgktHKw52lnZTESkpzC/TTY8LO4yX11IgtMG5U="; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; sha256 = "sha256-utLWbved3WCCk3XzqedbYzmyaKfbMrAmR0btT09GlxA="; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; sha256 = "sha256-0Wr2ICOiaaj4jZ555bxUJcmXO/yWDyn0UmdvxUF3WSQ="; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; sha256 = "sha256-irTSQcVXf/V3MuZwfx4tFcvBk+xhbFZTnb7IG28s/p4="; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; sha256 = "sha256-3IA/VTTTEqS6jrDYv50GnLXOTSC1XAMvqOVfOuvIdIs="; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; sha256 = "sha256-rxod70ddrppEYYzukksVY1dTXR8osLFAsIPr1fSFZDg="; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; sha256 = "sha256-QYFaxJz1PqKKIiLosLQ8Tu3JNXzpxLFqgIHjjRLwjA4="; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; sha256 = "sha256-eMk+syy2h+Xb3k6QB8PqYaF4I1ydaY6eRsvOXmelh9Q="; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; sha256 = "sha256-7Trz38KBl4sD7608MvTs02pUsdD05oHEj3Sp1LvtI7I="; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; sha256 = "sha256-T4CTpbve3vrNdW4VDfHDg8U8cQEtuxPV5LvNdtKrqzA"; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; sha256 = "sha256-rPvCr3uQPfM8vwKoV7Un5aiMZClhf6TvG1PEe3xYNI0="; }; } </ins>
sha256 = "TRmul3t//izJRdViTvxFz29JZeGYsWc7WsJjagQ35nw="; }; <ins> patches = [ ./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568 ]; </ins> postPatch = '' substituteInPlace libqtile/pangocffi.py  --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0
<ins> diff --git a/libqtile/core/lifecycle.py b/libqtile/core/lifecycle.py index 0d4d119d..c37d1799 100644 --- a/libqtile/core/lifecycle.py +++ b/libqtile/core/lifecycle.py @@ -25,7 +25,7 @@ class LifeCycle: def _atexit(self) -> None: if self.behavior is Behavior.RESTART: -            argv = [sys.executable] + sys.argv +            argv = sys.argv if "--no-spawn" not in argv: argv.append("--no-spawn") argv = [s for s in argv if not s.startswith("--with-state")] @@ -33,7 +33,7 @@ class LifeCycle: argv.append("--with-state=" + self.state_file) logger.warning("Restarting Qtile with os.execv(...)") # No other code will execute after the following line does -            os.execv(sys.executable, argv) +            os.execv(sys.argv[0], argv) elif self.behavior is Behavior.TERMINATE: logger.warning("Qtile will now terminate") elif self.behavior is Behavior.NONE: </ins>
}; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation <del> name = "youcompleteme-2016-03-08"; </del> <ins> name = "youcompleteme-2016-03-10"; </ins> src = fetchgit { url = "git://github.com/valloric/youcompleteme"; <del> rev = "381b2132719a959f41e57ec0e6396fc1c3b6daf4"; sha256 = "1gski3s1960pmxisyq85awda0a3kb22ji9y76f67k1a4smy5q9xa"; </del> <ins> rev = "f44435b88ec98156d17869aa67ad15f38cfecbf3"; sha256 = "1y50ilyfwj6rvpvg50iq418maxvsfs54i202v7x0lfs5hmvcb4hi"; </ins> }; dependencies = []; buildInputs = [
mkdir build pushd build cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON <del> make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} </del> <ins> make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} </ins> ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang popd '';
XDP_SOCKETS        = whenAtLeast "4.19" yes; XDP_SOCKETS_DIAG   = whenAtLeast "5.1" yes; WAN                = yes; <ins> TCP_CONG_ADVANCED  = yes; </ins> TCP_CONG_CUBIC     = yes; # This is the default congestion control algorithm since 2.6.19 # Required by systemd per-cgroup firewalling CGROUP_BPF                  = option yes;
<ins> { lib , stdenv , fetchFromGitHub , fetchYarnDeps , yarn , fixup_yarn_lock , nodejs }: stdenv.mkDerivation (finalAttrs: { pname = "hydrogen-web"; version = "0.4.0"; src = fetchFromGitHub { owner = "vector-im"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs ]; configurePhase = '' runHook preConfigure export HOME=$PWD/tmp mkdir -p $HOME fixup_yarn_lock yarn.lock yarn config --offline set yarn-offline-mirror $offlineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules runHook postConfigure ''; buildPhase = '' runHook preBuild yarn build --offline runHook postBuild ''; installPhase = '' runHook preInstall cp -R target $out runHook postInstall ''; meta = { description = "Lightweight matrix client with legacy and mobile browser support"; homepage = "https://github.com/vector-im/hydrogen-web"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; }; }) </ins>
<ins> { stdenv , jq , hydrogen-web-unwrapped , conf ? { } }: if (conf == { }) then hydrogen-web-unwrapped else stdenv.mkDerivation { pname = "${hydrogen-web-unwrapped.pname}-wrapped"; inherit (hydrogen-web-unwrapped) version meta; dontUnpack = true; nativeBuildInputs = [ jq ]; installPhase = '' runHook preInstall mkdir -p $out ln -s ${hydrogen-web-unwrapped}/* $out rm $out/config.json jq -s '.[0] * $conf' "${hydrogen-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" runHook postInstall ''; } </ins>
hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; <ins> hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { conf = config.hydrogen-web.conf or { }; }; </ins> hivelytracker = callPackage ../applications/audio/hivelytracker { }; hledger = haskell.lib.compose.justStaticExecutables haskellPackages.hledger;
stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; <del> version = "2021-07-27"; </del> <ins> version = "2021-09-24"; </ins> src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; <del> sha256 = "17x4lqlv6whx8vg0c1nm89j7671l033apn4alqyhjb9qx5w2fa43"; </del> <ins> sha256 = "12dwmgq0kadjfky5bjm62vwgdlw3nmrrhqqs5iw15w0pn3mbmd5c"; </ins> }; nativeBuildInputs = [
})) ]; <del> postFixup = '' </del> <ins> postFixup = let libPath = lib.makeLibraryPath ([ libglvnd libxkbcommon xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ] ++ lib.optionals enableWayland [ wayland ]); in '' </ins> wrapProgram $out/bin/neovide  <del> --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd libxkbcommon wayland xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]} </del> <ins> --prefix LD_LIBRARY_PATH : ${libPath} </ins> ''; postInstall = ''
python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; <del> version = "3.1.1"; </del> <ins> version = "3.2.0"; </ins> src = fetchFromGitHub { owner = "Nicotine-Plus"; repo = "nicotine-plus"; rev = version; <del> hash = "sha256-NfI2RfxAYhA1qefml1ayfYWjbkrzUL4l9p2Rm/ROnzQ="; </del> <ins> hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak="; </ins> }; nativeBuildInputs = [ gettext wrapGAppsHook ];
[ CoreAudio AudioToolbox ]; # propagation is needed for Security.framework to be available when linking <del> propagatedBuildInputs = [ aws-c-cal aws-c-event-stream aws-c-io aws-c-common aws-checksums s2n-tls ]; </del> <ins> propagatedBuildInputs = [ aws-crt-cpp ]; </ins> cmakeFlags = [ "-DBUILD_DEPS=OFF"
<del> { version, javaVersion, platforms, hashes ? import ./hashes.nix }: { stdenv, lib, fetchurl, autoPatchelfHook, setJavaClassPath, makeWrapper # minimum dependencies , Foundation, alsa-lib, fontconfig, freetype, glibc, openssl, perl, unzip, xorg </del> <ins> { version , javaVersion , platforms , hashes ? import ./hashes.nix , useMusl ? false }: { stdenv , lib , autoPatchelfHook , fetchurl , makeWrapper , setJavaClassPath , writeShellScriptBin # minimum dependencies , alsa-lib , fontconfig , Foundation , freetype , glibc , openssl , perl , unzip , xorg </ins> , zlib <del> # runtime dependencies </del> <ins> # runtime dependencies , binutils </ins> , cups <del> # runtime dependencies for GTK+ Look and Feel , gtkSupport ? true, cairo, glib, gtk3 }: </del> <ins> , gcc , musl # runtime dependencies for GTK+ Look and Feel , gtkSupport ? stdenv.isLinux , cairo , glib , gtk3 }: assert useMusl -> stdenv.isLinux; </ins> let platform = {
x86_64-darwin = "darwin-amd64"; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); <del> runtimeDependencies = [ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]; </del> <ins> runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); </ins> <del> runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; </del> <ins> runtimeDependencies = lib.makeBinPath ([ binutils stdenv.cc ] ++ lib.optionals useMusl [ (lib.getDev musl) # GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc (writeShellScriptBin "${stdenv.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'') ]); </ins> javaVersionPlatform = "${javaVersion}-${platform}";
outputs = [ "out" "lib" ]; <del> installPhase = let copyClibrariesToOut = basepath: '' # provide libraries needed for static compilation for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do ln -s $f ${basepath}/${platform}/$(basename $f) done ''; copyClibrariesToLib = '' # add those libraries to $lib output too, so we can use them with # `native-image -H:CLibraryPath=''${graalvm11-ce.lib}/lib ...` and reduce # closure size by not depending on GraalVM $out (that is much bigger) </del> <ins> installPhase = let copyClibrariesToOut = basepath: '' # provide libraries needed for static compilation ${ if useMusl then "for f in ${musl.stdenv.cc.cc}/lib/* ${musl}/lib/* ${zlib.static}/lib/*; do" else "for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do" } ln -s $f ${basepath}/${platform}/$(basename $f) done ''; copyClibrariesToLib = '' # add those libraries to $lib output too, so we can use them with # `native-image -H:CLibraryPath=''${lib.getLib graalvm11-ce}/lib ...` and reduce # closure size by not depending on GraalVM $out (that is much bigger) mkdir -p $lib/lib for f in ${glibc}/lib/*; do ln -s $f $lib/lib/$(basename $f) done ''; in { "11-linux-amd64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "17-linux-amd64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "11-linux-aarch64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "17-linux-aarch64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "11-darwin-amd64" = ""; "17-darwin-amd64" = ""; }.${javaVersionPlatform} + '' # ensure that $lib/lib exists to avoid breaking builds </ins> mkdir -p $lib/lib <del> for f in ${glibc}/lib/*; do ln -s $f $lib/lib/$(basename $f) done ''; in { "11-linux-amd64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "17-linux-amd64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "11-linux-aarch64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} </del> <ins> # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # copy-paste openjdk's preFixup # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat <<EOF > $out/nix-support/setup-hook if [ -z "''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF </ins> ''; <del> "17-linux-aarch64" = '' ${copyClibrariesToOut "$out/lib/svm/clibraries"} ${copyClibrariesToLib} ''; "11-darwin-amd64" = ""; "17-darwin-amd64" = ""; }.${javaVersionPlatform} + '' # ensure that $lib/lib exists to avoid breaking builds mkdir -p $lib/lib # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ ''; </del> dontStrip = true; <del> preFixup = '' </del> <ins> # Workaround for libssl.so.10 wanted by TruffleRuby # Resulting TruffleRuby cannot use `openssl` library. autoPatchelfIgnoreMissingDeps = stdenv.isDarwin; preFixup = lib.optionalString (stdenv.isLinux) '' </ins> # We cannot use -exec since wrapProgram is a function but not a # command. #
for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then wrapProgram "$bin"  <del> --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" </del> <ins> --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"  --prefix PATH : "${runtimeDependencies}" </ins> fi done <del> # copy-paste openjdk's preFixup # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat <<EOF > $out/nix-support/setup-hook if [ -z "''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF </del> find "$out" -name libfontmanager.so -exec  patchelf --add-needed libfontconfig.so {} ; <ins> # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby patchelf $out/languages/ruby/lib/mri/openssl.so  --replace-needed libssl.so.10 libssl.so  --replace-needed libcrypto.so.10 libcrypto.so </ins> ''; # $out/bin/native-image needs zlib to build native executables.
# run on JVM with Graal Compiler $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' <del> # Ahead-Of-Time compilation $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld ./helloworld | fgrep 'Hello World' </del> <ins> ${# --static flag doesn't work for darwin lib.optionalString (stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation" $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld ./helloworld | fgrep 'Hello World' </ins> <del> ${ lib.optionalString stdenv.isLinux '' # Ahead-Of-Time compilation with --static # --static flag doesn't work for darwin </del> <ins> echo "Ahead-Of-Time compilation with --static" </ins> $out/bin/native-image --no-server --static HelloWorld ./helloworld | fgrep 'Hello World' '' } <ins> ${# --static flag doesn't work for darwin lib.optionalString (stdenv.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image --no-server --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' '' } </ins> ${# TODO: Doesn't work on MacOS, we have this error: # "Launching JShell execution engine threw: Operation not permitted (Bind failed)" lib.optionalString (stdenv.isLinux) ''
{ mkDerivation, lib, <del> extra-cmake-modules, kdoctools, </del> <ins> extra-cmake-modules, kdoctools, fetchpatch, </ins> epoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, pipewire, udev, wayland, xcb-util-cursor, xwayland,
./0002-xwayland.patch ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch <ins> # Pass special environments through arguemnts to `kwin_wayland`, bypassing # ld.so(8) environment stripping due to `kwin_wayland`'s capabilities. # We need this to have `TZDIR` correctly set for `plasmashell`, or # everything related to timezone, like clock widgets, will be broken. # https://invent.kde.org/plasma/kwin/-/merge_requests/1590 (fetchpatch { url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; }) </ins> ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
"-DARROW_BUILD_TESTS=ON" "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" <ins> "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent) </ins> "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON"
}; modRoot = "gopls"; <del> vendorSha256 = "sha256-nKjJjtVHk/RLIHI/5v8tO4RcaLLZhr0A6llYGsB0ifQ="; </del> <ins> vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; </ins> doCheck = false;
sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; <del> vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; </del> <ins> vendorSha256 = "1xgl4avq0rblzqqpaxl4dwg4ysrhacwhfd21vb0v9ffr3zcpdw9n"; proxyVendor = true; </ins> subPackages = [ "." ];
rev = "v${version}"; sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI="; }; <del> vendorSha256 = "sha256-ZZTM1s/kFHkCjnaDYuP7xCrkW2an3I6kvcMXMy63ySE="; </del> <ins> vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo="; </ins> patches = [ (substituteAll {
sha256 = "sha256-JRJjuVF0MkV7KVmbAZhiWPWVwDORByCsZqPwdTuVRoA="; }; <del> vendorSha256 = "sha256-nsuI8z0xJYZwhlYHasxHpAAYycpqN0qmS8c0APvxxwc="; </del> <ins> vendorSha256 = "sha256-/N/RYqt+lhhECK+uq99vkm3Mg7PWpdE0GYLXkIYthNw="; </ins> buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; <del> # go_1_17 has go module changes which may not be portable # across different go versions and/or platforms: # https://github.com/NixOS/nixpkgs/issues/144667 # # That's why `buildGoPackage != buildGo117Package`. </del> buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; <del> buildGoPackage = buildGo116Package; </del> <ins> buildGoPackage = buildGo117Package; </ins> buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; <del> # go_1_17 has go module changes which may not be portable # across different go versions and/or platforms: # https://github.com/NixOS/nixpkgs/issues/144667 # # That's why `buildGoModule != buildGo117Module`. </del> buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; <del> buildGoModule = buildGo116Module; </del> <ins> buildGoModule = buildGo117Module; </ins> go2nix = callPackage ../development/tools/go2nix { };
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; <del> open-policy-agent = callPackage ../development/tools/open-policy-agent { }; </del> <ins> open-policy-agent = callPackage ../development/tools/open-policy-agent { buildGoModule = buildGo116Module; }; </ins> openshift = callPackage ../applications/networking/cluster/openshift { };
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire <del> , jemallocSupport ? true, jemalloc </del> <ins> # Workaround: disabled since currently jemalloc causes crashes with LLVM 13. # https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 , jemallocSupport ? false, jemalloc </ins> ## privacy-related options
}) else stdenv; <del> # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking # We also disable adding "-g" for easier linking releaseFlags = if stdenv.is32bit then [ "--disable-release" "--disable-debug-symbols" ] else [ "--enable-release" ]; </del> in buildStdenv.mkDerivation ({
${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"}  ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"}  $NIX_CFLAGS_COMPILE" <ins> ${ # Bindgen doesn't like the flag added by `separateDebugInfo`. lib.optionalString enableDebugSymbols '' BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}" ''} </ins> echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG '' + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox.
#   https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 # elf-hack is broken when using clang+lld: #   https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 <del> ++ lib.optional ltoSupport "--enable-lto" </del> <ins> ++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO. </ins> ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"
++ lib.optional drmSupport "--enable-eme=widevine" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] <del> else ([ "--disable-debug" "--enable-optimize" "--enable-strip" ] ++ releaseFlags)) </del> <ins> else [ "--disable-debug" "--enable-optimize" ]) # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking ++ flag (!debugBuild && !stdenv.is32bit) "release" ++ flag enableDebugSymbols "debug-symbols" ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] </ins> ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags;