jiebi/CodeConvo huggingface dataset:
<ins> diff --git a/configure.ac b/configure.ac index 3ad983d..ff8ff96 100644 --- a/configure.ac +++ b/configure.ac @@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread], # Bash completion needs to ask where it goes if >= 2.0 is installed. AS_IF([test "$install_completion" != no], -  [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], -     [if test "$prefix" = "NONE"; then -        completions="`pkg-config --variable=completionsdir bash-completion`" -      else -        completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`" -      fi], -     [completions="${sysconfdir}/bash_completion.d"]) +   [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"] AC_SUBST([completions])]) AC_CONFIG_FILES([ </ins>
url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; }) <ins> # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch </ins> ]; postPatch = '' substituteInPlace scripts/mosh.pl
<del> { lib, stdenv, fetchFromGitHub </del> <ins> { lib, stdenv, fetchFromGitHub, fetchpatch </ins> , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: <del> let version = "2019-12-08"; in stdenv.mkDerivation { </del> <ins> stdenv.mkDerivation rec { </ins> pname = "openzwave"; <del> inherit version; </del> <ins> version = "1.6"; </ins> <del> # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. </del> src = fetchFromGitHub { <del> owner = "home-assistant"; </del> <ins> owner = "OpenZWave"; </ins> repo = "open-zwave"; <del> rev = "2cd2137025c529835e4893a7b87c3d56605b2681"; sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1"; </del> <ins> rev = "v${version}"; sha256 = "0xgs4mmr0480c269wx9xkk67ikjzxkh8xcssrdx0f5xcl1lyd333"; </ins> }; <ins> patches = [ (fetchpatch { name = "fix-strncat-build-failure.patch"; url = "https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105.patch"; sha256 = "1n1k5arwk1dyc12xz6xl4n8yw28vghzhv27j65z1nca4zqsxgza1"; }) (fetchpatch { name = "fix-text-uninitialized.patch"; url = "https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f.patch"; sha256 = "183mrzjh1zx2b2wzkj4jisiw8br7g7bbs167afls4li0fm01d638"; }) ]; outputs = [ "out" "doc" ]; </ins> nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; buildInputs = [ systemd ];
enableParallelBuilding = true; <del> installPhase = '' runHook preInstall DESTDIR=$out PREFIX= pkgconfigdir=lib/pkgconfig make install $installFlags runHook postInstall ''; </del> <ins> makeFlags = [ "PREFIX=${placeholder "out"}" ]; </ins> FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/";
--replace /etc/openzwave $out/etc/openzwave ''; <del> fixupPhase = '' substituteInPlace $out/lib/pkgconfig/libopenzwave.pc  --replace prefix= prefix=$out  --replace dir=    dir=$out substituteInPlace $out/bin/ozw_config  --replace pcfile=${pkg-config} pcfile=$out ''; </del> meta = with lib; { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; homepage = "http://www.openzwave.net/";
<del> { python_openzwave, fetchPypi }: </del> <ins> { python_openzwave, fetchPypi, openzwave, fetchFromGitHub }: </ins> <del> python_openzwave.overridePythonAttrs (oldAttrs: rec { </del> <ins> (python_openzwave.override { openzwave = openzwave.overrideAttrs (oldAttrs: { version = "unstable-2020-03-24"; src = fetchFromGitHub { owner = "home-assistant"; repo = "open-zwave"; rev = "94267fa298c1882f0dc73c0fd08f1f755ba83e83"; sha256 = "0p2869fwidz1wcqzfm52cwm9ab96pmwkna3d4yvvh21nh09cvmwk"; }; patches = [ ]; }); }).overridePythonAttrs (oldAttrs: rec { </ins> pname = "homeassistant_pyozw"; version = "0.1.10";
cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' install -D extra/linux/Alacritty.desktop -t $out/share/applications/ <del> install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg </del> <ins> install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg </ins> # patchelf generates an ELF that binutils' "strip" doesn't like: #    strip: not enough room for program headers, try linking with -N
<ins> { stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, fixup_yarn_lock, yarn, pkg-config, libsecret }: stdenv.mkDerivation rec { pname = "keytar"; version = "7.7.0"; src = fetchFromGitHub { owner = "atom"; repo = "node-keytar"; rev = "v${version}"; sha256 = "0ajvr4kjbyw2shb1y14c0dsghdlnq30f19hk2sbzj6n9y3xa3pmi"; }; nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config]; buildInputs = [ libsecret ]; npm_config_nodedir = nodejs-14_x; yarnOfflineCache = (callPackage ./yarn.nix {}).offline_cache; buildPhase = '' cp ${./yarn.lock} ./yarn.lock chmod u+w . ./yarn.lock export HOME=/tmp yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/node-gyp rebuild ''; doCheck = false; installPhase = '' shopt -s extglob rm -rf node_modules mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node ''; } </ins>
<ins> #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../ -i bash -p wget yarn2nix yarn set -euo pipefail if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then echo "Regenerates the Yarn dependency lock files." echo "Usage: $0 <git release tag>" exit 1 fi SRC="https://raw.githubusercontent.com/atom/node-keytar/$1" wget "$SRC/package-lock.json" wget "$SRC/package.json" rm -f yarn.lock yarn import yarn2nix > yarn.nix rm -rf node_modules package.json package-lock.json </ins>
<ins> { rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock }: rustPlatform.buildRustPackage rec { pname = "seshat-node"; version = "2.3.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "seshat"; rev = version; sha256 = "0zigrz59mhih9asmbbh38z2fg0sii2342q6q0500qil2a0rssai7"; }; sourceRoot = "source/seshat-node/native"; nativeBuildInputs = [ nodejs-14_x python3 yarn ]; buildInputs = [ sqlcipher ]; npm_config_nodedir = nodejs-14_x; yarnOfflineCache = (callPackage ./yarn.nix {}).offline_cache; buildPhase = '' cd .. chmod u+w . ./yarn.lock export HOME=/tmp yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/neon build --release ''; doCheck = false; installPhase = '' shopt -s extglob rm -rf native/!(index.node) rm -rf node_modules cp -r . $out ''; cargoSha256 = "0habjf85mzqxwf8k15msm4cavd7ldq4zpxddkwd4inl2lkvlffqj"; } </ins>
<ins> #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../ -i bash -p wget yarn2nix set -euo pipefail if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then echo "Regenerates the Yarn dependency lock files." echo "Usage: $0 <git release tag>" exit 1 fi SRC="https://raw.githubusercontent.com/matrix-org/seshat/$1" wget "$SRC/seshat-node/yarn.lock" yarn2nix > yarn.nix rm yarn.lock </ins>
{ stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { <del> name = "sysstat-12.2.0"; </del> <ins> name = "sysstat-12.2.3"; </ins> src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; <del> sha256 = "0xc3983ccr0dwab1px2jhbgj86pfmmr29k7ggnwjwm1qigmriak1"; </del> <ins> sha256 = "0c7lcjj796fvb0abqlhkval82r9yp5kvn3vi9k823r45422xv5y1"; </ins> }; buildInputs = [ gettext ];
hardeningDisable = [ "bindnow" ]; <del> preConfigure = '' # Don't record the configure flags since this causes unnecessary # runtime dependencies </del> <ins> preConfigure = # Don't record the configure flags since this causes unnecessary # runtime dependencies '' </ins> for i in main/build-defs.h.in scripts/php-config.in; do substituteInPlace $i  --replace '@CONFIGURE_COMMAND@' '(omitted)'
done export EXTENSION_DIR=$out/lib/php/extensions <ins> '' # PKG_CONFIG need not be a relative path + lib.optionalString (! lib.versionAtLeast version "7.4") '' for i in $(find . -type f -name "*.m4"); do substituteInPlace $i  --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' done '' + '' </ins> ./buildconf --copy --force if test -f $src/genfiles; then
server = index: { pkgs, ... }: let <del> ip = builtins.elemAt allConsensusServerHosts index; </del> <ins> numConsensusServers = builtins.length allConsensusServerHosts; thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; ip = thisConsensusServerHost; # since we already use IPs to identify servers </ins> in { networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ <del> { address = builtins.elemAt allConsensusServerHosts index; prefixLength = 16; } </del> <ins> { address = ip; prefixLength = 16; } </ins> ]; networking.firewall = firewallSettings; services.consul = <del> let thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; in </del> assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { enable = true; inherit webUi; extraConfig = defaultExtraConfig // { server = true; <del> bootstrap_expect = builtins.length allConsensusServerHosts; </del> <ins> bootstrap_expect = numConsensusServers; # Tell Consul that we never intend to drop below this many servers. # Ensures to not permanently lose consensus after temporary loss. # See https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040 autopilot.min_quorum = numConsensusServers; </ins> retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. # See https://github.com/hashicorp/consul/issues/2868 <del> if builtins.length allConsensusServerHosts == 1 </del> <ins> if numConsensusServers == 1 </ins> then allConsensusServerHosts else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts; bind_addr = ip;
"--with-iconv=${libiconv}" "--with-dbm=gdbm" "--with-zlib=${zlib}" <del> "--with-ca-bundle=$NIX_SSL_CERT_FILE" </del> <ins> "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" </ins> # TODO: Enable slib #       Current slib in nixpkgs is specialized to Guile # "--with-slib=${slibGuile}/lib/slib"
with stdenv.lib; stdenv.mkDerivation rec { <del> name = "corosync-2.4.3"; </del> <ins> pname = "corosync"; version = "2.4.5"; </ins> src = fetchurl { <del> url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi"; </del> <ins> url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; </ins> }; nativeBuildInputs = [ makeWrapper pkgconfig ];
<del> { lib, buildGoPackage, fetchFromGitHub }: </del> <ins> { lib, buildGoModule, fetchFromGitHub }: </ins> <del> buildGoPackage rec { pname = "oauth2_proxy"; version = "5.1.0"; goPackagePath = "github.com/pusher/${pname}"; </del> <ins> buildGoModule rec { pname = "oauth2-proxy"; version = "5.1.1"; </ins> src = fetchFromGitHub { repo = pname;
# perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; <del> buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++ </del> <ins> buildInputs = [ python perl newt slang pkgconfig libunwind binutils ] ++ </ins> stdenv.lib.optional withGtk gtk; <del> NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; </del> <ins> # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. NIX_CFLAGS_COMPILE = "-I${elfutils}/include -Wno-error=cpp"; NIX_CFLAGS_LINK = "-L${elfutils}/lib"; </ins> installFlags = "install install-man ASCIIDOC8=1";
{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid <del> , curl, libcap,  libuuid, lm_sensors, zlib </del> , nixosTests <ins> , curl, libcap, libuuid, lm_sensors, zlib </ins> , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct <ins> , withCloud ? (!stdenv.isDarwin), json_c </ins> , withSsl ? true, openssl , withDebug ? false <del> , fetchpatch </del> }: with lib;
let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { <del> version = "1.30.1"; </del> <ins> version = "1.31.0"; </ins> pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; <del> sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r"; </del> <ins> sha256 = "0735cxmljrp8zlkcq7hcxizy4j4xiv7vf782zkz5chn06n38mcik"; fetchSubmodules = true; </ins> }; nativeBuildInputs = [ autoreconfHook pkg-config ];
++ optionals withDBengine [ libuv lz4.dev judy ] ++ optionals withIpmi [ freeipmi ] ++ optionals withNetfilter [ libmnl libnetfilter_acct ] <ins> ++ optionals withCloud [ json_c ] </ins> ++ optionals withSsl [ openssl.dev ]; patches = [ # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch <del> # cgroups: fix network interfaces detection when using virsh (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/netdata/netdata/pull/11096.patch"; sha256 = "0f2rd7kgbwbyq9wyn085d213ifvivnpl3qlx1gjrg42rkbi4n8jj"; }) </del> ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
stdenv.mkDerivation rec { pname = "pyside2"; <del> version = "5.12.3"; </del> <ins> version = "5.12.6"; </ins> src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; <del> sha256 = "0hk89jm8pa0q6kifask5rrffa3bvx02dg2f97ibv7wds9dysnyjg"; </del> <ins> sha256 = "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk"; </ins> }; patches = [
<del> --- pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~	2019-06-15 10:31:04.712949189 +0200 +++ pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp	2019-06-15 11:52:52.894987343 +0200 @@ -317,15 +317,15 @@ </del> <ins> --- pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~	2020-07-08 14:37:13.022476435 -0700 +++ pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp	2020-07-08 14:37:18.271484269 -0700 @@ -330,17 +330,15 @@ </ins> } #endif // NEED_CLANG_BUILTIN_INCLUDES
-    // A fix for this has been added to Clang 5.0, so, the code can be removed -    // once Clang 5.0 is the minimum version. -    if (needsGppInternalHeaders()) { <del> -        const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); </del> <ins> -        const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); </ins> -        for (const HeaderPath &h : gppPaths) { <del> -            if (h.path.contains("c++")) </del> <ins> -            if (h.path.contains("c++") -                || h.path.contains("sysroot")) { // centOS </ins> -                headerPaths.append(h); <ins> -            } </ins> +    const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); +    for (const HeaderPath &h : gppPaths) { +        // PySide2 requires that Qt headers are not -isystem
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; <del> version = "1.5"; </del> <ins> version = "1.5.1"; </ins> src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; <del> sha256 = "0diiy3g4wz5lnz5mdvka5p2nwmrpfldsz83sssr5yiir29m4lqap"; </del> <ins> sha256 = "1l66gkidldjpznp8pb01wdgrmm0rmrbndv8lzidz8fp9hf473zgl"; </ins> }; outputs = [ "out" "dev" "doc" ];
# The test driver doesn't add an RPath to the build libdir preCheck = '' <del> export LD_LIBRARY_PATH=$PWD/src </del> <ins> export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src </ins> ''; # The cmake install gets tripped up and installs a nix tree into $out, in
meta = with lib; { description = "oneAPI Deep Neural Network Library (oneDNN)"; <del> homepage = "https://01.org/dnnl"; </del> <ins> homepage = "https://01.org/oneDNN"; </ins> changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; <del> platforms = [ "aarch64-linux" "x86_64-linux" ]; </del> <ins> platforms = platforms.all; </ins> maintainers = with maintainers; [ alexarice bhipple ]; }; }
sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; }; <ins> # See <https://gitlab.com/apparmor/apparmor/-/issues/74> This and the # accompanying application in prePatchCommon should be removed in 2.13.5 gnumake43Patch = fetchpatch { url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"; name = "2-23-fix-build-with-make-4.3.patch"; sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; }; </ins> prePatchCommon = '' <ins> patch -p1 < ${gnumake43Patch} chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh </ins> substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html" substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null <del> , withPdfReader        ? true , withMediaPlayback    ? true </del> <ins> , withPdfReader      ? true , withMediaPlayback  ? true , backend            ? "webkit" </ins> }: assert withMediaPlayback -> gst_all_1 != null;
stripRoot = false; }; <ins> backendPackage = if backend == "webengine" then python3Packages.pyqtwebengine else if backend == "webkit"    then python3Packages.pyqt5_with_qtwebkit else throw '' Unknown qutebrowser backend "${backend}". Valid choices are qtwebengine (recommended) or qtwebkit. ''; </ins> in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; version = "1.13.0";
]; propagatedBuildInputs = with python3Packages; [ <del> pyyaml pyqt5 pyqtwebengine jinja2 pygments </del> <ins> pyyaml backendPackage jinja2 pygments </ins> pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem ]; <del> patches = [ ./fix-restart.patch ]; </del> <ins> patches = [ ./fix-restart.patch ]; </ins> dontWrapGApps = true; dontWrapQtApps = true;
# them with our own. let <del> version = "3.8.5"; </del> <ins> version = "3.6.9"; </ins> sha256 = { <del> "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y"; "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig"; </del> <ins> "x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3"; "i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z"; </ins> }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch =
mkdir -p $out/etc/udev/rules.d sed -i '/udev-acl/d' usb/55-Argyll.rules cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/ <ins> sed -i -e 's/^CREATED .*/CREATED "'"$(date -d @$SOURCE_DATE_EPOCH)"'"/g' $out/share/argyllcms/RefMediumGamut.gam </ins> ''; meta = with lib; {
in stdenv.mkDerivation rec { pname = "mattermost-desktop"; <del> version = "4.5.0"; </del> <ins> version = "4.5.2"; </ins> src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; <del> sha256 = "1p44vxs7i9f15h4xjyr99g8x73qygv909a32lfkqip1fh8lk7sf4"; </del> <ins> sha256 = "0r9xmhzif1ia1m53yr59q6p3niyq3jv3vgv4703x68jmd46f91n6"; </ins> } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; <del> sha256 = "03pn853z2famqxcsrwayqb94pzghlpfb0qs2nfi8mc5zzsgcic7z"; </del> <ins> sha256 = "1h8lw06p3cqz9dkgbhfmzcrzjsir5cfhx28xm4zrmvkj4yfzbcnv"; </ins> } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
fetch --experimental_distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" <ins> build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" </ins> build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk'
fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" <ins> build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" </ins> build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk'
# add the same environment vars to compile.sh sed -e "/$command $/a --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" "  -e "/$command $/a --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" "  <ins> -e "/$command $/a --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" "  -e "/$command $/a --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" "  </ins> -e "/$command $/a --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" "  -e "/$command $/a --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" "  -e "/$command $/a --host_javabase='@local_jdk//:jdk' "
bazel_0_26 = callPackage ../development/tools/build-managers/bazel/bazel_0_26 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; <del> buildJdk = jdk8; </del> <ins> buildJdk = jdk8_headless; </ins> buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_0_29 = callPackage ../development/tools/build-managers/bazel/bazel_0_29 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; <del> buildJdk = jdk8; </del> <ins> buildJdk = jdk8_headless; </ins> buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; <del> buildJdk = jdk8; </del> <ins> buildJdk = jdk8_headless; </ins> buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; <del> buildJdk = jdk8; </del> <ins> buildJdk = jdk8_headless; </ins> buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;