jiebi/CodeConvo huggingface dataset:
<ins> commit 9658b01431cd7ff6344d7787f855179e73fe81a7 Author: Leon Bottou <leon@bottou.org> Date:   Mon Apr 8 22:55:38 2019 -0400 fix bug #298 diff --git a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h index e8e0c9b..ca89a19 100644 --- a/libdjvu/GBitmap.h +++ b/libdjvu/GBitmap.h @@ -566,7 +566,7 @@ GBitmap::operator[](int row) { if (!bytes) uncompress(); -  if (row<0 || row>=nrows) { +  if (row<0 || row>=nrows || !bytes) { #ifndef NDEBUG if (zerosize < bytes_per_row + border) G_THROW( ERR_MSG("GBitmap.zero_small") ); @@ -581,7 +581,7 @@ GBitmap::operator[](int row) const { if (!bytes) ((GBitmap*)this)->uncompress(); -  if (row<0 || row>=nrows) { +  if (row<0 || row>=nrows || !bytes) { #ifndef NDEBUG if (zerosize < bytes_per_row + border) G_THROW( ERR_MSG("GBitmap.zero_small") ); </ins>
<ins> commit c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 Author: Leon Bottou <leon@bottou.org> Date:   Thu Oct 17 22:20:31 2019 -0400 Fixed bug 309 diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp index 00752a0..f81eaeb 100644 --- a/libdjvu/IW44EncodeCodec.cpp +++ b/libdjvu/IW44EncodeCodec.cpp @@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale) int y = 0; int s = scale*rowsize; int s3 = s+s+s; -  h = ((h-1)/scale)+1; +  h = (h>0) ? ((h-1)/scale)+1 : 0; y += 1; p += s; while (y-3 < h) diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp index 6d0df3b..7109952 100644 --- a/tools/ddjvu.cpp +++ b/tools/ddjvu.cpp @@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno) prect.h = (ih * 100) / dpi; } /* Process aspect ratio */ -  if (flag_aspect <= 0) +  if (flag_aspect <= 0 && iw>0 && ih>0) { double dw = (double)iw / prect.w; double dh = (double)ih / prect.h; </ins>
buildInputs = [ libjpeg libtiff librsvg libiconv ]; <ins> patches = [ ./CVE-2019-18804.patch # This one is needed to make the following # two CVE patches apply cleanly ./fix_hongfuzz_crash.patch ./CVE-2019-15142.patch ./CVE-2019-15143.patch ./CVE-2019-15144.patch ./CVE-2019-15145.patch ]; </ins> meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net;
<ins> commit 89d71b01d606e57ecec2c2930c145bb20ba5bbe3 Author: Leon Bottou <leon@bottou.org> Date:   Fri Jul 13 08:46:22 2018 -0400 fix hongfuzz crash. diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp index d322323..a6a39e0 100644 --- a/libdjvu/DjVmDir.cpp +++ b/libdjvu/DjVmDir.cpp @@ -299,7 +299,13 @@ DjVmDir::decode(const GP<ByteStream> &gstr) memcpy((char*) strings+strings_size, buffer, length); } DEBUG_MSG("size of decompressed names block=" << strings.size() << "n"); - +      if (strings[strings.size()-1] != 0) +        { +         int strings_size=strings.size(); +         strings.resize(strings_size+1); +         strings[strings_size] = 0; +        } + // Copy names into the files const char * ptr=strings; for(pos=files_list;pos;++pos) diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp index 6a5cd90..828addc 100644 --- a/libdjvu/miniexp.cpp +++ b/libdjvu/miniexp.cpp @@ -1065,7 +1065,7 @@ print_c_string(const char *s, char *d, int flags, size_t len) c = (unsigned char)(*s++); if (char_quoted(c, flags)) { -          char buffer[10]; +          char buffer[16]; /* 10+1 */ static const char *tr1 = ""tnrbf"; static const char *tr2 = ""tnrbf"; buffer[0] = buffer[1] = 0; diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp index 7ed13ad..fab9472 100644 --- a/tools/csepdjvu.cpp +++ b/tools/csepdjvu.cpp @@ -1834,7 +1834,7 @@ main(int argc, const char **argv) ByteStream::create(GURL::Filename::UTF8(arg),"rb"); BufferByteStream ibs(*fbs); do { -                char pagename[16]; +                char pagename[20]; sprintf(pagename, "p%04d.djvu", ++pageno); if (opts.verbose > 1) DjVuPrintErrorUTF8("%s","--------------------n"); </ins>
{ lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { <del> pname = "chef-dk"; version = "4.13.3"; </del> <ins> name = "chef-dk-4.13.3"; # Do not change this to pname & version until underlying issues with Ruby # packaging are resolved ; see https://github.com/NixOS/nixpkgs/issues/70171 </ins> inherit ruby; gemdir = ./.;
rustPlatform.buildRustPackage rec { pname = "sequoia"; <del> version = "0.10.0"; </del> <ins> version = "0.11.0"; </ins> src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; <del> sha256 = "0gvczghyik56jlnb8cz7jg2l3nbm519gf19g7l5blxci3009v23d"; </del> <ins> sha256 = "1k0pr3vn77fpfzyvbg7xb4jwm6srsiws9bsd8q7i3hl6j56a880i"; </ins> }; <del> cargoSha256 = "0dk9sjcbmygbdpwqnah5krli1p9j5hahgiqrca9c0kfpfiwgx62q"; </del> <ins> cargoSha256 = "15bhg7b88rq8p0bn6y5wwv2l42kqb1qyx2s3kw0r0v0wadf823q3"; </ins> nativeBuildInputs = [ pkgconfig
<ins> diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc index 8f8f15685f..a7ae52d1e4 100644 --- a/src/main/cpp/option_processor.cc +++ b/src/main/cpp/option_processor.cc @@ -56,7 +56,7 @@ OptionProcessor::OptionProcessor( : workspace_layout_(workspace_layout), startup_options_(std::move(default_startup_options)), parse_options_called_(false), -      system_bazelrc_path_(BAZEL_SYSTEM_BAZELRC_PATH) {} +      system_bazelrc_path_("@bazelSystemBazelRCPath@") {} OptionProcessor::OptionProcessor( const WorkspaceLayout* workspace_layout, </ins>
''; }; <ins> bazelRC = writeTextFile { name = "bazel-rc"; text = '' build --override_repository=${remote_java_tools.name}=${remote_java_tools} build --distdir=${distDir} startup --server_javabase=${runJdk} # load default location for the system wide configuration try-import /etc/bazel.bazelrc ''; }; </ins> in stdenv.mkDerivation rec { pname = "bazel";
src = ./strict_action_env.patch; strictActionEnvPatch = defaultShellPath; }) <ins> # bazel reads its system bazelrc in /etc # override this path to a builtin one (substituteAll { src = ./bazel_rc.patch; bazelSystemBazelRCPath = bazelRC; }) </ins> ] ++ lib.optional enableNixHacks ./nix-hacks.patch;
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash patchShebangs . <del> # bazel reads its system bazelrc in /etc # override this path to a builtin one substituteInPlace  src/main/cpp/option_processor.cc  --replace BAZEL_SYSTEM_BAZELRC_PATH ""$out/etc/bazelrc"" </del> ''; in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + genericPatches;
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel mv ./bazel_src/output/bazel $out/bin/bazel-real <del> wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}" # generates the system bazelrc # warning: the name of the repository depends on the system, hence # the reference to .name mkdir $out/etc echo "build --override_repository=${remote_java_tools.name}=${remote_java_tools}" > $out/etc/bazelrc echo "build --distdir=${distDir}" >> $out/etc/bazelrc </del> # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
source-sans-pro ]; <ins> ## Enable soft realtime scheduling, only supported on wayland ## security.wrappers.".gnome-shell-wrapped" = { source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped"; capabilities = "cap_sys_nice=ep"; }; systemd.user.services.gnome-shell-wayland = let gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} '' mkdir -p $out/bin/ cp ${gnome-shell}/bin/gnome-shell $out/bin sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell ''; in { # Note we need to clear ExecStart before overriding it serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"]; # Do not use the default environment, it provides a broken PATH environment = mkForce {}; }; </ins> # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst environment.systemPackages = with pkgs.gnome3; [ adwaita-icon-theme
{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo <del> , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 </del> <ins> , pango, cogl, json-glib, libstartup_notification, zenity, libcanberra-gtk3 </ins> , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop , geocode-glib, pipewire, libgudev, libwacom, xwayland, meson
buildInputs = [ glib gobject-introspection gtk3 gsettings-desktop-schemas upower <del> gnome-desktop cairo pango cogl clutter zenity libstartup_notification </del> <ins> gnome-desktop cairo pango cogl zenity libstartup_notification </ins> geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire xwayland
]; patches = [ <ins> # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 ./drop-inheritable.patch </ins> # TODO: submit upstream ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch (substituteAll {
nativeBuildInputs = [ qmake qttools ]; <del> buildInputs = [ qtbase ]; </del> <ins> buildInputs = [ qtbase qtsvg ]; </ins> qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" <ins> "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" </ins> ]; <del> preConfigure = '' qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix" ''; </del> enableParallelBuilding = true; meta = with lib; {
, python3 , which , zopfli <del> , fetchpatch </del> <ins> , noto-fonts-emoji </ins> }: let version = "12.1.2"; <del> # Cannot use noto-fonts-emoji.src since it is too old # and still tries to use vendored pngquant. notoSrc = fetchFromGitHub { name = "noto"; owner = "googlefonts"; repo = "noto-emoji"; rev = "833a43d03246a9325e748a2d783006454d76ff66"; sha256 = "1g6ikzk8banm3ihqm9g27ggjq2mn1b1hq3zhpl13lxid6mp60s4a"; }; </del> twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter";
sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; }; <del> python = python3.withPackages (pp: with pp; [ nototools ]); </del> in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; inherit version; srcs = [ <del> notoSrc </del> <ins> noto-fonts-emoji.src </ins> twemojiSrc ]; <del> sourceRoot = notoSrc.name; </del> <ins> sourceRoot = noto-fonts-emoji.src.name; </ins> postUnpack = '' chmod -R +w ${twemojiSrc.name} <del> mv ${twemojiSrc.name} ${notoSrc.name} </del> <ins> mv ${twemojiSrc.name} ${noto-fonts-emoji.src.name} </ins> ''; nativeBuildInputs = [
graphicsmagick pkg-config pngquant <del> python </del> <ins> python3 python3.pkgs.nototools </ins> which zopfli ]; patches = [ <del> # Port to python3 (fetchpatch { url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-port-to-python3.patch"; sha256 = "1b91abd050phxlxq7322i74nkx16fkhpw14yh97r2j4c7fqarr2q"; }) (fetchpatch { url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-python3.patch"; sha256 = "0mw2c748izb6h9a19jwc0qxlb6l1kj6k8gc345lpf7lfcxfl7l59"; }) </del> <ins> # ImageMagick -> GrahphicsMagick </ins> (fetchpatch { url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch"; sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2";
pname = "scfbuild"; version = "1.0.3"; <ins> format = "other"; </ins> src = fetchFromGitHub { <del> owner = "eosrei"; </del> <ins> owner = "13rac1"; </ins> repo = "scfbuild"; rev = "9acc7fc5fedbf48683d8932dd5bd7583bf922bae"; sha256 = "1zlqsxkpg7zvmhdjgbqwwc9qgac2b8amzq8c5kwyh5cv95zcp6qn"; }; <del> phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; </del> <ins> patches = [ # Convert to Python 3 # https://github.com/13rac1/scfbuild/pull/19 ./python-3.patch ]; </ins> propagatedBuildInputs = [ pyyaml fonttools fontforge ]; installPhase = '' <ins> runHook preInstall </ins> mkdir -p $out/${python.sitePackages} cp -r scfbuild $out/${python.sitePackages} cp -r bin $out <ins> runHook postInstall </ins> ''; meta = with lib; { description = "SVGinOT color font builder"; <del> homepage = https://github.com/eosrei/scfbuild; </del> <ins> homepage = https://github.com/13rac1/scfbuild; </ins> license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; };
<ins> --- a/bin/scfbuild +++ b/bin/scfbuild @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from __future__ import (absolute_import, division, print_function, --- a/scfbuild/builder.py +++ b/scfbuild/builder.py @@ -287,8 +287,8 @@ def _add_name_record(self, text, name_id, platform_id, plat_enc_id, lang_id): # TODO: The installed version of fontTools doesn't have # table__n_a_m_e.setName(). record = NameRecord() -        # PyYAML creates strings, force to Unicode -        record.string = unicode(text) +        # PyYAML creates strings, which are unicode as of Python3 +        record.string = text record.nameID = name_id record.platformID = platform_id record.platEncID = plat_enc_id --- a/scfbuild/fforge.py +++ b/scfbuild/fforge.py @@ -84,7 +84,7 @@ def add_glyphs(font, svg_filepaths, conf): u_ids = [int(u_id, 16) for u_id in filename.split("-")] # Example: (0x1f441, 0x1f5e8) -            u_str = ''.join(map(unichr, u_ids)) +            u_str = ''.join(map(chr, u_ids)) # Example: "U0001f441U0001f5e8" # Replace sequences with correct ZWJ/VS16 versions as needed --- a/scfbuild/main.py +++ b/scfbuild/main.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SCFBuild is released under the GNU General Public License v3. index 0000000..99418b5 --- /dev/null +++ b/scfbuild/requirements.txt @@ -0,0 +1,2 @@ +fonttools>=3.41.2 +PyYAML>=5.1 </ins>
sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm"; }; <del> buildInputs = [ fontforge pythonPackages.fonttools python ]; </del> <ins> buildInputs = [ fontforge python3Packages.fonttools python3 ]; </ins> installPhase = '' find . -name '*Narrow*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} ;
sha256 = "043g0gnjc7wn1szvrs0rc1vvrq1qmhqh45b0y2kwrlxsgprpv8ll"; }; <del> nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]); </del> <ins> nativeBuildInputs = (with python3Packages; [ python fonttools fontforge ]); </ins> postPatch = '' rm *.otf
"-DJSON_MultipleHeaders=ON" ]; <del> doCheck = stdenv.hostPlatform == stdenv.buildPlatform; </del> <ins> # A test cause the build to timeout https://github.com/nlohmann/json/issues/1816 #doCheck = stdenv.hostPlatform == stdenv.buildPlatform; doCheck = false; </ins> postInstall = "rm -rf $out/lib64";
in stdenv.mkDerivation rec { <del> name = "aspell-0.60.6.1"; </del> <ins> name = "aspell-0.60.8"; </ins> src = fetchurl { url = "mirror://gnu/aspell/${name}.tar.gz"; <del> sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; </del> <ins> sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; </ins> }; <del> patches = [ (fetchpatch { # remove in >= 0.60.7 name = "gcc-7.patch"; url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff"; sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix"; }) (fetchpatch { name = "CVE-2019-17544.patch"; url = "https://github.com/GNUAspell/aspell/commit/80fa26c74279fced8d778351cff19d1d8f44fe4e.patch"; sha256 = "0k5dnh8gcb7chnyx7jgkksqmz2hm05hmrvcd0znsfib975pvp4rg"; }) ] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; </del> <ins> patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; </ins> postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} ''; <del> nativeBuildInputs = [ perl ]; </del> <ins> buildInputs = [ perl ]; </ins> doCheck = true;
# As of 2.19.0, t5562 refers to #!/usr/bin/perl patchShebangs t/t5562/invoke-with-content-length.pl <ins> '' + stdenv.lib.optionalString stdenv.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern </ins> '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit
stdenv.mkDerivation rec { pname = "gnunet"; <del> version = "0.11.6"; </del> <ins> version = "0.11.8"; </ins> src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; <del> sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q"; </del> <ins> sha256 = "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj"; </ins> }; enableParallelBuilding = true;
owner = "hsoft"; repo = "send2trash"; rev = version; <del> sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx"; </del> <ins> sha256 = "1c76zldhw2ay7q7r00nnzcampjz9lkqfcbzqpm0iqp5i6bmmv30v"; </ins> }; doCheck = !stdenv.isDarwin;
<ins> { lib, stdenv, fetchFromGitHub , autoPatchelfHook , fuse, packer , maven, jdk, jre, makeWrapper, glib, wrapGAppsHook }: let pname = "cryptomator"; version = "1.5.13"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; sha256 = "1s9jl3nl6yfjzmilz9b8azk8592nd39xflzfdf38v6s4iiq86r8j"; }; icons = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator-linux"; rev = version; sha256 = "1x6h6wp6yxnj576874xj3d2jm8jmb7918wprqvlz4sryxhlcssa7"; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) deps = stdenv.mkDerivation { name = "cryptomator-${version}-deps"; inherit src; nativeBuildInputs = [ jdk maven ]; buildPhase = '' cd main while mvn -Prelease package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" done ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' find $out/.m2 -type f -regex '.+(.lastUpdated|resolver-status.properties|_remote.repositories)' -delete find $out/.m2 -type f -iname '*.pom' -exec sed -i -e 's/r+$//' {} ; ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = "06q8bqdz3c4i84wxl9z5861zwdsw8jzcvsbgxqrnh8rwi7500sa7"; }; in stdenv.mkDerivation rec { inherit pname version src; buildPhase = '' cd main mvn -Prelease package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; installPhase = '' mkdir -p $out/bin/ $out/usr/share/cryptomator/libs/ cp buildkit/target/libs/* buildkit/target/linux-libs/* $out/usr/share/cryptomator/libs/ makeWrapper ${jre}/bin/java $out/bin/cryptomator  --add-flags "-classpath '$out/usr/share/cryptomator/libs/*'"  --add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'"  --add-flags "-Dcryptomator.ipcPortPath='~/.config/Cryptomator/ipcPort.bin'"  --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'"  --add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'"  --add-flags "-Djdk.gtk.version=3"  --add-flags "-Xss20m"  --add-flags "-Xmx512m"  --add-flags "org.cryptomator.launcher.Cryptomator"  --prefix PATH : "$out/usr/share/cryptomator/libs/:${lib.makeBinPath [ jre glib ]}"  --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse ]}"  --set JAVA_HOME "${jre.home}" # install desktop entry and icons cp -r ${icons}/resources/appimage/AppDir/usr $out/ ''; nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ]; buildInputs = [ fuse packer jre glib ]; meta = with lib; { description = "Free client-side encryption for your cloud files"; homepage = "https://cryptomator.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bachp ]; platforms = platforms.linux; }; } </ins>
''; dmDefault = cfg.desktopManager.default; <ins> # fallback default for cases when only default wm is set dmFallbackDefault = if dmDefault != null then dmDefault else "none"; </ins> wmDefault = cfg.windowManager.default; <del> defaultSessionFromLegacyOptions = concatStringsSep "+" (filter (s: s != null) ([ dmDefault ] ++ optional (wmDefault != "none") wmDefault)); </del> <ins> defaultSessionFromLegacyOptions = dmFallbackDefault + optionalString (wmDefault != null && wmDefault != "none") "+${wmDefault}"; </ins> in
buildPythonPackage rec { pname = "loguru"; <del> version = "0.4.0"; </del> <ins> version = "0.4.1"; </ins> disabled = isPy27; src = fetchPypi { inherit pname version; <del> sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748"; </del> <ins> sha256 = "a6101fd435ac89ba5205a105a26a6ede9e4ddbb4408a6e167852efca47806d11"; </ins> }; checkInputs = [ pytestCheckHook colorama ]; disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] <del> ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" ]; </del> <ins> ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; </ins> meta = with stdenv.lib; { homepage = https://github.com/Delgan/loguru;
name = "debian-9.8-stretch-i386"; fullName = "Debian 9.8 Stretch (i386)"; packagesList = fetchurl { <del> url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-i386/Packages.xz; sha256 = "1dr3skl35iyj85qlc33lq4whippbqf327vnbcyfqqrv6h86k68mw"; </del> <ins> url = http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz; sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz"; </ins> }; urlPrefix = mirror://debian; packages = commonDebianPackages;
name = "Fluid-3"; src = fetchurl { <del> url = "http://www.musescore.org/download/fluid-soundfont.tar.gz"; </del> <ins> url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz"; </ins> sha256 = "1f96bi0y6rms255yr8dfk436azvwk66c99j6p43iavyq8jg7c5f8"; };
{ stdenv, substituteAll , fetchurl, perl, gcc, llvm , ncurses5, gmp, glibc, libiconv <ins> , llvmPackages </ins> }: # Prebuilt only does native assert stdenv.targetPlatform == stdenv.hostPlatform; let <ins> useLLVM = !stdenv.targetPlatform.isx86; </ins> libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; <del> buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ]; </del> <ins> propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; </ins> # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/
''; }; <del> cargoSha256 = "1sjzcawyg1xsi4xrx2zwnj8yavzph8k1wgxsffgp55wghzypafwl"; </del> <ins> cargoSha256 = "0s8z8cg9q0gfqm0ann8rkxwp5y25si97kgginh6b6lbnaai7y4fj"; </ins> doCheck = false;